2613 files changed, 54729 insertions, 18334 deletions

diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index b197f1ffcfb5..c7f813075d74 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -50,28 +50,35 @@ _PYQT_VERSION=	0
 PYQT_MAINTAINER=	kde@FreeBSD.org
 
 MASTER_SITE_RIVERBANK=	https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/
+MASTER_SITE_RBDEV=	https://www.riverbankcomputing.com/pypi/packages/%SUBDIR%/
 
-MASTER_SITES_SIP=	https://pypi.python.org/packages/source/s/sip/
-MASTER_SITES_PYQT5=	https://pypi.python.org/packages/source/P/PyQt5/
-MASTER_SITES_PYQT6=	https://pypi.python.org/packages/source/P/PyQt6/
+MASTER_SITES_SIP=	PYPI/source/s/sip
+MASTER_SITES_PYQT5=	PYPI/source/P/PyQt5
+MASTER_SITES_PYQT6=	PYPI/source/P/PyQt6 \
+			RBDEV/PyQt6
 MASTER_SITES_PYQT=	${MASTER_SITES_PYQT${_PYQT_VERSION}}
-MASTER_SITES_PYQT5SIP=	https://pypi.python.org/packages/source/P/PyQt5-sip/
-MASTER_SITES_PYQT6SIP=	https://pypi.python.org/packages/source/P/PyQt6-sip/
+MASTER_SITES_PYQT5SIP=	PYPI/source/P/PyQt5-sip
+MASTER_SITES_PYQT6SIP=	PYPI/source/P/PyQt6-sip
 MASTER_SITES_PYQTSIP=	${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
-MASTER_SITES_PYQT63D=	https://pypi.python.org/packages/source/P/PyQt6-3D/
+MASTER_SITES_PYQT63D=	PYPI/source/P/PyQt6-3D \
+			RBDEV/PyQt6-3D
 MASTER_SITES_PYQT3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
-MASTER_SITES_PYQT5CHART=	https://pypi.python.org/packages/source/P/PyQtChart/
-MASTER_SITES_PYQT6CHART=	https://pypi.python.org/packages/source/P/PyQt6-Charts/
+MASTER_SITES_PYQT5CHART=	PYPI/source/P/PyQtChart
+MASTER_SITES_PYQT6CHART=	PYPI/source/P/PyQt6-Charts \
+				RBDEV/PyQt6-Charts
 MASTER_SITES_PYQTCHART=		${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
-MASTER_SITES_PYQT6DATAVIS3D=	https://pypi.python.org/packages/source/P/PyQt6-DataVisualization/
+MASTER_SITES_PYQT6DATAVIS3D=	PYPI/source/P/PyQt6-DataVisualization \
+				RBDEV/PyQt6-DataVisualization
 MASTER_SITES_PYQTDATAVIS3D=	${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
-MASTER_SITES_PYQT5NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQtNetworkAuth/
-MASTER_SITES_PYQT6NETWORKAUTH=	https://pypi.python.org/packages/source/P/PyQt6-NetworkAuth/
-MASTER_SITES_PYQTNETWORKAUTH=		${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
-MASTER_SITES_PYQTBUILDER=	https://pypi.io/packages/source/P/PyQt-builder/
-MASTER_SITES_PYQT5WEBENGINE=	https://pypi.python.org/packages/source/P/PyQtWebEngine/
-MASTER_SITES_PYQT6WEBENGINE=	https://pypi.python.org/packages/source/P/PyQt6-WebEngine/
-MASTER_SITES_PYQTWEBENGINE=		${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
+MASTER_SITES_PYQT5NETWORKAUTH=	PYPI/source/P/PyQtNetworkAuth
+MASTER_SITES_PYQT6NETWORKAUTH=	PYPI/source/P/PyQt6-NetworkAuth \
+				RBDEV/PyQt6-NetworkAuth
+MASTER_SITES_PYQTNETWORKAUTH=	${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
+MASTER_SITES_PYQTBUILDER=	PYPI/source/P/PyQt-builder
+MASTER_SITES_PYQT5WEBENGINE=	PYPI/source/P/PyQtWebEngine
+MASTER_SITES_PYQT6WEBENGINE=	PYPI/source/P/PyQt6-WebEngine \
+				RBDEV/PyQt6-WebEngine
+MASTER_SITES_PYQTWEBENGINE=	${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
 #https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz
 MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 			SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
@@ -89,17 +96,19 @@ SIP_VERSION=		6.8.3	# ,1
 SIP4_VERSION=		4.19.25
 QSCI2_VERSION=		2.14.1
 PYQT5_VERSION=		5.15.10
-PYQT6_VERSION=		6.6.1
-PYQT63D_VERSION=	6.6.0
+PYQT6_VERSION=		6.7.0
+PYQT63D_VERSION=	6.7.0
 PYQT5CHART_VERSION=	5.15.6
-PYQT6CHART_VERSION=	6.6.0
-PYQT6DATAVIS3D_VERSION=	6.6.0
+PYQT6CHART_VERSION=	6.7.0
+PYQT6DATAVIS3D_VERSION=	6.7.0
 PYQT5NETWORKAUTH_VERSION=5.15.5
-PYQT6NETWORKAUTH_VERSION=6.6.0
+PYQT6NETWORKAUTH_VERSION=6.7.0
 PYQT5WEBENGINE_VERSION=	5.15.6
-PYQT6WEBENGINE_VERSION=	6.6.0
+PYQT6WEBENGINE_VERSION=	6.7.0
 PYQT5SIP_VERSION=	12.13.0
 PYQT6SIP_VERSION=	13.6.0
+# PyQt-builder >= 1.16.0 requires setuptools >= 64
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270358
 PYQTBUILDER_VERSION=	1.15.4
 
 SIP4_DISTNAME=		sip-${SIP4_VERSION}
@@ -160,10 +169,9 @@ py-webengine_PATH=		${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
 
 # PORT
 py-sip_PORT=			devel/py-sip
-py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pysip_PORT=			devel/${PYQT_RELNAME}-sip
 py-qscintilla2_PORT=		devel/${PYQT_RELNAME}-qscintilla2
-py-positioning_PORT=		devel/${PYQT_RELNAME}-positioning
+py-qtbuilder_PORT=		devel/py-qtbuilder
 py-pyqt5_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-pyqt6_PORT=			devel/${PYQT_RELNAME}-pyqt
 py-3d_PORT=			graphics/${PYQT_RELNAME}-3d
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 9b0b4d5ee08e..e91563c91470 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -83,8 +83,8 @@ _QT5_MASTER_SITES=		${MASTER_SITE_QT}
 _QT5_MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
 # Qt6 specific master sites
 _QT6_MASTER_SITES=		${MASTER_SITE_QT}
-_QT6_MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules \
-				official_releases/additional_libraries/${_QT_VERSION:R}/${_QT_VERSION}/
+_QT6_MASTER_SITE_SUBDIR=	${_QT6_RELEASE_TYPE}_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules
+
 # Qt5 specific distnames
 .  if ${_QT_DIST} == webengine
 _QT5_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},}
@@ -108,40 +108,40 @@ DIST_SUBDIR=			KDE/Qt/${_QT_VERSION}
 .  if ${_QT_VER:M5}
 # KDE maintains a repository with a patched Qt5 distribution.
 _KDE_3d=		0
-_KDE_base=		142
+_KDE_base=		140
 _KDE_charts=		0
-_KDE_connectivity=	4
+_KDE_connectivity=	3
 _KDE_datavis3d=		0
-_KDE_declarative=	30
+_KDE_declarative=	28
 _KDE_gamepad=		0
 _KDE_graphicaleffects=	0
 _KDE_imageformats=	7
-_KDE_location=		6
+_KDE_location=		7
 _KDE_multimedia=	2
-_KDE_networkauth=	0
+_KDE_networkauth=	1
 _KDE_quick3d=		1
 _KDE_quickcontrols=	0
 _KDE_quickcontrols2=	5
 _KDE_quicktimeline=	0
 _KDE_remoteobjects=	0
 _KDE_script=		0
-_KDE_script_ORIGIN_TAG=	v5.15.16-lts
-_KDE_script_VERSION=	5.15.16
+_KDE_script_ORIGIN_TAG=	v5.15.17-lts
+_KDE_script_VERSION=	5.15.17
 _KDE_scxml=		0
 _KDE_sensors=		0
 _KDE_serialbus=		0
 _KDE_serialport=	0
 _KDE_speech=		1
-_KDE_svg=		6
+_KDE_svg=		5
 _KDE_tools=		4
 _KDE_translations=	0
 _KDE_virtualkeyboard=	0
-_KDE_wayland=		60
+_KDE_wayland=		57
 _KDE_webchannel=	3
-_KDE_webengine=			9
+_KDE_webengine=			2
 _KDE_webengine_BRANCH=		5.15
-_KDE_webengine_ORIGIN_TAG=	v5.15.16-lts
-_KDE_webengine_VERSION=		5.15.16
+_KDE_webengine_ORIGIN_TAG=	v5.15.17-lts
+_KDE_webengine_VERSION=		5.15.17
 _KDE_webglplugin=	0
 _KDE_websockets=	2
 _KDE_webview=		0
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 1a6178b62d1b..b0e0a156477c 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -22,9 +22,18 @@ _QT_MK_INCLUDED=	qt.mk
 
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
-QT5_VERSION?=		5.15.13
-QT6_VERSION?=		6.6.3
-PYSIDE6_VERSION?=	6.6.2
+QT5_VERSION?=		5.15.14
+QT6_VERSION?=		6.7.2
+PYSIDE6_VERSION?=	6.7.2
+
+# Support for intermediate Qt6 releases. This partially defines
+# _QT6_MASTER_SITE_SUBDIR and would probably be better in qt-dist.mk,
+# but misc/qt6-examples needs this too.
+.  if ${QT6_VERSION:M*beta*} || ${QT6_VERSION:M*rc*}
+_QT6_RELEASE_TYPE=		development
+.  else
+_QT6_RELEASE_TYPE=		official
+.  endif
 
 # We accept the Qt version to be passed by either or all of the three mk files.
 .  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
@@ -309,7 +318,7 @@ qt-quick3d_PORT=	x11-toolkits/${_QT_RELNAME}-quick3d
 qt-quick3d_LIB=		libQt${_QT_LIBVER}Quick3D.so
 
 qt-quick3dphysics_PORT=	science/${_QT_RELNAME}-quick3dphysics
-qt_quick3dphysics_LIB=	libQt${_QT_LIBVER}Quick3DPhysics.so
+qt-quick3dphysics_LIB=	libQt${_QT_LIBVER}Quick3DPhysics.so
 
 qt-quickcontrols_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols
 qt-quickcontrols_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
diff --git a/accessibility/darkman/Makefile b/accessibility/darkman/Makefile
index 7313c1d012eb..5b5d77728661 100644
--- a/accessibility/darkman/Makefile
+++ b/accessibility/darkman/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	darkman
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.4
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	accessibility wayland
 
-MAINTAINER=	jbeich@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for dark-mode and light-mode transitions
 WWW=		https://gitlab.com/WhyNotHugo/darkman
 
diff --git a/accessibility/qt5-speech/distinfo b/accessibility/qt5-speech/distinfo
index 935a50ebfc1e..4daac340baa2 100644
--- a/accessibility/qt5-speech/distinfo
+++ b/accessibility/qt5-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770875
-SHA256 (KDE/Qt/5.15.13/kde-qtspeech-5.15.13p1.tar.xz) = c03c480f2aae225a577ce8145c036fbc2699dd507dad76497ae58999cf286cce
-SIZE (KDE/Qt/5.15.13/kde-qtspeech-5.15.13p1.tar.xz) = 80304
+TIMESTAMP = 1716929091
+SHA256 (KDE/Qt/5.15.14/kde-qtspeech-5.15.14p1.tar.xz) = f1d0d42560290497b3fc962661b74d3fcef11b8683755fa6314be81a4fc93905
+SIZE (KDE/Qt/5.15.14/kde-qtspeech-5.15.14p1.tar.xz) = 80220
diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
index ee62d89d1ec3..686c64f5b569 100644
--- a/accessibility/qt6-speech/distinfo
+++ b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660905
-SHA256 (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = e628f746efb17155f89c72a34f62b0c69c21b8d8d14c7ff493933fb87ec903fa
-SIZE (KDE/Qt/6.6.3/qtspeech-everywhere-src-6.6.3.tar.xz) = 261976
+TIMESTAMP = 1718777695
+SHA256 (KDE/Qt/6.7.2/qtspeech-everywhere-src-6.7.2.tar.xz) = cc8c769404e3e49713be304a73f936890a1ef2f88d590732785f34692a4814ce
+SIZE (KDE/Qt/6.7.2/qtspeech-everywhere-src-6.7.2.tar.xz) = 262360
diff --git a/archivers/nfpm/Makefile b/archivers/nfpm/Makefile
index dba173eeb14d..3fc55d7e6a81 100644
--- a/archivers/nfpm/Makefile
+++ b/archivers/nfpm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nfpm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.36.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	archivers
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile
index 59cd8bb07237..68a533fc0568 100644
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	urbackup-client
 DISTVERSION=	2.5.20.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION:R}/
 
@@ -40,6 +40,14 @@ GUI_CONFIGURE_OFF=	--enable-headless
 CONFFILES=	mariadbdump.conf mariadbxtrabackup.conf postgresbase.conf \
 		postgresqldump.conf
 
+.include <bsd.port.options.mk>
+
+# Fix segmentation fault, PR 266531
+# see also 5a19c08: security/cryptopp: Update to 8.7.0
+.if ${ARCH} == i386 || ${ARCH} == amd64
+CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
+.endif
+
 post-patch:
 	@${SED} -i "" -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/urbackupclient/backup_scripts/postgresqldump
diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 9e1496f50f5e..d8677cfa4f21 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	urbackup-server
 DISTVERSION=	2.5.26
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Server/${DISTVERSION}/
 
@@ -25,6 +25,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-packaging --with-mountvhd --without-embedded-sqlite3 --without-embedded-lmdb --without-embedded-lua
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
+# Fix segmentation fault, PR 266531
+# see also 5a19c08: security/cryptopp: Update to 8.7.0
+.if ${ARCH} == i386 || ${ARCH} == amd64
+CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
+.endif
+
 SUB_FILES=	pkg-message urbackupsrv.conf.sample-daemon
 
 USERS=		urbackup
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 1756ce477363..121d773bef26 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	xphoon
 PORTVERSION=	20000613
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Set the root window to the moon in its current phase
 WWW=		https://xphoon.sourceforge.net/
 
diff --git a/astro/xphoon/files/patch-Imakefile b/astro/xphoon/files/patch-Imakefile
index d607d8420b3c..fb4bd31abe6f 100644
--- a/astro/xphoon/files/patch-Imakefile
+++ b/astro/xphoon/files/patch-Imakefile
@@ -1,11 +1,13 @@
---- Imakefile.orig	2000-06-13 21:55:44 UTC
+diff --git a/Imakefile.orig b/Imakefile
+index 96d7fd6..73497f4 100644
+--- Imakefile.orig
 +++ Imakefile
 @@ -11,7 +11,7 @@
  
  
  INCLUDES =		-I. -I$(TOP) -I$(TOP)/X11 -I$(TOP)/X11/bitmaps
 -LOCAL_LIBRARIES =	$(XLIB)
-+LOCAL_LIBRARIES =	$(XLIB) -lcompat
++LOCAL_LIBRARIES =	$(XLIB) -lcompat -lutil
  DEPLIBS =		$(DEPXLIB)
  LDLIBS =		-lm
  
diff --git a/audio/cardinal/Makefile b/audio/cardinal/Makefile
index bc8cc90df324..558e22f38696 100644
--- a/audio/cardinal/Makefile
+++ b/audio/cardinal/Makefile
@@ -10,6 +10,8 @@ WWW=		https://cardinal.kx.studio/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	compilation fails due to the variable name conflict with base header, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=279134
+
 BUILD_DEPENDS=	${LOCALBASE}/include/FuzzySearchDatabase.hpp:textproc/fuzzysearchdatabase \
 		bash:shells/bash \
 		cmake:devel/cmake-core
diff --git a/audio/gonic/Makefile b/audio/gonic/Makefile
index 3878f63ef8ea..4c71a271c5ef 100644
--- a/audio/gonic/Makefile
+++ b/audio/gonic/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gonic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio net
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/audio/murmur-cli/Makefile b/audio/murmur-cli/Makefile
index 8be9e07ad1ed..59d48e107270 100644
--- a/audio/murmur-cli/Makefile
+++ b/audio/murmur-cli/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	murmur-cli
 PORTVERSION=	0.0.0.20200528
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/audio/pms-devel/Makefile b/audio/pms-devel/Makefile
index 4b7944f5b3d5..7c52bdc17e8f 100644
--- a/audio/pms-devel/Makefile
+++ b/audio/pms-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pms-devel
 PORTVERSION=	0.0.20231224
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	riggs@FreeBSD.org
diff --git a/audio/rsgain/Makefile b/audio/rsgain/Makefile
index 77f2e7f5f933..747470c7b32e 100644
--- a/audio/rsgain/Makefile
+++ b/audio/rsgain/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rsgain
-DISTVERSION=	3.5
+DISTVERSION=	3.5.1
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/complexlogic/rsgain/releases/download/v${DISTVERSION}/
diff --git a/audio/rsgain/distinfo b/audio/rsgain/distinfo
index 18f5af32e788..42abddafb99d 100644
--- a/audio/rsgain/distinfo
+++ b/audio/rsgain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708887285
-SHA256 (rsgain-3.5-source.tar.xz) = 8098d8cbe5c4dccc604e0d75667a71678e6802f9c623286eba772a42a8e2a062
-SIZE (rsgain-3.5-source.tar.xz) = 50660
+TIMESTAMP = 1717822703
+SHA256 (rsgain-3.5.1-source.tar.xz) = 498f023d62898c8699b7d5da34e5e16b0e892ae8a4aec8af405f2917a82901a2
+SIZE (rsgain-3.5.1-source.tar.xz) = 50776
diff --git a/audio/rsgain/files/patch-src_scan.cpp b/audio/rsgain/files/patch-src_scan.cpp
new file mode 100644
index 000000000000..3d9dbb23b23f
--- /dev/null
+++ b/audio/rsgain/files/patch-src_scan.cpp
@@ -0,0 +1,16 @@
+Fix a segfault when calculating album loudness.
+
+PR: 278838
+Regressed by: https://github.com/complexlogic/rsgain/commit/63e87a4f7d3b5c816eab630fba41ba9a63b82519
+
+--- src/scan.cpp.orig	2024-02-25 17:47:20 UTC
++++ src/scan.cpp
+@@ -639,7 +639,7 @@ void ScanJob::calculate_album_loudness() 
+     std::vector<ebur128_state*> states(nb_states);
+     for (const Track &track : tracks)
+         if (track.result.track_loudness != -HUGE_VAL)
+-            states.emplace_back(track.ebur128.get());
++            states[(size_t) (&track - &tracks[0])] = track.ebur128.get();
+ 
+     if (ebur128_loudness_global_multiple(states.data(), states.size(), &album_loudness) != EBUR128_SUCCESS)
+         album_loudness = config.target_loudness;
diff --git a/audio/sayonara/Makefile b/audio/sayonara/Makefile
index 4bc4672f6d79..70a43737ab04 100644
--- a/audio/sayonara/Makefile
+++ b/audio/sayonara/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	sayonara
-DISTVERSION=	1.9.0
+DISTVERSION=	1.10.0
 DISTVERSIONSUFFIX=	-stable1
-PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	adridg@FreeBSD.org
diff --git a/audio/sayonara/distinfo b/audio/sayonara/distinfo
index 3a4269f6a7df..5ae6b2a67185 100644
--- a/audio/sayonara/distinfo
+++ b/audio/sayonara/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709061996
-SHA256 (sayonara-player-1.9.0-stable1.tar.bz2) = 5843e8c278ba660a245979a67835b3d1514cde35b1e748082a5c255e0785def8
-SIZE (sayonara-player-1.9.0-stable1.tar.bz2) = 1718006
+TIMESTAMP = 1717362640
+SHA256 (sayonara-player-1.10.0-stable1.tar.bz2) = f4635796da02bfc67232459475806b0d52dc991b827fb11982a708504a500a6c
+SIZE (sayonara-player-1.10.0-stable1.tar.bz2) = 1740393
diff --git a/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp b/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp
new file mode 100644
index 000000000000..ab2ed553fb5d
--- /dev/null
+++ b/audio/sayonara/files/patch-src_Components_Covers_Fetcher_Audioscrobbler.cpp
@@ -0,0 +1,20 @@
+--- src/Components/Covers/Fetcher/Audioscrobbler.cpp.orig	2024-06-04 15:10:26 UTC
++++ src/Components/Covers/Fetcher/Audioscrobbler.cpp
+@@ -30,6 +30,8 @@
+ #include <QStringList>
+ #include <QUrl>
+ 
++#include <array>
++
+ using Cover::Fetcher::Audioscrobbler;
+ 
+ namespace
+@@ -37,7 +39,7 @@ namespace
+ 	QStringList mapToStringList(const QMap<QString, QString>& map)
+ 	{
+ 		auto result = QStringList {};
+-		const auto sizes = std::array {"mega", "extralarge", "large", "medium", "small"};
++		const auto sizes = std::array<char *, 5> {"mega", "extralarge", "large", "medium", "small"};
+ 		for(const auto size: sizes)
+ 		{
+ 			result.push_back(map[size]);
diff --git a/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp b/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp
new file mode 100644
index 000000000000..10a01bc6aadd
--- /dev/null
+++ b/audio/sayonara/files/patch-src_Components_Lyrics_LyricWebpageParser.cpp
@@ -0,0 +1,11 @@
+--- src/Components/Lyrics/LyricWebpageParser.cpp.orig	2024-06-04 15:17:38 UTC
++++ src/Components/Lyrics/LyricWebpageParser.cpp
+@@ -27,6 +27,8 @@
+ #include <QTextBlock>
+ #include <QTextDocument>
+ 
++#include <array>
++
+ using namespace Lyrics;
+ 
+ namespace
diff --git a/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp b/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp
new file mode 100644
index 000000000000..10724e9ced95
--- /dev/null
+++ b/audio/sayonara/files/patch-src_Components_Playlist_PlaylistModifiers.cpp
@@ -0,0 +1,11 @@
+--- src/Components/Playlist/PlaylistModifiers.cpp.orig	2024-06-04 19:25:08 UTC
++++ src/Components/Playlist/PlaylistModifiers.cpp
+@@ -179,7 +179,7 @@ namespace Playlist
+ 		const auto& tracks = playlist.tracks();
+ 		const auto durationMs =
+ 			std::accumulate(tracks.begin(), tracks.end(), 0, [](const auto timeMs, const auto& track) {
+-				return timeMs + std::max(0L, track.durationMs());
++				return timeMs + std::max(MilliSeconds(0), track.durationMs());
+ 			});
+ 
+ 		return durationMs;
diff --git a/audio/sayonara/files/patch-src_Gui_InfoDialog_GUI__InfoDialog.cpp b/audio/sayonara/files/patch-src_Gui_InfoDialog_GUI__InfoDialog.cpp
new file mode 100644
index 000000000000..ba71d01e6eeb
--- /dev/null
+++ b/audio/sayonara/files/patch-src_Gui_InfoDialog_GUI__InfoDialog.cpp
@@ -0,0 +1,11 @@
+--- src/Gui/InfoDialog/GUI_InfoDialog.cpp.orig	2024-05-13 19:42:03 UTC
++++ src/Gui/InfoDialog/GUI_InfoDialog.cpp
+@@ -47,6 +47,8 @@
+ #include <QTabBar>
+ #include <QTableWidgetItem>
+ 
++#include <unordered_map>
++
+ namespace
+ {
+ 	enum StackedWidgetTab
diff --git a/audio/sayonara/files/patch-src_Utils_Tagging_MP4_PopularimeterFrame.cpp b/audio/sayonara/files/patch-src_Utils_Tagging_MP4_PopularimeterFrame.cpp
index 2f03e2410f2d..3184afe67d16 100644
--- a/audio/sayonara/files/patch-src_Utils_Tagging_MP4_PopularimeterFrame.cpp
+++ b/audio/sayonara/files/patch-src_Utils_Tagging_MP4_PopularimeterFrame.cpp
@@ -1,6 +1,13 @@
---- src/Utils/Tagging/MP4/PopularimeterFrame.cpp.orig	2024-04-01 19:55:44 UTC
+--- src/Utils/Tagging/MP4/PopularimeterFrame.cpp.orig	2024-01-27 22:05:38 UTC
 +++ src/Utils/Tagging/MP4/PopularimeterFrame.cpp
-@@ -28,7 +28,7 @@ namespace
+@@ -22,13 +22,14 @@
+ #include <QString>
+ #include "Tagging/TaggingUtils.h"
+ 
++#include <array>
+ #include <optional>
+ 
+ namespace
  {
  	[[nodiscard]] int fourBytesToInteger(const int32_t fourBytes)
  	{
diff --git a/audio/visp-go/Makefile b/audio/visp-go/Makefile
index 9cc470e24a15..a3fee1e7ec9d 100644
--- a/audio/visp-go/Makefile
+++ b/audio/visp-go/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	visp-go
 DISTVERSION=	g20210723
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	audio
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/benchmarks/ali/Makefile b/benchmarks/ali/Makefile
index 42a225410a16..9ff37796695a 100644
--- a/benchmarks/ali/Makefile
+++ b/benchmarks/ali/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ali
 PORTVERSION=	0.7.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	benchmarks
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/benchmarks/bombardier/Makefile b/benchmarks/bombardier/Makefile
index 6adadc34fc52..04b068061c8b 100644
--- a/benchmarks/bombardier/Makefile
+++ b/benchmarks/bombardier/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bombardier
 PORTVERSION=	1.2.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	benchmarks
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/benchmarks/ddosify/Makefile b/benchmarks/ddosify/Makefile
index 001a8927ca75..0a077850534a 100644
--- a/benchmarks/ddosify/Makefile
+++ b/benchmarks/ddosify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ddosify
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.6
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	benchmarks
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/benchmarks/hey/Makefile b/benchmarks/hey/Makefile
index c18f34ff323a..a2b43db22d65 100644
--- a/benchmarks/hey/Makefile
+++ b/benchmarks/hey/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hey
 PORTVERSION=	0.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	benchmarks
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/benchmarks/plow/Makefile b/benchmarks/plow/Makefile
index 2d9e51c7069a..de41d4cb5705 100644
--- a/benchmarks/plow/Makefile
+++ b/benchmarks/plow/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	plow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	14
+PORTREVISION=	16
 CATEGORIES=	benchmarks
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/benchmarks/vegeta/Makefile b/benchmarks/vegeta/Makefile
index 72a368a89a3c..5684bf79c290 100644
--- a/benchmarks/vegeta/Makefile
+++ b/benchmarks/vegeta/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vegeta
 DISTVERSIONPREFIX=	v
 DISTVERSION=	12.11.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	benchmarks www
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/biology/kmcp/Makefile b/biology/kmcp/Makefile
index 766256b0ce9c..6af346f16465 100644
--- a/biology/kmcp/Makefile
+++ b/biology/kmcp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kmcp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.4
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/biology/ncbi-entrez-direct/Makefile b/biology/ncbi-entrez-direct/Makefile
index 933fd7d55791..9b89b2dc5815 100644
--- a/biology/ncbi-entrez-direct/Makefile
+++ b/biology/ncbi-entrez-direct/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ncbi-entrez-direct
 DISTVERSION=	14.9.20210423
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	biology perl5
 MASTER_SITES=	ftp://ftp.ncbi.nlm.nih.gov/entrez/entrezdirect/versions/${PORTVERSION}/
 DISTFILES=	edirect.tar.gz
diff --git a/biology/seqkit/Makefile b/biology/seqkit/Makefile
index b197552169ec..5bcab80c4c12 100644
--- a/biology/seqkit/Makefile
+++ b/biology/seqkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	seqkit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/biology/taxonkit/Makefile b/biology/taxonkit/Makefile
index 4f09fafc7773..65a9a45522c9 100644
--- a/biology/taxonkit/Makefile
+++ b/biology/taxonkit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	taxonkit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/biology/unikmer/Makefile b/biology/unikmer/Makefile
index 5dd98ab42bb3..fd3d028fa924 100644
--- a/biology/unikmer/Makefile
+++ b/biology/unikmer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	unikmer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.1
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	biology
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index dcd033c4ec87..8b7e874d1c73 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -63,10 +63,11 @@ TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 PORTSCOUT=	limit:^.*[0-9]\.[0-9] # prevent tags like 'show'
 
-post-install: # workaround for https://github.com/chipsalliance/Surelog/issues/3596
-	@${RMDIR} \
-		${STAGEDIR}${DATADIR}/pkg/work \
-		${STAGEDIR}${DATADIR}/pkg \
+post-install:
+	# workaround for https://github.com/chipsalliance/Surelog/issues/3965
+	# - surelog fails to create package files on some systems, and succeeds on others
+	# - so we remove this directory altogether for now
+	@${RM} -r \
 		${STAGEDIR}${DATADIR}
 
 post-test:
diff --git a/comms/qt5-connectivity/distinfo b/comms/qt5-connectivity/distinfo
index a535f10c20d4..1acc2e45b16b 100644
--- a/comms/qt5-connectivity/distinfo
+++ b/comms/qt5-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770876
-SHA256 (KDE/Qt/5.15.13/kde-qtconnectivity-5.15.13p4.tar.xz) = d8dedba477db25517164187596a0feb3ba16503a97cb6d0f9cd2cf37b1555f8d
-SIZE (KDE/Qt/5.15.13/kde-qtconnectivity-5.15.13p4.tar.xz) = 2796540
+TIMESTAMP = 1716929091
+SHA256 (KDE/Qt/5.15.14/kde-qtconnectivity-5.15.14p3.tar.xz) = 86dbf53d45a5ad02947ff854c75c45963c20981a1b0efbc9d615e125c58187c0
+SIZE (KDE/Qt/5.15.14/kde-qtconnectivity-5.15.14p3.tar.xz) = 2796584
diff --git a/comms/qt5-sensors/distinfo b/comms/qt5-sensors/distinfo
index 0dc8075d94e3..5d30ef3f1855 100644
--- a/comms/qt5-sensors/distinfo
+++ b/comms/qt5-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770877
-SHA256 (KDE/Qt/5.15.13/kde-qtsensors-5.15.13p0.tar.xz) = 9f7c55b7a12b52f75151e5945a38618362060e90d2c463ecfa88d4b6196af2de
-SIZE (KDE/Qt/5.15.13/kde-qtsensors-5.15.13p0.tar.xz) = 2030780
+TIMESTAMP = 1716929092
+SHA256 (KDE/Qt/5.15.14/kde-qtsensors-5.15.14p0.tar.xz) = d55e36bbd8b1e220d8fc620e5a61b8ec41c0c696777c108caa25cdc65c9120b1
+SIZE (KDE/Qt/5.15.14/kde-qtsensors-5.15.14p0.tar.xz) = 2030928
diff --git a/comms/qt5-serialbus/distinfo b/comms/qt5-serialbus/distinfo
index 6db6efe5e716..b65d9a5ea9c0 100644
--- a/comms/qt5-serialbus/distinfo
+++ b/comms/qt5-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770878
-SHA256 (KDE/Qt/5.15.13/kde-qtserialbus-5.15.13p0.tar.xz) = b0c17a00015f6c6f8d547a1fb620483b529b4112eac45d77c75f04e79345c76b
-SIZE (KDE/Qt/5.15.13/kde-qtserialbus-5.15.13p0.tar.xz) = 333820
+TIMESTAMP = 1716929093
+SHA256 (KDE/Qt/5.15.14/kde-qtserialbus-5.15.14p0.tar.xz) = a35e1dabaff869a31d5287265f9d6b04220a59ade179f337a36220fa3f2a47f2
+SIZE (KDE/Qt/5.15.14/kde-qtserialbus-5.15.14p0.tar.xz) = 333848
diff --git a/comms/qt5-serialport/distinfo b/comms/qt5-serialport/distinfo
index 61646ed79aff..2db016d04c6d 100644
--- a/comms/qt5-serialport/distinfo
+++ b/comms/qt5-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770880
-SHA256 (KDE/Qt/5.15.13/kde-qtserialport-5.15.13p0.tar.xz) = c98804aaa07e683fadc39c19367ececcf8e898defafab159f5f2a160c01425d3
-SIZE (KDE/Qt/5.15.13/kde-qtserialport-5.15.13p0.tar.xz) = 299600
+TIMESTAMP = 1716929094
+SHA256 (KDE/Qt/5.15.14/kde-qtserialport-5.15.14p0.tar.xz) = 7e4105e1f971a9b3489efaa8af86346926b61649cd85908690c4d70988b674eb
+SIZE (KDE/Qt/5.15.14/kde-qtserialport-5.15.14p0.tar.xz) = 299628
diff --git a/comms/qt6-connectivity/distinfo b/comms/qt6-connectivity/distinfo
index a3da86f980dc..6997e36d3669 100644
--- a/comms/qt6-connectivity/distinfo
+++ b/comms/qt6-connectivity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660910
-SHA256 (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 091aba91a0ab4081bad880b1adfd97d38b7a6ba87ba1cce3e63e20651a71d518
-SIZE (KDE/Qt/6.6.3/qtconnectivity-everywhere-src-6.6.3.tar.xz) = 1060952
+TIMESTAMP = 1718777696
+SHA256 (KDE/Qt/6.7.2/qtconnectivity-everywhere-src-6.7.2.tar.xz) = 8ed321b242f0e956473a295fa31670271f9b3acb797508644cb740f89f6c08e8
+SIZE (KDE/Qt/6.7.2/qtconnectivity-everywhere-src-6.7.2.tar.xz) = 1061952
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
index 341d4929c245..47996f856fc0 100644
--- a/comms/qt6-sensors/distinfo
+++ b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660915
-SHA256 (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = b235af8042250a4212a6df400c4b7899fc2905897126bc9388f2a6122a1d3765
-SIZE (KDE/Qt/6.6.3/qtsensors-everywhere-src-6.6.3.tar.xz) = 1494016
+TIMESTAMP = 1718777696
+SHA256 (KDE/Qt/6.7.2/qtsensors-everywhere-src-6.7.2.tar.xz) = ead1dec787c56ed4dc02ed810af54ff1e1f6875cb5cc2506c74eeb9554e6bb59
+SIZE (KDE/Qt/6.7.2/qtsensors-everywhere-src-6.7.2.tar.xz) = 1497432
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
index 102600809de7..a9a4cca00a81 100644
--- a/comms/qt6-serialbus/distinfo
+++ b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660918
-SHA256 (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 143e5afcb81a2e2a92d5c0f16679295349d0b8e1ee398230a391ca5be00ad0fb
-SIZE (KDE/Qt/6.6.3/qtserialbus-everywhere-src-6.6.3.tar.xz) = 545820
+TIMESTAMP = 1718777698
+SHA256 (KDE/Qt/6.7.2/qtserialbus-everywhere-src-6.7.2.tar.xz) = 67641ca99b455746d7d956c516dfaa5f2c48696834c71d5720d63e736d374b2b
+SIZE (KDE/Qt/6.7.2/qtserialbus-everywhere-src-6.7.2.tar.xz) = 547596
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
index 06ef26fbc2c0..698ee65fddb6 100644
--- a/comms/qt6-serialport/distinfo
+++ b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660920
-SHA256 (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = e1656579e555da61cb81cbbb5ee6d31835cea110b3a5dd9e14b16fa71e55dc37
-SIZE (KDE/Qt/6.6.3/qtserialport-everywhere-src-6.6.3.tar.xz) = 270704
+TIMESTAMP = 1718777698
+SHA256 (KDE/Qt/6.7.2/qtserialport-everywhere-src-6.7.2.tar.xz) = 21c34cd1161cb5197bcec662d26a17647b59b6fdff5c364576883c42dbd3b4fc
+SIZE (KDE/Qt/6.7.2/qtserialport-everywhere-src-6.7.2.tar.xz) = 271320
diff --git a/converters/simdutf/Makefile b/converters/simdutf/Makefile
index 048d221d6c0f..5d93a921f9f0 100644
--- a/converters/simdutf/Makefile
+++ b/converters/simdutf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	simdutf
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.0.0
+DISTVERSION=	5.2.8
 CATEGORIES=	converters textproc
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/converters/simdutf/distinfo b/converters/simdutf/distinfo
index c81c420ec600..2d00bf42ca64 100644
--- a/converters/simdutf/distinfo
+++ b/converters/simdutf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711455616
-SHA256 (simdutf-simdutf-v5.0.0_GH0.tar.gz) = 088d750466bf3487117cce7f828eb94a0a3474d7e76b45d4902c99a2387212b7
-SIZE (simdutf-simdutf-v5.0.0_GH0.tar.gz) = 1923633
+TIMESTAMP = 1715505831
+SHA256 (simdutf-simdutf-v5.2.8_GH0.tar.gz) = 2706f1bef85a6d8598f82defd3848f1c5100e2e065c5d416d993118b53ea8d77
+SIZE (simdutf-simdutf-v5.2.8_GH0.tar.gz) = 1941240
diff --git a/converters/simdutf/pkg-plist b/converters/simdutf/pkg-plist
index aa906db04e9b..314f25551ce3 100644
--- a/converters/simdutf/pkg-plist
+++ b/converters/simdutf/pkg-plist
@@ -14,7 +14,7 @@ lib/cmake/simdutf/simdutf-config-version.cmake
 lib/cmake/simdutf/simdutf-config.cmake
 lib/cmake/simdutf/simdutfTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/simdutf/simdutfTargets.cmake
-lib/libsimdutf.so.6.0.0
-lib/libsimdutf.so.6
+lib/libsimdutf.so.8.0.0
+lib/libsimdutf.so.8
 lib/libsimdutf.so
 libdata/pkgconfig/simdutf.pc
diff --git a/converters/yj/Makefile b/converters/yj/Makefile
index c255e28771e2..c886bdc73509 100644
--- a/converters/yj/Makefile
+++ b/converters/yj/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yj
 PORTVERSION=	5.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	converters
 DIST_SUBDIR=	yj
 
diff --git a/databases/cayley/Makefile b/databases/cayley/Makefile
index ecc5dc14f4fe..a3a417a50135 100644
--- a/databases/cayley/Makefile
+++ b/databases/cayley/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cayley
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.7
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile
index 65e456d9af8b..9c02022aa6e5 100644
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cockroach
 DISTVERSIONPREFIX=	v
 DISTVERSION=	19.1.11
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	databases
 MASTER_SITES=	https://binaries.cockroachdb.com/
 EXTRACT_SUFX=	.src.tgz
diff --git a/databases/go-carbon/Makefile b/databases/go-carbon/Makefile
index f742b24c1e0e..fee9e9c70550 100644
--- a/databases/go-carbon/Makefile
+++ b/databases/go-carbon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		go-carbon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.12.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=		databases
 
 MAINTAINER=		a.andersson.thn@gmail.com
diff --git a/databases/go-pgweb/Makefile b/databases/go-pgweb/Makefile
index bdcb5f39c44f..c4dac9adfefd 100644
--- a/databases/go-pgweb/Makefile
+++ b/databases/go-pgweb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pgweb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.7
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	databases www
 PKGNAMEPREFIX=	go-
 
diff --git a/databases/goose/Makefile b/databases/goose/Makefile
index 76400e3517af..304c3df929cb 100644
--- a/databases/goose/Makefile
+++ b/databases/goose/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goose
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.19.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-db-migration-tool
 
diff --git a/databases/immudb/Makefile b/databases/immudb/Makefile
index 6cd11e9c0586..e7cd08089640 100644
--- a/databases/immudb/Makefile
+++ b/databases/immudb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	immudb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
diff --git a/databases/imposm3/Makefile b/databases/imposm3/Makefile
index 905782f1ba85..d15b386e1afc 100644
--- a/databases/imposm3/Makefile
+++ b/databases/imposm3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	imposm3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	databases geography
 
 MAINTAINER=	darcy@dbitech.ca
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index f23b39d2ccd4..18b1838ec7cc 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	influxdb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.10
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/databases/influxdb2-cli/Makefile b/databases/influxdb2-cli/Makefile
index 6cabd36b6127..b007618d5676 100644
--- a/databases/influxdb2-cli/Makefile
+++ b/databases/influxdb2-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	influxdb2-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.3
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/databases/litestream/Makefile b/databases/litestream/Makefile
index 061a644e262c..406c9726861b 100644
--- a/databases/litestream/Makefile
+++ b/databases/litestream/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	litestream
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.13
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	databases
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/databases/mongodb-tools/Makefile b/databases/mongodb-tools/Makefile
index 9f24ef162c48..84f490282236 100644
--- a/databases/mongodb-tools/Makefile
+++ b/databases/mongodb-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mongodb-tools
 DISTVERSION=	100.9.4
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	databases
 
 MAINTAINER=	ronald@FreeBSD.org
diff --git a/databases/octosql/Makefile b/databases/octosql/Makefile
index f3e9533449b5..eaff7fb5a55c 100644
--- a/databases/octosql/Makefile
+++ b/databases/octosql/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	octosql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index c5cdd232c009..b940a8e46bd9 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	DBD-mysql
-PORTVERSION=	5.004
+PORTVERSION=	5.005
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DVEEDEN
@@ -16,9 +16,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-Devel-CheckLib>=1.09:devel/p5-Devel-CheckLib
 RUN_DEPENDS=	p5-DBI>=1.08:databases/p5-DBI
+LIB_DEPENDS=	libunwind.so:devel/libunwind
 TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
-USES=		compiler:c11 mysql perl5
+USES=		compiler:c11 mysql perl5 ssl
 USE_PERL5=	configure
 
 CONFIGURE_ARGS=		${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
@@ -29,4 +30,10 @@ CONFLICTS_INSTALL=	p5-DBD-mysql4
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${MYSQL_FLAVOUR} != mysql
+IGNORE=use databases/p5-DBD-mysql4 or databases/p5-DBD-MariaDB instead
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo
index a9cc98408822..2b906b0e3707 100644
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710964481
-SHA256 (DBD-mysql-5.004.tar.gz) = 33a6bf1b685cc50c46eb1187a3eb259ae240917bc189d26b81418790aa6da5df
-SIZE (DBD-mysql-5.004.tar.gz) = 156428
+TIMESTAMP = 1716833311
+SHA256 (DBD-mysql-5.005.tar.gz) = 1558c203b3911e273d3f83249535b312165be2ca8edba6b6c210645d769d0541
+SIZE (DBD-mysql-5.005.tar.gz) = 155029
diff --git a/databases/percona-orchestrator/Makefile b/databases/percona-orchestrator/Makefile
index 4bc9e2e72c6b..db2de900c011 100644
--- a/databases/percona-orchestrator/Makefile
+++ b/databases/percona-orchestrator/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	orchestrator
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.6-12
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 PKGNAMEPREFIX=	percona-
 
diff --git a/databases/pg_tileserv/Makefile b/databases/pg_tileserv/Makefile
index 4b5e15560523..0c38ff7d48a3 100644
--- a/databases/pg_tileserv/Makefile
+++ b/databases/pg_tileserv/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pg_tileserv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.9
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
diff --git a/databases/pgmetrics/Makefile b/databases/pgmetrics/Makefile
index 7ff0f5dc7242..a7bebc8ce94f 100644
--- a/databases/pgmetrics/Makefile
+++ b/databases/pgmetrics/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pgmetrics
 PORTVERSION=	1.16.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/databases/pgvector/Makefile b/databases/pgvector/Makefile
index 78636fcc5905..8b96ad764baf 100644
--- a/databases/pgvector/Makefile
+++ b/databases/pgvector/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pgvector
-PORTVERSION=	0.6.2
+PORTVERSION=	0.7.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
diff --git a/databases/pgvector/distinfo b/databases/pgvector/distinfo
index 5a63f8fa2e48..88c9310465a8 100644
--- a/databases/pgvector/distinfo
+++ b/databases/pgvector/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711308303
-SHA256 (pgvector-pgvector-v0.6.2_GH0.tar.gz) = a11cc249a9f3f3d7b13069a1696f2915ac28991a72d7ba4e2bcfdceddbaeae49
-SIZE (pgvector-pgvector-v0.6.2_GH0.tar.gz) = 82070
+TIMESTAMP = 1718279529
+SHA256 (pgvector-pgvector-v0.7.2_GH0.tar.gz) = 617fba855c9bcb41a2a9bc78a78567fd2e147c72afd5bf9d37b31b9591632b30
+SIZE (pgvector-pgvector-v0.7.2_GH0.tar.gz) = 113648
diff --git a/databases/pgvector/pkg-plist b/databases/pgvector/pkg-plist
index b1d8776c7fc8..1da3053efa28 100644
--- a/databases/pgvector/pkg-plist
+++ b/databases/pgvector/pkg-plist
@@ -28,5 +28,8 @@ share/postgresql/extension/vector--0.5.0--0.5.1.sql
 share/postgresql/extension/vector--0.5.1--0.6.0.sql
 share/postgresql/extension/vector--0.6.0--0.6.1.sql
 share/postgresql/extension/vector--0.6.1--0.6.2.sql
-share/postgresql/extension/vector--0.6.2.sql
+share/postgresql/extension/vector--0.6.2--0.7.0.sql
+share/postgresql/extension/vector--0.7.0--0.7.1.sql
+share/postgresql/extension/vector--0.7.1--0.7.2.sql
+share/postgresql/extension/vector--0.7.2.sql
 share/postgresql/extension/vector.control
diff --git a/databases/php81-pdo_firebird/Makefile b/databases/php81-pdo_firebird/Makefile
index 03cd8115a6df..3d8a88b9eb21 100644
--- a/databases/php81-pdo_firebird/Makefile
+++ b/databases/php81-pdo_firebird/Makefile
@@ -1,7 +1,5 @@
 CATEGORIES=	databases
 
-PORTREVISION=	1
-
 MASTERDIR=	${.CURDIR}/../../lang/php81
 
 PKGNAMESUFFIX=	-pdo_firebird
diff --git a/databases/prometheus-postgresql-adapter/Makefile b/databases/prometheus-postgresql-adapter/Makefile
index 76a9ea591d65..5e0c62e167e9 100644
--- a/databases/prometheus-postgresql-adapter/Makefile
+++ b/databases/prometheus-postgresql-adapter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prometheus-postgresql-adapter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	databases
 
 MAINTAINER=	felix@userspace.com.au
diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo
index a0c66832e9c4..748d56868c38 100644
--- a/databases/qt5-sql/distinfo
+++ b/databases/qt5-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770881
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929095
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo
index a8355a2cc064..68ee1aa03f7d 100644
--- a/databases/qt5-sqldrivers-mysql/distinfo
+++ b/databases/qt5-sqldrivers-mysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770882
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929096
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo
index 8127d099b6db..9b2e976d4723 100644
--- a/databases/qt5-sqldrivers-odbc/distinfo
+++ b/databases/qt5-sqldrivers-odbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770883
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929097
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo
index cba7e145d64b..45f97ec723a2 100644
--- a/databases/qt5-sqldrivers-pgsql/distinfo
+++ b/databases/qt5-sqldrivers-pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770885
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929098
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo
index 18d2a9818741..300358c4ca80 100644
--- a/databases/qt5-sqldrivers-sqlite2/distinfo
+++ b/databases/qt5-sqldrivers-sqlite2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770886
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929099
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo
index 4ba56d2ed9b5..0790b8925bbd 100644
--- a/databases/qt5-sqldrivers-sqlite3/distinfo
+++ b/databases/qt5-sqldrivers-sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770887
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929100
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo
index d5543e8e55b5..195ee6ff7fd4 100644
--- a/databases/qt5-sqldrivers-tds/distinfo
+++ b/databases/qt5-sqldrivers-tds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770889
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929102
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile
index fc30996a3275..b7f4abfe8308 100644
--- a/databases/qt6-base_sqldriver/Makefile
+++ b/databases/qt6-base_sqldriver/Makefile
@@ -30,8 +30,4 @@ sqlite_USES=		sqlite:3
 sqlite_CMAKE_ON=	QT_FEATURE_system_sqlite
 ${FLAVOR}_PLIST=	${.CURDIR}/pkg-plist.${FLAVOR}
 
-.if ${FLAVOR:U} == mysql
-IGNORE_WITH_MYSQL=	105m 106m 1011m
-.endif
-
 .include <bsd.port.mk>
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
index bc3c99a06a93..2161de56bdc5 100644
--- a/databases/qt6-base_sqldriver/distinfo
+++ b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711660995
-SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
-SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
+TIMESTAMP = 1718777700
+SHA256 (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599
+SIZE (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = 49364504
diff --git a/databases/redis_exporter/Makefile b/databases/redis_exporter/Makefile
index 406b63a29fb2..96ea17f67c6d 100644
--- a/databases/redis_exporter/Makefile
+++ b/databases/redis_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	redis_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.58.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	arcade@b1t.name
diff --git a/databases/rqlite/Makefile b/databases/rqlite/Makefile
index 0708030db769..8932e2a7993d 100644
--- a/databases/rqlite/Makefile
+++ b/databases/rqlite/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rqlite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.23.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/databases/rubygem-activemodel61/Makefile b/databases/rubygem-activemodel61/Makefile
index d938ddb028be..488bb134d976 100644
--- a/databases/rubygem-activemodel61/Makefile
+++ b/databases/rubygem-activemodel61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activemodel
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/databases/rubygem-activemodel61/distinfo b/databases/rubygem-activemodel61/distinfo
index db996ac20c1b..b0f7388d05ca 100644
--- a/databases/rubygem-activemodel61/distinfo
+++ b/databases/rubygem-activemodel61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709390994
-SHA256 (rubygem/activemodel-6.1.7.7.gem) = 5ecd0c1b92025066fb9c9e2749e2d8d064e9d37108e6ef40f3da89795212e37f
-SIZE (rubygem/activemodel-6.1.7.7.gem) = 62464
+TIMESTAMP = 1717568520
+SHA256 (rubygem/activemodel-6.1.7.8.gem) = d8225d7ff4c7d91f4396e583bcd59cf4020a7678297679c02c2af374c915a68c
+SIZE (rubygem/activemodel-6.1.7.8.gem) = 62464
diff --git a/databases/rubygem-activemodel70/Makefile b/databases/rubygem-activemodel70/Makefile
index 5a448e91cc7c..9d6b8ad386e4 100644
--- a/databases/rubygem-activemodel70/Makefile
+++ b/databases/rubygem-activemodel70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activemodel
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/databases/rubygem-activemodel70/distinfo b/databases/rubygem-activemodel70/distinfo
index 5edf068d23ef..09de3ea943e7 100644
--- a/databases/rubygem-activemodel70/distinfo
+++ b/databases/rubygem-activemodel70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391020
-SHA256 (rubygem/activemodel-7.0.8.1.gem) = 4115aef7f780abd168629c5d77031b014eecd84a52760ab149920148dfbe2d3f
-SIZE (rubygem/activemodel-7.0.8.1.gem) = 61952
+TIMESTAMP = 1717568546
+SHA256 (rubygem/activemodel-7.0.8.4.gem) = ef4e092d8644121b3e756e831bed6a16878317d02b9611bec8efcfdaee6525d6
+SIZE (rubygem/activemodel-7.0.8.4.gem) = 61952
diff --git a/databases/rubygem-activemodel71/Makefile b/databases/rubygem-activemodel71/Makefile
index 2cc4d62c906c..566ca390cfa6 100644
--- a/databases/rubygem-activemodel71/Makefile
+++ b/databases/rubygem-activemodel71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activemodel
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/databases/rubygem-activemodel71/distinfo b/databases/rubygem-activemodel71/distinfo
index 299dc0bb5254..7cf030fdbee1 100644
--- a/databases/rubygem-activemodel71/distinfo
+++ b/databases/rubygem-activemodel71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391046
-SHA256 (rubygem/activemodel-7.1.3.2.gem) = 108e5262f96333c694e0fdba0209de5beeec1084b9a947940c259450f45d715c
-SIZE (rubygem/activemodel-7.1.3.2.gem) = 69120
+TIMESTAMP = 1717568572
+SHA256 (rubygem/activemodel-7.1.3.4.gem) = f4c838ea76dfca8967e433ac89603342ae20b65dd61366e62f07120a08e1ad72
+SIZE (rubygem/activemodel-7.1.3.4.gem) = 69120
diff --git a/databases/rubygem-activerecord61/Makefile b/databases/rubygem-activerecord61/Makefile
index 9ed76ad8e507..4e82d19f61a4 100644
--- a/databases/rubygem-activerecord61/Makefile
+++ b/databases/rubygem-activerecord61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activerecord
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/databases/rubygem-activerecord61/distinfo b/databases/rubygem-activerecord61/distinfo
index 7eb347bf55c6..3a45d042d751 100644
--- a/databases/rubygem-activerecord61/distinfo
+++ b/databases/rubygem-activerecord61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709390996
-SHA256 (rubygem/activerecord-6.1.7.7.gem) = d6626189763fe9fdb02169f9aa114fdfdcf74196e22ed5a81853f09dfdabfe63
-SIZE (rubygem/activerecord-6.1.7.7.gem) = 434176
+TIMESTAMP = 1717568522
+SHA256 (rubygem/activerecord-6.1.7.8.gem) = 37e12a89090eebbc0b9bdde8c76a578b2c31a5f023895b70810fb64052f51674
+SIZE (rubygem/activerecord-6.1.7.8.gem) = 434176
diff --git a/databases/rubygem-activerecord70/Makefile b/databases/rubygem-activerecord70/Makefile
index 12d2144b3373..d958348e1c9d 100644
--- a/databases/rubygem-activerecord70/Makefile
+++ b/databases/rubygem-activerecord70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activerecord
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/databases/rubygem-activerecord70/distinfo b/databases/rubygem-activerecord70/distinfo
index 2d27aaa05a4d..eae037fc0bd7 100644
--- a/databases/rubygem-activerecord70/distinfo
+++ b/databases/rubygem-activerecord70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391022
-SHA256 (rubygem/activerecord-7.0.8.1.gem) = 8e5dfbad90638944fc99b64337dffa729b1aaf2cd38ea624a08dcd9259f09366
-SIZE (rubygem/activerecord-7.0.8.1.gem) = 480256
+TIMESTAMP = 1717568548
+SHA256 (rubygem/activerecord-7.0.8.4.gem) = 8b49aac0258527680e79e04020951462c121c74ad1f69d41ce6f30b9b7047bde
+SIZE (rubygem/activerecord-7.0.8.4.gem) = 480256
diff --git a/databases/rubygem-activerecord71/Makefile b/databases/rubygem-activerecord71/Makefile
index c2c7e61c8007..8d294de1cb6f 100644
--- a/databases/rubygem-activerecord71/Makefile
+++ b/databases/rubygem-activerecord71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activerecord
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/databases/rubygem-activerecord71/distinfo b/databases/rubygem-activerecord71/distinfo
index 6b9260f4ef0b..dea3fe7eb3fc 100644
--- a/databases/rubygem-activerecord71/distinfo
+++ b/databases/rubygem-activerecord71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391048
-SHA256 (rubygem/activerecord-7.1.3.2.gem) = 4872900c3340948e2fc92ea08397034eaacd8cec1760ed7704975a116cc78173
-SIZE (rubygem/activerecord-7.1.3.2.gem) = 544256
+TIMESTAMP = 1717568574
+SHA256 (rubygem/activerecord-7.1.3.4.gem) = 784eeca4d6f23391d445552d6675a47c594555361c3b042108d29f0c7b9230f2
+SIZE (rubygem/activerecord-7.1.3.4.gem) = 544256
diff --git a/databases/tile38/Makefile b/databases/tile38/Makefile
index 4f1aa5b7cf13..8fc862a00843 100644
--- a/databases/tile38/Makefile
+++ b/databases/tile38/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tile38
 DISTVERSION=	1.12.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	databases
 
 MAINTAINER=	a.andersson.thn@gmail.com
diff --git a/databases/timescaledb-backup/Makefile b/databases/timescaledb-backup/Makefile
index fb3bd945ee95..067a65400240 100644
--- a/databases/timescaledb-backup/Makefile
+++ b/databases/timescaledb-backup/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	timescaledb-backup
 DISTVERSION=	0.1.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org
diff --git a/databases/timescaledb-tune/Makefile b/databases/timescaledb-tune/Makefile
index aeeeff75336a..9857a4a124c6 100644
--- a/databases/timescaledb-tune/Makefile
+++ b/databases/timescaledb-tune/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	timescaledb-tune
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org
diff --git a/databases/usql/Makefile b/databases/usql/Makefile
index 106c47f131a1..344160a2f234 100644
--- a/databases/usql/Makefile
+++ b/databases/usql/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	usql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile
index 23737d5048ac..2c0defe8df3b 100644
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@@ -12,6 +12,8 @@ LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL
 
+BROKEN_armv7=	compilation fails: non-constant-expression cannot be narrowed from type 'time_t' (aka 'long long') to 'long' in initializer list, see https://github.com/xrootd/xrootd/issues/2272
+
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtinyxml.so:textproc/tinyxml \
diff --git a/deskutils/chart/Makefile b/deskutils/chart/Makefile
index ee50a44118e9..e4feeedcb14c 100644
--- a/deskutils/chart/Makefile
+++ b/deskutils/chart/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chart
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	deskutils
 
 MAINTAINER=	mail@dbalan.in
diff --git a/deskutils/dstask/Makefile b/deskutils/dstask/Makefile
index 119270186381..69edfbb1c448 100644
--- a/deskutils/dstask/Makefile
+++ b/deskutils/dstask/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dstask
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.26
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	deskutils
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/deskutils/noti/Makefile b/deskutils/noti/Makefile
index 21520ca8bdc9..47a05f56b337 100644
--- a/deskutils/noti/Makefile
+++ b/deskutils/noti/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	noti
 DISTVERSION=	3.7.0
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	deskutils
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/deskutils/ultralist/Makefile b/deskutils/ultralist/Makefile
index 4f26a9c99640..b99e05f74a0d 100644
--- a/deskutils/ultralist/Makefile
+++ b/deskutils/ultralist/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ultralist
 DISTVERSION=	1.7.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	deskutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/android-tools/Makefile b/devel/android-tools/Makefile
index dad30d4174ef..0d3077a87cdc 100644
--- a/devel/android-tools/Makefile
+++ b/devel/android-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	android-tools
 PORTVERSION=	31.0.3p2.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 MASTER_SITES=	GH
 
diff --git a/devel/app-builder/Makefile b/devel/app-builder/Makefile
index c8b01ccb92d3..6b1aec44ebef 100644
--- a/devel/app-builder/Makefile
+++ b/devel/app-builder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	app-builder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.2
-PORTREVISION=	4
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel
 
diff --git a/devel/arduino-builder/Makefile b/devel/arduino-builder/Makefile
index 3689237179c8..43ed4322f617 100644
--- a/devel/arduino-builder/Makefile
+++ b/devel/arduino-builder/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arduino-builder
 PORTVERSION=	1.3.25
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel
 
 MAINTAINER=	kevans@FreeBSD.org
diff --git a/devel/arduinoOTA/Makefile b/devel/arduinoOTA/Makefile
index 5b30539313f4..708f544d208f 100644
--- a/devel/arduinoOTA/Makefile
+++ b/devel/arduinoOTA/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arduinoOTA
 PORTVERSION=	1.2.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	kevans@FreeBSD.org
diff --git a/devel/atlantis/Makefile b/devel/atlantis/Makefile
index 92f1c774f685..fff6f53ab094 100644
--- a/devel/atlantis/Makefile
+++ b/devel/atlantis/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	atlantis
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.27.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/devel/awless/Makefile b/devel/awless/Makefile
index cdddf0a7d670..6bca0d2a58f5 100644
--- a/devel/awless/Makefile
+++ b/devel/awless/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	awless
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.11
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/bazel-buildtools/Makefile b/devel/bazel-buildtools/Makefile
index 01fb7654e4f5..b82aec897e33 100644
--- a/devel/bazel-buildtools/Makefile
+++ b/devel/bazel-buildtools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bazel-buildtools
 DISTVERSION=	3.2.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/bit/Makefile b/devel/bit/Makefile
index ee12f0103816..8af12a904a71 100644
--- a/devel/bit/Makefile
+++ b/devel/bit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/devel/buildkite-agent/Makefile b/devel/buildkite-agent/Makefile
index c5b6b5eb5241..fa0cafd28efe 100644
--- a/devel/buildkite-agent/Makefile
+++ b/devel/buildkite-agent/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	buildkite-agent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.47.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/devel/busd/Makefile b/devel/busd/Makefile
index 3a8ffc92d850..cd9324c07776 100644
--- a/devel/busd/Makefile
+++ b/devel/busd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	busd
-DISTVERSION=	0.3.0
-PORTREVISION=	2
+DISTVERSION=	0.3.1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/busd/Makefile.crates b/devel/busd/Makefile.crates
index 3bde8f433582..2bce4b0f1a3e 100644
--- a/devel/busd/Makefile.crates
+++ b/devel/busd/Makefile.crates
@@ -6,7 +6,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		anstyle-parse-0.2.3 \
 		anstyle-query-1.0.2 \
 		anstyle-wincon-3.0.2 \
-		anyhow-1.0.82 \
+		anyhow-1.0.83 \
 		async-broadcast-0.7.0 \
 		async-channel-2.2.0 \
 		async-io-2.3.1 \
@@ -124,7 +124,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		polling-3.4.0 \
 		ppv-lite86-0.2.17 \
 		proc-macro-crate-3.1.0 \
-		proc-macro2-1.0.78 \
+		proc-macro2-1.0.82 \
 		prost-0.12.3 \
 		prost-derive-0.12.3 \
 		prost-types-0.12.3 \
@@ -141,8 +141,8 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		rustix-0.38.31 \
 		rustversion-1.0.14 \
 		ryu-1.0.16 \
-		serde-1.0.199 \
-		serde_derive-1.0.199 \
+		serde-1.0.201 \
+		serde_derive-1.0.201 \
 		serde_json-1.0.113 \
 		serde_repr-0.1.19 \
 		sha1-0.10.6 \
@@ -204,8 +204,8 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		windows_x86_64_msvc-0.52.0 \
 		winnow-0.5.39 \
 		xdg-home-1.1.0 \
-		zbus-4.2.0 \
-		zbus_macros-4.2.0 \
+		zbus-4.2.1 \
+		zbus_macros-4.2.1 \
 		zbus_names-3.0.0 \
 		zvariant-4.0.3 \
 		zvariant_derive-4.0.3 \
diff --git a/devel/busd/distinfo b/devel/busd/distinfo
index d7ade3cbba24..3381f927ac34 100644
--- a/devel/busd/distinfo
+++ b/devel/busd/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1714562550
+TIMESTAMP = 1715262686
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -15,8 +15,8 @@ SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9ca
 SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
 SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
 SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
-SHA256 (rust/crates/anyhow-1.0.82.crate) = f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519
-SIZE (rust/crates/anyhow-1.0.82.crate) = 45361
+SHA256 (rust/crates/anyhow-1.0.83.crate) = 25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3
+SIZE (rust/crates/anyhow-1.0.83.crate) = 45650
 SHA256 (rust/crates/async-broadcast-0.7.0.crate) = 258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb
 SIZE (rust/crates/async-broadcast-0.7.0.crate) = 20852
 SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
@@ -251,8 +251,8 @@ SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad26
 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
-SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
-SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158
+SHA256 (rust/crates/proc-macro2-1.0.82.crate) = 8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b
+SIZE (rust/crates/proc-macro2-1.0.82.crate) = 48452
 SHA256 (rust/crates/prost-0.12.3.crate) = 146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a
 SIZE (rust/crates/prost-0.12.3.crate) = 29461
 SHA256 (rust/crates/prost-derive-0.12.3.crate) = efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e
@@ -285,10 +285,10 @@ SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d08732
 SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
 SHA256 (rust/crates/ryu-1.0.16.crate) = f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c
 SIZE (rust/crates/ryu-1.0.16.crate) = 47351
-SHA256 (rust/crates/serde-1.0.199.crate) = 0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a
-SIZE (rust/crates/serde-1.0.199.crate) = 77598
-SHA256 (rust/crates/serde_derive-1.0.199.crate) = 11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc
-SIZE (rust/crates/serde_derive-1.0.199.crate) = 55793
+SHA256 (rust/crates/serde-1.0.201.crate) = 780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c
+SIZE (rust/crates/serde-1.0.201.crate) = 77725
+SHA256 (rust/crates/serde_derive-1.0.201.crate) = c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865
+SIZE (rust/crates/serde_derive-1.0.201.crate) = 55865
 SHA256 (rust/crates/serde_json-1.0.113.crate) = 69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79
 SIZE (rust/crates/serde_json-1.0.113.crate) = 146970
 SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9
@@ -411,10 +411,10 @@ SHA256 (rust/crates/winnow-0.5.39.crate) = 5389a154b01683d28c77f8f68f49dea75f0a4
 SIZE (rust/crates/winnow-0.5.39.crate) = 159300
 SHA256 (rust/crates/xdg-home-1.1.0.crate) = 21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e
 SIZE (rust/crates/xdg-home-1.1.0.crate) = 3600
-SHA256 (rust/crates/zbus-4.2.0.crate) = 6aea58d1af0aaa8abf87f3d9ade9b8f46bf13727e5f9fb24bc31ee9d94a9b4ad
-SIZE (rust/crates/zbus-4.2.0.crate) = 156978
-SHA256 (rust/crates/zbus_macros-4.2.0.crate) = 1bf2b496ec1e2d3c4a7878e351607f7a2bec1e1029b353683dfc28a22999e369
-SIZE (rust/crates/zbus_macros-4.2.0.crate) = 28836
+SHA256 (rust/crates/zbus-4.2.1.crate) = e5915716dff34abef1351d2b10305b019c8ef33dcf6c72d31a6e227d5d9d7a21
+SIZE (rust/crates/zbus-4.2.1.crate) = 157271
+SHA256 (rust/crates/zbus_macros-4.2.1.crate) = 66fceb36d0c1c4a6b98f3ce40f410e64e5a134707ed71892e1b178abc4c695d4
+SIZE (rust/crates/zbus_macros-4.2.1.crate) = 28865
 SHA256 (rust/crates/zbus_names-3.0.0.crate) = 4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c
 SIZE (rust/crates/zbus_names-3.0.0.crate) = 10650
 SHA256 (rust/crates/zvariant-4.0.3.crate) = 4e9282c6945d9e27742ba7ad7191325546636295de7b83f6735af73159b32ac7
@@ -423,5 +423,5 @@ SHA256 (rust/crates/zvariant_derive-4.0.3.crate) = 0142549e559746ff09d194dd43d25
 SIZE (rust/crates/zvariant_derive-4.0.3.crate) = 11000
 SHA256 (rust/crates/zvariant_utils-1.1.1.crate) = 75fa7291bdd68cd13c4f97cc9d78cbf16d96305856dfc7ac942aeff4c2de7d5a
 SIZE (rust/crates/zvariant_utils-1.1.1.crate) = 6859
-SHA256 (dbus2-busd-0.3.0_GH0.tar.gz) = 250c31099015c54b71ccbdd762286815694ab2dd571d9a25db99620cff34c0b6
-SIZE (dbus2-busd-0.3.0_GH0.tar.gz) = 40667
+SHA256 (dbus2-busd-0.3.1_GH0.tar.gz) = bf7c860702b3e70cfb0503c07e5d2b0a261cf45bcd2dd560cfd30aa5a7709676
+SIZE (dbus2-busd-0.3.1_GH0.tar.gz) = 40665
diff --git a/devel/busd/files/patch-zbus b/devel/busd/files/patch-zbus
deleted file mode 100644
index 194aa47b6311..000000000000
--- a/devel/busd/files/patch-zbus
+++ /dev/null
@@ -1,114 +0,0 @@
-https://github.com/dbus2/zbus/pull/757
-
---- cargo-crates/zbus-4.2.0/src/connection/handshake/client.rs.orig	2006-07-24 01:21:28 UTC
-+++ cargo-crates/zbus-4.2.0/src/connection/handshake/client.rs
-@@ -95,21 +95,16 @@ impl Client {
-     #[instrument(skip(self))]
-     #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
-     async fn send_zero_byte(&mut self) -> Result<()> {
--        let written = self
--            .common
--            .socket_mut()
--            .write_mut()
--            .send_zero_byte()
--            .await
--            .map_err(|e| {
--                Error::Handshake(format!("Could not send zero byte with credentials: {}", e))
--            })
--            .and_then(|n| match n {
--                None => Err(Error::Handshake(
--                    "Could not send zero byte with credentials".to_string(),
--                )),
--                Some(n) => Ok(n),
--            })?;
-+        let write = self.common.socket_mut().write_mut();
-+
-+        let written = match write.send_zero_byte().await.map_err(|e| {
-+            Error::Handshake(format!("Could not send zero byte with credentials: {}", e))
-+        })? {
-+            // This likely means that the socket type is unable to send SCM_CREDS.
-+            // Let's try to send the 0 byte as a regular message.
-+            None => write.sendmsg(&[0], &[]).await?,
-+            Some(n) => n,
-+        };
- 
-         if written != 1 {
-             return Err(Error::Handshake(
---- cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs.orig	2006-07-24 01:21:28 UTC
-+++ cargo-crates/zbus-4.2.0/src/connection/handshake/common.rs
-@@ -122,17 +122,13 @@ impl Common {
-                 if self.first_command {
-                     // The first command is sent by the client so we can assume it's the server.
-                     self.first_command = false;
--                    // leading 0 is sent separately for `freebsd` and `dragonfly`.
--                    #[cfg(not(any(target_os = "freebsd", target_os = "dragonfly")))]
--                    {
--                        if self.recv_buffer[0] != b'\0' {
--                            return Err(Error::Handshake(
--                                "First client byte is not NUL!".to_string(),
--                            ));
--                        }
--
--                        start_index = 1;
-+                    if self.recv_buffer[0] != b'\0' {
-+                        return Err(Error::Handshake(
-+                            "First client byte is not NUL!".to_string(),
-+                        ));
-                     }
-+
-+                    start_index = 1;
-                 };
- 
-                 let line_bytes = self.recv_buffer.drain(..=lf_index);
---- cargo-crates/zbus-4.2.0/src/connection/socket/tcp.rs.orig	2006-07-24 01:21:28 UTC
-+++ cargo-crates/zbus-4.2.0/src/connection/socket/tcp.rs
-@@ -26,32 +26,25 @@ impl ReadHalf for Arc<Async<TcpStream>> {
-         }
-     }
- 
-+    #[cfg(windows)]
-     async fn peer_credentials(&mut self) -> io::Result<crate::fdo::ConnectionCredentials> {
--        #[cfg(windows)]
--        let creds = {
--            let stream = self.clone();
--            crate::Task::spawn_blocking(
--                move || {
--                    use crate::win32::{tcp_stream_get_peer_pid, ProcessToken};
-+        let stream = self.clone();
-+        crate::Task::spawn_blocking(
-+            move || {
-+                use crate::win32::{tcp_stream_get_peer_pid, ProcessToken};
- 
--                    let pid = tcp_stream_get_peer_pid(stream.get_ref())? as _;
--                    let sid = ProcessToken::open(if pid != 0 { Some(pid as _) } else { None })
--                        .and_then(|process_token| process_token.sid())?;
--                    io::Result::Ok(
--                        crate::fdo::ConnectionCredentials::default()
--                            .set_process_id(pid)
--                            .set_windows_sid(sid),
--                    )
--                },
--                "peer credentials",
--            )
--            .await
--        }?;
--
--        #[cfg(not(windows))]
--        let creds = crate::fdo::ConnectionCredentials::default();
--
--        Ok(creds)
-+                let pid = tcp_stream_get_peer_pid(stream.get_ref())? as _;
-+                let sid = ProcessToken::open(if pid != 0 { Some(pid as _) } else { None })
-+                    .and_then(|process_token| process_token.sid())?;
-+                io::Result::Ok(
-+                    crate::fdo::ConnectionCredentials::default()
-+                        .set_process_id(pid)
-+                        .set_windows_sid(sid),
-+                )
-+            },
-+            "peer credentials",
-+        )
-+        .await
-     }
- }
- 
diff --git a/devel/capslock/Makefile b/devel/capslock/Makefile
index 8f3c41d38a3c..96baac8e69f0 100644
--- a/devel/capslock/Makefile
+++ b/devel/capslock/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	capslock
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/chroma/Makefile b/devel/chroma/Makefile
index 0791f5543c61..01805412f08d 100644
--- a/devel/chroma/Makefile
+++ b/devel/chroma/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chroma
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-syntax-highlighter
 
diff --git a/devel/corrade/Makefile b/devel/corrade/Makefile
index 3e92c16357a1..1f03632a7afc 100644
--- a/devel/corrade/Makefile
+++ b/devel/corrade/Makefile
@@ -12,6 +12,9 @@ WWW=		https://magnum.graphics/corrade/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_FreeBSD_13_armv7=	compilation fails: error: use of undeclared identifier 'vshrn_high_n_u16'
+BROKEN_FreeBSD_14_armv7=	compilation fails: error: use of undeclared identifier 'vshrn_high_n_u16'
+
 USES=		cmake:testing compiler:c++14-lang
 USE_LDCONFIG=	yes
 
diff --git a/devel/delve/Makefile b/devel/delve/Makefile
index 2dfe3123ede8..33d5396f208f 100644
--- a/devel/delve/Makefile
+++ b/devel/delve/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	delve
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.22.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	dmitry.wagin@ya.ru
diff --git a/devel/dupl/Makefile b/devel/dupl/Makefile
index 4df11c757bf4..563c49119bce 100644
--- a/devel/dupl/Makefile
+++ b/devel/dupl/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	dupl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0-11
 DISTVERSIONSUFFIX=	-g28d787e
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/dwarf2json/Makefile b/devel/dwarf2json/Makefile
index c628e10defea..f2b222c6d17f 100644
--- a/devel/dwarf2json/Makefile
+++ b/devel/dwarf2json/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dwarf2json
 DISTVERSION=	g20220807
-PORTREVISION=	14
+PORTREVISION=	16
 CATEGORIES=	devel
 
 MAINTAINER=	antoine@FreeBSD.org
diff --git a/devel/electron28/Makefile.version b/devel/electron28/Makefile.version
index a528dba2ed93..0fb9d3848a72 100644
--- a/devel/electron28/Makefile.version
+++ b/devel/electron28/Makefile.version
@@ -1,2 +1,2 @@
-ELECTRON_VER=	28.3.1
+ELECTRON_VER=	28.3.3
 ELECTRON_VER_MAJOR=	${ELECTRON_VER:C/\..*//}
diff --git a/devel/electron28/distinfo b/devel/electron28/distinfo
index 6e06227d0171..50279ad16254 100644
--- a/devel/electron28/distinfo
+++ b/devel/electron28/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1713473841
+TIMESTAMP = 1716620674
 SHA256 (electron/chromium-120.0.6099.291.tar.xz) = edb20651392a67dbefced6489d2228a2b7d18ec2bbba4e5bbe355b34ba87fe49
 SIZE (electron/chromium-120.0.6099.291.tar.xz) = 1578614892
 SHA256 (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 8ada8e0554ecd02f649047f8f15a438590c67505b9f2e6a58fd973fe02c4ca52
 SIZE (electron/bb991b26ccca36a9b3912b51dec5b70e5dea9aea) = 9782997
 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
-SHA256 (electron/electron-yarn-cache-28.3.1.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518
-SIZE (electron/electron-yarn-cache-28.3.1.tar.xz) = 29073696
-SHA256 (electron/electron-electron-v28.3.1_GH0.tar.gz) = 17fbdeab8ca413200d1cf0d06e6d813e49cd6cbae523a1dcb4a54e2ff0e2fa87
-SIZE (electron/electron-electron-v28.3.1_GH0.tar.gz) = 11508443
+SHA256 (electron/electron-yarn-cache-28.3.3.tar.xz) = ee4117440555d6be62f706646bb1b3c6737cc5b741b8e72377136c72a3474518
+SIZE (electron/electron-yarn-cache-28.3.3.tar.xz) = 29073696
+SHA256 (electron/electron-electron-v28.3.3_GH0.tar.gz) = 10688be79f27046d5e946db055e28f5d317e6c66f47c2591499cd2d5eb4264b2
+SIZE (electron/electron-electron-v28.3.3_GH0.tar.gz) = 11535251
 SHA256 (electron/nodejs-node-v18.18.2_GH0.tar.gz) = b1c20070ec2cfc930572e8d3c3f1de4be8bc7e2259956031db00709b7775a0da
 SIZE (electron/nodejs-node-v18.18.2_GH0.tar.gz) = 112758381
 SHA256 (electron/nodejs-nan-e14bdcd1f72d62bca1d541b66da43130384ec213_GH0.tar.gz) = 02edf8d5b3fef9af94d8a1355da60564a57e7f2c99cb422bce042400607ed2eb
diff --git a/devel/esbuild/Makefile b/devel/esbuild/Makefile
index db545e7195ef..68df46f8d999 100644
--- a/devel/esbuild/Makefile
+++ b/devel/esbuild/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	esbuild
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel www
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile
index 6fff8a81071a..9e4da5955c17 100644
--- a/devel/etcd/Makefile
+++ b/devel/etcd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	2.3.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	24
+PORTREVISION=	26
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 
diff --git a/devel/etcd31/Makefile b/devel/etcd31/Makefile
index f49843f99d0a..21651b0b506e 100644
--- a/devel/etcd31/Makefile
+++ b/devel/etcd31/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	3.1.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	23
+PORTREVISION=	25
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	31
diff --git a/devel/etcd32/Makefile b/devel/etcd32/Makefile
index 4162d634c8e1..268a3ef6eb8d 100644
--- a/devel/etcd32/Makefile
+++ b/devel/etcd32/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	3.2.32
 DISTVERSIONPREFIX=	v
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	32
diff --git a/devel/etcd33/Makefile b/devel/etcd33/Makefile
index 3aaa74316f8b..778283abfb14 100644
--- a/devel/etcd33/Makefile
+++ b/devel/etcd33/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	3.3.23
 DISTVERSIONPREFIX=	v
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	33
diff --git a/devel/etcd34/Makefile b/devel/etcd34/Makefile
index d2dd4103818b..53040edf1235 100644
--- a/devel/etcd34/Makefile
+++ b/devel/etcd34/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	etcd
 PORTVERSION=	3.4.18
 DISTVERSIONPREFIX=	v
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
 PKGNAMESUFFIX=	34
diff --git a/devel/gh/Makefile b/devel/gh/Makefile
index 50ebe8dbd7f8..5a0303f31158 100644
--- a/devel/gh/Makefile
+++ b/devel/gh/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.42.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/ghq/Makefile b/devel/ghq/Makefile
index bb15d5fdfd2b..8d29a371c893 100644
--- a/devel/ghq/Makefile
+++ b/devel/ghq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ghq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/devel/git-bug/Makefile b/devel/git-bug/Makefile
index 366dc7fc8874..31391cb7f473 100644
--- a/devel/git-bug/Makefile
+++ b/devel/git-bug/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-bug
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index ba4a3a4d4dce..0dd3e7a1fa7c 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-codereview
 DISTVERSION=	1.11.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile
index 1921e1a8fe0f..6fa41e84d6f7 100644
--- a/devel/git-lfs/Makefile
+++ b/devel/git-lfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-lfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
diff --git a/devel/git-town/Makefile b/devel/git-town/Makefile
index 04a1ca8ed7af..dc3396ad5282 100644
--- a/devel/git-town/Makefile
+++ b/devel/git-town/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-town
 DISTVERSIONPREFIX=	v
 DISTVERSION=	10.0.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 326b4ae0f033..fc1593d460b6 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	git
-DISTVERSION=	2.44.0
+DISTVERSION=	2.45.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -57,7 +58,6 @@ USE_RC_SUBR=	git_daemon
 SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 		t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \
 		git-p4.py \
-		contrib/hg-to-git/hg-to-git.py \
 		contrib/hooks/update-paranoid \
 		contrib/fast-import/import-zips.py \
 		contrib/remote-helpers/git-remote-bzr \
@@ -241,7 +241,8 @@ post-build:
 
 .if ${SUBPORT} == core
 post-build-CONTRIB-on:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight
+	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} \
+		-C ${WRKSRC}/contrib/diff-highlight
 	${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl
 
 post-install:
@@ -273,7 +274,7 @@ post-install-HTMLDOCS-on:
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
 
 post-install-SUBTREE-on:
-	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
+	cd ${WRKSRC}/contrib/subtree && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \
 		${MAKE_ARGS} install install-doc
 
diff --git a/devel/git/distinfo b/devel/git/distinfo
index ebb1516be025..36ba888ca29b 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1708942187
-SHA256 (git-2.44.0.tar.xz) = e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3
-SIZE (git-2.44.0.tar.xz) = 7429952
-SHA256 (git-manpages-2.44.0.tar.xz) = 777be83bd54e301988fc49708cae3b5ce4b0971c2ca3b7a720be58e2f4633fcb
-SIZE (git-manpages-2.44.0.tar.xz) = 573444
-SHA256 (git-htmldocs-2.44.0.tar.xz) = 808f1221940de2a32d7b4a3f675f968a7d0a75058a12a791afcda58b01a6e820
-SIZE (git-htmldocs-2.44.0.tar.xz) = 1557284
+TIMESTAMP = 1717400072
+SHA256 (git-2.45.2.tar.xz) = 51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb
+SIZE (git-2.45.2.tar.xz) = 7487680
+SHA256 (git-manpages-2.45.2.tar.xz) = 0938309e86537063b9d6c39b12aa4a786e16e03d02a4d12866be2f3e0db919df
+SIZE (git-manpages-2.45.2.tar.xz) = 576428
+SHA256 (git-htmldocs-2.45.2.tar.xz) = 82fdcb1bc184c34f150dd6445efcb0d75498dbec85a362e41f08c16ad8a904bb
+SIZE (git-htmldocs-2.45.2.tar.xz) = 1569148
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index 20da54799c25..32174c3e81f5 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,6 +1,6 @@
---- Documentation/Makefile.orig	2021-08-16 21:18:43 UTC
+--- Documentation/Makefile.orig	2024-04-29 16:19:22 UTC
 +++ Documentation/Makefile
-@@ -120,11 +120,11 @@ DOC_MAN1 = $(patsubst %.txt,%.1,$(filter $(MAN_FILTER)
+@@ -134,11 +134,11 @@ DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER)
  DOC_MAN5 = $(patsubst %.txt,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT)))
  DOC_MAN7 = $(patsubst %.txt,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT)))
  
@@ -15,8 +15,8 @@
  mandir ?= $(prefix)/share/man
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
-@@ -241,7 +241,7 @@ ifndef V
- endif
+@@ -222,7 +222,7 @@ endif
+ ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
  endif
  
 -all: html man
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index 559f041a40a7..94fb2f735a0f 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2024-02-23 00:37:50 UTC
+--- Makefile.orig	2024-04-29 16:19:22 UTC
 +++ Makefile
 @@ -606,16 +606,16 @@ mandir = $(prefix)/share/man
  prefix = $(HOME)
@@ -32,20 +32,20 @@
  XGETTEXT = xgettext
  MSGCAT = msgcat
  MSGFMT = msgfmt
-@@ -1665,9 +1665,9 @@ ifndef NO_OPENSSL
+@@ -1671,9 +1671,9 @@ ifndef NO_OPENSSL
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
--	ifdef OPENSSLDIR
+-        ifdef OPENSSLDIR
 -		BASIC_CFLAGS += -I$(OPENSSLDIR)/include
 -		OPENSSL_LINK = $(call libpath_template,$(OPENSSLDIR)/$(lib))
 +	ifdef OPENSSLBASE
 +		BASIC_CFLAGS += -I$(OPENSSLBASE)/include
 +		OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib)
- 	else
+         else
  		OPENSSL_LINK =
- 	endif
-@@ -2574,7 +2574,7 @@ else # NO_PERL
+         endif
+@@ -2580,7 +2580,7 @@ else # NO_PERL
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
@@ -54,7 +54,7 @@
  	$(QUIET_GEN) \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-@@ -2590,7 +2590,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
+@@ -2596,7 +2596,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
  $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
  $(SCRIPT_PYTHON_GEN): % : %.py
  	$(QUIET_GEN) \
@@ -63,7 +63,7 @@
  	    $< >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
-@@ -3467,7 +3467,7 @@ install: all
+@@ -3473,7 +3473,7 @@ install: all
  	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index d9789ec60170..c3dbce60f1b3 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -822,16 +822,31 @@ share/man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.39.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.40.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.41.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.41.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.41.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.42.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.5.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.44.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.44.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.44.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.45.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.45.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.45.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -1349,6 +1364,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/coccinelle/xcalloc.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/xopen.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci
+%%CONTRIB%%share/git-core/contrib/coccinelle/xstrncmpz.cocci
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
@@ -1394,8 +1410,6 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/README
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/help
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/list
-%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
-%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
 %%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
 %%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 07d2f5bf3604..f95cf6104c2e 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gitaly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	16.11.1
+DISTVERSION=	16.11.2
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index cb4288f115aa..055771afaa65 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713982836
-SHA256 (go/devel_gitaly/gitaly-v16.11.1/go.mod) = 701cdacc7cfef68f40611c56a42b322cd4ddce5d2ad0508d51e43013adca7388
-SIZE (go/devel_gitaly/gitaly-v16.11.1/go.mod) = 11024
-SHA256 (go/devel_gitaly/gitaly-v16.11.1/gitaly-v16.11.1.tar.bz2) = 99d565a0ba2d819ec1e3a92ccff6b559fc15b1f58513cd0f3f49ffbb01d99ed4
-SIZE (go/devel_gitaly/gitaly-v16.11.1/gitaly-v16.11.1.tar.bz2) = 2607377
+TIMESTAMP = 1715233644
+SHA256 (go/devel_gitaly/gitaly-v16.11.2/go.mod) = 701cdacc7cfef68f40611c56a42b322cd4ddce5d2ad0508d51e43013adca7388
+SIZE (go/devel_gitaly/gitaly-v16.11.2/go.mod) = 11024
+SHA256 (go/devel_gitaly/gitaly-v16.11.2/gitaly-v16.11.2.tar.bz2) = 2ef5694964e536f9e484d821268579b96aabfd6fc412a1d8b968e85b560d3ab6
+SIZE (go/devel_gitaly/gitaly-v16.11.2/gitaly-v16.11.2.tar.bz2) = 2607224
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index a2e203ea126f..527f021d598d 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
-DISTVERSION=	16.11.0
-PORTREVISION=	1
+DISTVERSION=	16.11.1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo
index 2e6955dddd0a..18fc1348d532 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1713680467
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.0/prebuilt-x86_64.tar.xz) = 9594352
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.0/prebuilt-arm.tar.xz) = 9020896
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.0/go.mod) = cbc0d57f499b3cc442145200494bdde0df9a614135989887e539c2afcc9e799d
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.0/go.mod) = 10973
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.0/gitlab-runner-v16.11.0.tar.bz2) = 1e71c139e225cc3a87d65bfba4857608b0a14b4685d87f62cb45a2ff14f2c2d9
-SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.0/gitlab-runner-v16.11.0.tar.bz2) = 1377305
+TIMESTAMP = 1715234134
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.1/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.1/prebuilt-x86_64.tar.xz) = 9594352
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.1/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.1/prebuilt-arm.tar.xz) = 9020896
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.1/go.mod) = 1eec839126ddfc4c334e284ea1f6e229b61973a3eecd8017b5da199e118c177c
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.1/go.mod) = 10961
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v16.11.1/gitlab-runner-v16.11.1.tar.bz2) = f4bd615b68b7624f5d05e7733fb0dc208b4b17c4faddbf6aa3bd8f9e5e1130a5
+SIZE (go/devel_gitlab-runner/gitlab-runner-v16.11.1/gitlab-runner-v16.11.1.tar.bz2) = 1377748
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index bc77ddea9f3a..53b8921b1c0a 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gitlab-shell
 PORTVERSION=	14.35.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -38,14 +39,17 @@ DIST_SUBDIR=	go/${PKGORIGIN:S,/,_,g}/${DISTNAME}
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//}
 _USES_fetch+=	800:go-post-fetch
 go-post-fetch:
-	@${ECHO_MSG} "Copy go.mod as go mod download will modify it, which breaks checksum check"
-	@(cd ${DISTDIR}/${DIST_SUBDIR}; ${CP} go.mod go.mod.orig)
-	@${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";
-	@(cd ${DISTDIR}/${DIST_SUBDIR}; \
-		[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
-		${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
-	@${ECHO_MSG} "Restore previous go.mod"
-	@(cd ${DISTDIR}/${DIST_SUBDIR}; ${MV} go.mod.orig go.mod)
+	@if [ ! -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\
+		${ECHO_MSG} "Copy go.mod as go mod download will modify it, which breaks checksum check" ;\
+		(cd ${DISTDIR}/${DIST_SUBDIR}; ${CP} go.mod go.mod.orig) ;\
+		${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies";\
+		(cd ${DISTDIR}/${DIST_SUBDIR}; \
+			[ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \
+			${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) ;\
+		${ECHO_MSG} "Restore previous go.mod" ;\
+		(cd ${DISTDIR}/${DIST_SUBDIR}; ${MV} go.mod.orig go.mod) ;\
+		${TOUCH} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done;\
+	fi;
 # ---------------------------
 
 VARLOGDIR=	/var/log/gitlab-shell
@@ -81,4 +85,11 @@ post-install:
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+go-pre-delete-distfiles:
+	@if [ -e ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done ]; then\
+		${RM} ${DISTDIR}/${DIST_SUBDIR}/.go-post-fetch-done || ${TRUE};\
+	fi
+
+.include <bsd.port.pre.mk>
+delete-distfiles: go-pre-delete-distfiles
+.include <bsd.port.post.mk>
diff --git a/devel/gitleaks/Makefile b/devel/gitleaks/Makefile
index 40d2e6dd5593..446ae1c126fc 100644
--- a/devel/gitleaks/Makefile
+++ b/devel/gitleaks/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitleaks
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.18.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/gitty/Makefile b/devel/gitty/Makefile
index 64599b04c79a..761694db51c8 100644
--- a/devel/gitty/Makefile
+++ b/devel/gitty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	devel
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/devel/glab/Makefile b/devel/glab/Makefile
index 4f23306d5f3d..f0ce2e501e2b 100644
--- a/devel/glab/Makefile
+++ b/devel/glab/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	glab
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.38.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index bd073e31c716..75356d5488c9 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	glib
-DISTVERSION=	2.80.0
+DISTVERSION=	2.80.3
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -39,7 +39,7 @@ CPE_VENDOR=	gnome
 
 CONFLICTS_INSTALL=	p5-Giovanni
 
-_LIBVERSION=	0.8000.0
+_LIBVERSION=	0.8000.3
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
 OPTIONS_DEFINE=		DEBUG GTKDOC FAM_ALTBACKEND MANPAGES NLS TEST
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 3e5b6bb7b90b..ad6198eb91d6 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709847305
-SHA256 (gnome/glib-2.80.0.tar.xz) = 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
-SIZE (gnome/glib-2.80.0.tar.xz) = 5510536
+TIMESTAMP = 1718018529
+SHA256 (gnome/glib-2.80.3.tar.xz) = 3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
+SIZE (gnome/glib-2.80.3.tar.xz) = 5542940
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 30f577ccaae8..2afdd1e63947 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -998,6 +998,7 @@ share/gettext/its/gschema.loc
 %%NLS%%share/locale/it/LC_MESSAGES/glib20.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/glib20.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/glib20.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/glib20.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/glib20.mo
 %%NLS%%share/locale/kn/LC_MESSAGES/glib20.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/glib20.mo
diff --git a/devel/gllvm/Makefile b/devel/gllvm/Makefile
index fac88145f500..6b975dfe2171 100644
--- a/devel/gllvm/Makefile
+++ b/devel/gllvm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gllvm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	devel
 
 MAINTAINER=	arrowd@FreeBSD.org
diff --git a/devel/go-bindata-assetfs/Makefile b/devel/go-bindata-assetfs/Makefile
index 6d718a4e9887..47963df7f657 100644
--- a/devel/go-bindata-assetfs/Makefile
+++ b/devel/go-bindata-assetfs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-bindata-assetfs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel www
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index eda9586d08c2..b18a16a822f2 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-bindata
 PORTVERSION=	3.1.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/devel/go-git/Makefile b/devel/go-git/Makefile
index 51e1b6d7f903..dfb6dc9d5c36 100644
--- a/devel/go-git/Makefile
+++ b/devel/go-git/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-git
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.10.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/devel/go-perf/Makefile b/devel/go-perf/Makefile
index 38674a7882a4..da12becec83b 100644
--- a/devel/go-perf/Makefile
+++ b/devel/go-perf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-perf
 PORTVERSION=	${MODVERSION:S/-/./g:R}
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/devel/go-protobuf/Makefile b/devel/go-protobuf/Makefile
index a5e6dc1f6cba..665a1bf4a2ce 100644
--- a/devel/go-protobuf/Makefile
+++ b/devel/go-protobuf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	protobuf
 DISTVERSION=	1.3.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
diff --git a/devel/go-tools/Makefile b/devel/go-tools/Makefile
index 334bb0541577..cf786de276c5 100644
--- a/devel/go-tools/Makefile
+++ b/devel/go-tools/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.0
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
diff --git a/devel/go-wire/Makefile b/devel/go-wire/Makefile
index f8460ba4a937..0ecb0599fdfc 100644
--- a/devel/go-wire/Makefile
+++ b/devel/go-wire/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	devel
 PKGNAMEPREFIX=	go-
 
diff --git a/devel/gocheese/Makefile b/devel/gocheese/Makefile
index 0b35c4a5784f..923ff3a174e6 100644
--- a/devel/gocheese/Makefile
+++ b/devel/gocheese/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gocheese
 DISTVERSION=	4.2.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.gocheese.cypherpunks.ru/download/
 
diff --git a/devel/gocritic/Makefile b/devel/gocritic/Makefile
index a1455d3edd6a..358a96994beb 100644
--- a/devel/gocritic/Makefile
+++ b/devel/gocritic/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gocritic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/devel/gogs/Makefile b/devel/gogs/Makefile
index 8a191b647200..cb9ddd3ace34 100644
--- a/devel/gogs/Makefile
+++ b/devel/gogs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gogs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.11
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	devel www
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile
index ef3fa4f66aa0..f43292b686c7 100644
--- a/devel/golangci-lint/Makefile
+++ b/devel/golangci-lint/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.57.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/golint/Makefile b/devel/golint/Makefile
index 2719cbfdf738..dddc6f317fd3 100644
--- a/devel/golint/Makefile
+++ b/devel/golint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	golint
 PORTVERSION=	g20190409
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/gopls/Makefile b/devel/gopls/Makefile
index 51ba8598e273..6635ff3515bc 100644
--- a/devel/gopls/Makefile
+++ b/devel/gopls/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gopls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.15.2
+DISTVERSION=	0.15.3
 PORTREVISION=	2
 CATEGORIES=	devel
 
diff --git a/devel/gopls/distinfo b/devel/gopls/distinfo
index 9cb7f11c2272..55dab4bb61e5 100644
--- a/devel/gopls/distinfo
+++ b/devel/gopls/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1710407822
-SHA256 (go/devel_gopls/gopls-v0.15.2/v0.15.2.mod) = b730e6667dc0eb75bc761aa79ba0560751e41b2fcb2eefd694255b969044a8e7
-SIZE (go/devel_gopls/gopls-v0.15.2/v0.15.2.mod) = 769
-SHA256 (go/devel_gopls/gopls-v0.15.2/v0.15.2.zip) = d90636ce34ab2b99787a7e1e31b8721dc08f9e48072b890fedb0ce9b042b992c
-SIZE (go/devel_gopls/gopls-v0.15.2/v0.15.2.zip) = 1646881
+TIMESTAMP = 1713652898
+SHA256 (go/devel_gopls/gopls-v0.15.3/v0.15.3.mod) = a0041e74d81665d4076d7f05796697a05c6a3c6ac0e7d7abfee6ba2929f174f6
+SIZE (go/devel_gopls/gopls-v0.15.3/v0.15.3.mod) = 769
+SHA256 (go/devel_gopls/gopls-v0.15.3/v0.15.3.zip) = fe5543655b563d20f225956b4730d1c638e0889b2c7176fc254ce7b55ab4521f
+SIZE (go/devel_gopls/gopls-v0.15.3/v0.15.3.zip) = 1650905
diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile
index f6f60d5b89ac..951a5fcb861d 100644
--- a/devel/goprotobuf/Makefile
+++ b/devel/goprotobuf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goprotobuf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel
 
diff --git a/devel/goredo/Makefile b/devel/goredo/Makefile
index 94a4b28173c6..01124b166a2a 100644
--- a/devel/goredo/Makefile
+++ b/devel/goredo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	goredo
 DISTVERSION=	1.32.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://www.goredo.cypherpunks.ru/download/
 
diff --git a/devel/goreleaser/Makefile b/devel/goreleaser/Makefile
index 1481aaee9159..4c530e355220 100644
--- a/devel/goreleaser/Makefile
+++ b/devel/goreleaser/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goreleaser
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.24.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index c97e086b056d..f0e362bba796 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -1,13 +1,8 @@
 PORTNAME=	gorm
-PORTVERSION=	1.2.23
-PORTREVISION=	5
+DISTVERSIONPREFIX=	gorm-
+DISTVERSION=	1_3_1
 CATEGORIES=	devel gnustep
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	gnustep
-GH_PROJECT=	apps-gorm
-GH_TAGNAME=	04554d2
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical Object Relationship Modeller
 WWW=		http://www.gnustep.org/experience/Gorm.html
@@ -15,9 +10,13 @@ WWW=		http://www.gnustep.org/experience/Gorm.html
 LICENSE=	GPLv3
 
 USES=		gnustep
-USE_GNUSTEP=	back build
+USE_GNUSTEP=	back build gui
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnustep
+GH_PROJECT=	apps-gorm
+
 DEFAULT_LIBVERSION=	1.1.0
 
 .include <bsd.port.options.mk>
diff --git a/devel/gorm/distinfo b/devel/gorm/distinfo
index 511c9e8ccef5..e460256c4b5c 100644
--- a/devel/gorm/distinfo
+++ b/devel/gorm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549185893
-SHA256 (gnustep-apps-gorm-1.2.23-04554d2_GH0.tar.gz) = 8c2f34d302ccd3b5ac9354b5bc31623e186280c4517d6a4c4a52b911cb09cd42
-SIZE (gnustep-apps-gorm-1.2.23-04554d2_GH0.tar.gz) = 667260
+TIMESTAMP = 1715884494
+SHA256 (gnustep-apps-gorm-gorm-1_3_1_GH0.tar.gz) = 7bad0c19ec96f759f720719c4e102384b93112ac433b717aa34d8ba2535aebdd
+SIZE (gnustep-apps-gorm-gorm-1_3_1_GH0.tar.gz) = 715925
diff --git a/devel/gorm/pkg-plist b/devel/gorm/pkg-plist
index 9f031333ecc5..6e20cd9822db 100644
--- a/devel/gorm/pkg-plist
+++ b/devel/gorm/pkg-plist
@@ -31,6 +31,9 @@ GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/Contr
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/ControlsPalette.gorm/data.info
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/ControlsPalette.gorm/objects.gorm
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/ControlsPalette.tiff
+GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormCellSizeInspector.gorm/data.classes
+GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormCellSizeInspector.gorm/data.info
+GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormCellSizeInspector.gorm/objects.gorm
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormNSBoxInspector.gorm/data.classes
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormNSBoxInspector.gorm/data.info
 GNUstep/System/Applications/Gorm.app/Resources/2Controls.palette/Resources/GormNSBoxInspector.gorm/objects.gorm
@@ -109,6 +112,7 @@ GNUstep/System/Applications/Gorm.app/Resources/Defaults.plist
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/Gorm.gorm/data.classes
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/Gorm.gorm/data.info
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/Gorm.gorm/objects.gorm
+GNUstep/System/Applications/Gorm.app/Resources/English.lproj/Gorm.rtfd/TXT.rtf
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/GormClassEditor.gorm/data.classes
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/GormClassEditor.gorm/data.info
 GNUstep/System/Applications/Gorm.app/Resources/English.lproj/GormClassEditor.gorm/objects.gorm
@@ -289,6 +293,7 @@ GNUstep/System/Library/Headers/GormCore/GormClassManager.h
 GNUstep/System/Library/Headers/GormCore/GormClassPanelController.h
 GNUstep/System/Library/Headers/GormCore/GormConnectionInspector.h
 GNUstep/System/Library/Headers/GormCore/GormControlEditor.h
+GNUstep/System/Library/Headers/GormCore/GormCore.h
 GNUstep/System/Library/Headers/GormCore/GormCustomClassInspector.h
 GNUstep/System/Library/Headers/GormCore/GormCustomView.h
 GNUstep/System/Library/Headers/GormCore/GormDocument.h
@@ -345,6 +350,7 @@ GNUstep/System/Library/Headers/GormCore/NSCell+GormAdditions.h
 GNUstep/System/Library/Headers/GormCore/NSColorWell+GormExtensions.h
 GNUstep/System/Library/Headers/GormCore/NSFontManager+GormExtensions.h
 GNUstep/System/Library/Headers/GormCore/NSView+GormExtensions.h
+GNUstep/System/Library/Headers/GormObjCHeaderParser/GormObjCHeaderParser.h
 GNUstep/System/Library/Headers/GormObjCHeaderParser/NSScanner+OCHeaderParser.h
 GNUstep/System/Library/Headers/GormObjCHeaderParser/OCClass.h
 GNUstep/System/Library/Headers/GormObjCHeaderParser/OCHeaderParser.h
@@ -358,6 +364,7 @@ GNUstep/System/Library/Headers/GormPrefs/GormHeadersPref.h
 GNUstep/System/Library/Headers/GormPrefs/GormPalettesPref.h
 GNUstep/System/Library/Headers/GormPrefs/GormPluginsPref.h
 GNUstep/System/Library/Headers/GormPrefs/GormPrefController.h
+GNUstep/System/Library/Headers/GormPrefs/GormPrefs.h
 GNUstep/System/Library/Headers/GormPrefs/GormShelfPref.h
 GNUstep/System/Library/Headers/InterfaceBuilder/IBApplicationAdditions.h
 GNUstep/System/Library/Headers/InterfaceBuilder/IBCellAdditions.h
@@ -385,12 +392,12 @@ GNUstep/System/Library/Libraries/libGorm.so
 GNUstep/System/Library/Libraries/libGorm.so.1
 GNUstep/System/Library/Libraries/libGorm.so.1.1.0
 GNUstep/System/Library/Libraries/libGormCore.so
-GNUstep/System/Library/Libraries/libGormCore.so.%%VERSION%%
 GNUstep/System/Library/Libraries/libGormCore.so.1
+GNUstep/System/Library/Libraries/libGormCore.so.%%VERSION%%
 GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so
 GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so.1
 GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so.1.1.0
 GNUstep/System/Library/Libraries/libGormPrefs.so
-GNUstep/System/Library/Libraries/libGormPrefs.so.%%VERSION%%
 GNUstep/System/Library/Libraries/libGormPrefs.so.1
+GNUstep/System/Library/Libraries/libGormPrefs.so.%%VERSION%%
 GNUstep/System/Tools/Gorm
diff --git a/devel/goswagger/Makefile b/devel/goswagger/Makefile
index e4bbdc18d59a..e8dec914526c 100644
--- a/devel/goswagger/Makefile
+++ b/devel/goswagger/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goswagger
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.30.4
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/gpm/Makefile b/devel/gpm/Makefile
index 40ceb31b965b..6bd0d99641f4 100644
--- a/devel/gpm/Makefile
+++ b/devel/gpm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gpm
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	lukejee@gmail.com
diff --git a/devel/grv/Makefile b/devel/grv/Makefile
index 3fba31c9da24..6a3d3cfc6081 100644
--- a/devel/grv/Makefile
+++ b/devel/grv/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
-PORTREVISION=	26
+PORTREVISION=	28
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/gum/Makefile b/devel/gum/Makefile
index b2110080f6d6..e0ee7af3e8a9 100644
--- a/devel/gum/Makefile
+++ b/devel/gum/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	dave@bitboss.ca
diff --git a/devel/gvp/Makefile b/devel/gvp/Makefile
index 766e2847cd30..ff4be71dc6a4 100644
--- a/devel/gvp/Makefile
+++ b/devel/gvp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gvp
 PORTVERSION=	0.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	lukejee@gmail.com
diff --git a/devel/hub/Makefile b/devel/hub/Makefile
index 1b2097a2b550..5b720d0cf2b2 100644
--- a/devel/hub/Makefile
+++ b/devel/hub/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hub
 PORTVERSION=	2.14.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile
index 19540080726e..88d1463d0f04 100644
--- a/devel/hyprlang/Makefile
+++ b/devel/hyprlang/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hyprlang
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.1
+DISTVERSION=	0.5.2
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo
index 2041db8f243c..bc5e5b63a339 100644
--- a/devel/hyprlang/distinfo
+++ b/devel/hyprlang/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713121246
-SHA256 (hyprwm-hyprlang-v0.5.1_GH0.tar.gz) = 7f521906d3f40b8d7b2bfcbe29a8286e9c65a7a601994344278bc16325bbd75d
-SIZE (hyprwm-hyprlang-v0.5.1_GH0.tar.gz) = 56237
+TIMESTAMP = 1716458409
+SHA256 (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 66a1f87634c8ecdeb67d7ccc499a3fc1c19b064a098b103be042751e7430b5cc
+SIZE (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 56383
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
diff --git a/devel/hyprlang/files/patch-CMakeLists.txt b/devel/hyprlang/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..908484955fd4
--- /dev/null
+++ b/devel/hyprlang/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+https://github.com/hyprwm/hyprlang/issues/46
+
+--- CMakeLists.txt.orig	2024-05-23 10:00:09 UTC
++++ CMakeLists.txt
+@@ -45,7 +45,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     # probably evil. Arch's clang is very outdated tho...
+     target_compile_options(hyprlang PUBLIC -std=gnu++2b -D__cpp_concepts=202002L -Wno-macro-redefined)
+     add_compile_options(-stdlib=libc++)
+-    add_link_options(-stdlib=libc++ -lc++abi)
++    add_link_options(-stdlib=libc++)
+     message(STATUS "Using clang++ to compile hyprlang")
+ endif()
+ 
diff --git a/devel/influx-pkg-config/Makefile b/devel/influx-pkg-config/Makefile
index e993c0f1ffd2..305f19840e7b 100644
--- a/devel/influx-pkg-config/Makefile
+++ b/devel/influx-pkg-config/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pkg-config
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.13
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	devel
 PKGNAMEPREFIX=	influx
 
diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile
index 678556484f62..965628805c0e 100644
--- a/devel/jiri/Makefile
+++ b/devel/jiri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jiri
 PORTVERSION=	g${TIMESTAMP:S/-/./g:C/T.*//g}
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/swills
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/devel/kf6-kauth/Makefile b/devel/kf6-kauth/Makefile
index eece6bf7eaf1..f9e98592664e 100644
--- a/devel/kf6-kauth/Makefile
+++ b/devel/kf6-kauth/Makefile
@@ -1,12 +1,15 @@
 PORTNAME=	kauth
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 COMMENT=	Execute actions as privileged user
 MAINTAINER=	kde@FreeBSD.org
 
+LIB_DEPENDS=	libpolkit-qt6-core-1.so:sysutils/polkit-qt-1@qt6
+
 USES=		cmake kde:6 qt:6 tar:xz
-USE_KDE=	coreaddons kded \
+USE_KDE=	coreaddons kded windowsystem \
 		ecm:build
 USE_QT=		base
 
diff --git a/devel/kf6-kauth/pkg-plist b/devel/kf6-kauth/pkg-plist
index 00e9c0be55f0..97c86bccc308 100644
--- a/devel/kf6-kauth/pkg-plist
+++ b/devel/kf6-kauth/pkg-plist
@@ -13,9 +13,13 @@ lib/cmake/KF6Auth/KF6AuthConfigVersion.cmake
 lib/cmake/KF6Auth/KF6AuthMacros.cmake
 lib/cmake/KF6Auth/KF6AuthTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF6Auth/KF6AuthTargets.cmake
+lib/cmake/KF6Auth/KF6AuthToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KF6Auth/KF6AuthToolsTargets.cmake
 lib/libKF6AuthCore.so
-lib/libKF6AuthCore.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libKF6AuthCore.so.6
+lib/libKF6AuthCore.so.%%KDE_FRAMEWORKS_VERSION%%
+lib/libexec/kf6/kauth/kauth-policy-gen
+%%QT_PLUGINDIR%%/kf6/kauth/backend/kauth_backend_plugin.so
 %%QT_PLUGINDIR%%/kf6/kauth/helper/kauth_helper_plugin.so
 share/dbus-1/system.d/org.kde.kf6auth.conf
 share/kf6/kauth/dbus_policy.stub
diff --git a/devel/kf6-ktexteditor/Makefile b/devel/kf6-ktexteditor/Makefile
index e23c815dae2b..84e57f98aebc 100644
--- a/devel/kf6-ktexteditor/Makefile
+++ b/devel/kf6-ktexteditor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ktexteditor
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 COMMENT=	Full text editor component
diff --git a/devel/kf6-ktexteditor/pkg-plist b/devel/kf6-ktexteditor/pkg-plist
index 0b8d24d3d75f..374dadaa4a7e 100644
--- a/devel/kf6-ktexteditor/pkg-plist
+++ b/devel/kf6-ktexteditor/pkg-plist
@@ -55,8 +55,8 @@ lib/cmake/KF6TextEditor/KF6TextEditorConfigVersion.cmake
 lib/cmake/KF6TextEditor/KF6TextEditorTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF6TextEditor/KF6TextEditorTargets.cmake
 lib/libKF6TextEditor.so
-lib/libKF6TextEditor.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libKF6TextEditor.so.6
+lib/libKF6TextEditor.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libexec/kf6/kauth/kauth_ktexteditor_helper
 %%QT_PLUGINDIR%%/kf6/parts/katepart.so
 share/dbus-1/system-services/org.kde.ktexteditor6.katetextbuffer.service
@@ -148,5 +148,6 @@ share/locale/wa/LC_MESSAGES/ktexteditor6.mo
 share/locale/xh/LC_MESSAGES/ktexteditor6.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditor6.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditor6.mo
+share/polkit-1/actions/org.kde.ktexteditor6.katetextbuffer.policy
 share/qlogging-categories6/ktexteditor.categories
 share/qlogging-categories6/ktexteditor.renamecategories
diff --git a/devel/lab/Makefile b/devel/lab/Makefile
index 11e119cf308d..42610d598236 100644
--- a/devel/lab/Makefile
+++ b/devel/lab/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lab
 PORTVERSION=	${MODVERSION:S/-/./g:R}
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/devel/lazygit/Makefile b/devel/lazygit/Makefile
index 0edd3b1a7cd8..5b5140bec6fd 100644
--- a/devel/lazygit/Makefile
+++ b/devel/lazygit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lazygit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.40.2
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	devel
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/devel/lefthook/Makefile b/devel/lefthook/Makefile
index bcc3e82352ac..e3f6e1ebb3e0 100644
--- a/devel/lefthook/Makefile
+++ b/devel/lefthook/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lefthook
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.8
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/lets/Makefile b/devel/lets/Makefile
index cb3226303990..1ae4f917b646 100644
--- a/devel/lets/Makefile
+++ b/devel/lets/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lets
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.53
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/libcjson/Makefile b/devel/libcjson/Makefile
index 5a0e276ca30d..2f5f4624cb1b 100644
--- a/devel/libcjson/Makefile
+++ b/devel/libcjson/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libcjson
-PORTVERSION=	1.7.17
+PORTVERSION=	1.7.18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -10,10 +10,10 @@ WWW=		https://github.com/DaveGamble/cJSON
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake:testing compiler:c11
+USES=		cmake:testing compiler:c11 pathfix
 
 CMAKE_OFF=	CJSON_OVERRIDE_BUILD_SHARED_LIBS ENABLE_CJSON_TEST ENABLE_CUSTOM_COMPILER_FLAGS ENABLE_HIDDEN_SYMBOLS ENABLE_SAFE_STACK ENABLE_SANITIZERS
-CMAKE_ON=	BUILD_SHARED_AND_STATIC_LIBS BUILD_SHARED_LIBS CJSON_BUILD_SHARED_LIBS ENABLE_CJSON_UTILS ENABLE_LOCALES ENABLE_PUBLIC_SYMBOLS ENABLE_TARGET_EXPORT
+CMAKE_ON=	BUILD_SHARED_AND_STATIC_LIBS BUILD_SHARED_LIBS CJSON_BUILD_SHARED_LIBS ENABLE_CJSON_UNINSTALL ENABLE_CJSON_UTILS ENABLE_CJSON_VERSION_SO ENABLE_LOCALES ENABLE_PUBLIC_SYMBOLS ENABLE_TARGET_EXPORT
 CMAKE_TESTING_ON=	ENABLE_CJSON_TEST ENABLE_SAFE_STACK
 USE_CSTD=	c11
 
diff --git a/devel/libcjson/distinfo b/devel/libcjson/distinfo
index 27dc7e7d7dd1..0842dd750e7a 100644
--- a/devel/libcjson/distinfo
+++ b/devel/libcjson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708448902
-SHA256 (DaveGamble-cJSON-v1.7.17_GH0.tar.gz) = c91d1eeb7175c50d49f6ba2a25e69b46bd05cffb798382c19bfb202e467ec51c
-SIZE (DaveGamble-cJSON-v1.7.17_GH0.tar.gz) = 353748
+TIMESTAMP = 1715842516
+SHA256 (DaveGamble-cJSON-v1.7.18_GH0.tar.gz) = 3aa806844a03442c00769b83e99970be70fbef03735ff898f4811dd03b9f5ee5
+SIZE (DaveGamble-cJSON-v1.7.18_GH0.tar.gz) = 354726
diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile
index 49699ae63856..7da59c9e5e79 100644
--- a/devel/liteide/Makefile
+++ b/devel/liteide/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	liteide
 DISTVERSIONPREFIX=	x
 DISTVERSION=	38.2
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	devel editors
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/loccount/Makefile b/devel/loccount/Makefile
index 6fca1913d3ec..69e6772d000a 100644
--- a/devel/loccount/Makefile
+++ b/devel/loccount/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	loccount
 DISTVERSION=	2.16
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.catb.org/~esr/loccount/
 
diff --git a/devel/mage/Makefile b/devel/mage/Makefile
index 34310ef46882..feeee0d3be8c 100644
--- a/devel/mage/Makefile
+++ b/devel/mage/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.0
-PORTREVISION=	5
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	devel
 
diff --git a/devel/modd/Makefile b/devel/modd/Makefile
index c4ad958f2950..2f1b28ba353e 100644
--- a/devel/modd/Makefile
+++ b/devel/modd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	modd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/mutagen/Makefile b/devel/mutagen/Makefile
index 1840c99cba28..48ca3590f7ad 100644
--- a/devel/mutagen/Makefile
+++ b/devel/mutagen/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mutagen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.5
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/objfw/Makefile b/devel/objfw/Makefile
index b14736cc92fc..3976109efebe 100644
--- a/devel/objfw/Makefile
+++ b/devel/objfw/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	objfw
-DISTVERSION=	1.0.5
+DISTVERSION=	1.1.2
 CATEGORIES=	devel lang
 MASTER_SITES=	https://objfw.nil.im/downloads/
 
@@ -7,11 +7,7 @@ MAINTAINER=	js@nil.im
 COMMENT=	Portable, lightweight framework for the Objective-C language
 WWW=		https://objfw.nil.im/
 
-LICENSE=		QPL GPLv2 GPLv3
-LICENSE_COMB=		dual
-LICENSE_NAME_QPL=	Q Public License
-LICENSE_FILE_QPL=	${WRKSRC}/LICENSE.QPL
-LICENSE_PERMS_QPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE=	LGPL3
 
 BROKEN_armv6=	test suite fails
 BROKEN_armv7=	test suite fails
@@ -23,7 +19,7 @@ TEST_TARGET=	check
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		SSL
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS NOSSL
+OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS MBEDTLS NOSSL
 OPTIONS_DEFAULT=	OPENSSL
 NOSSL_DESC=		no SSL/TLS support
 
@@ -40,6 +36,12 @@ GNUTLS_PLIST_SUB=	TLS=""
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		pkgconfig
 
+MBEDTLS_CONFIGURE_ON=	--with-tls=mbedtls
+MBEDTLS_PLIST_SUB=	TLS=""
+MBEDTLS_LIB_DEPENDS=	libmbedtls.so:security/mbedtls
+MBEDTLS_CPPFLAGS=	-I${PREFIX}/include
+MBEDTLS_LDFLAGS=	-L${PREFIX}/lib
+
 NOSSL_CONFIGURE_ON=	--without-tls
 NOSSL_PLIST_SUB=	TLS="@comment "
 
diff --git a/devel/objfw/distinfo b/devel/objfw/distinfo
index 98c74272d48e..85882ad2b6d7 100644
--- a/devel/objfw/distinfo
+++ b/devel/objfw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699187260
-SHA256 (objfw-1.0.5.tar.gz) = 798bda0590970fea10d5c8064e98088bb9960b3bc0475d92db443b0df9f205c4
-SIZE (objfw-1.0.5.tar.gz) = 797479
+TIMESTAMP = 1713650587
+SHA256 (objfw-1.1.2.tar.gz) = 5d9f9a70d583298e780ae11fc75a7ae2beeef904b301e1bc4f4ffa8d7ee31d9f
+SIZE (objfw-1.1.2.tar.gz) = 945717
diff --git a/devel/objfw/pkg-plist b/devel/objfw/pkg-plist
index 3893179f1710..4a910341a473 100644
--- a/devel/objfw/pkg-plist
+++ b/devel/objfw/pkg-plist
@@ -6,6 +6,8 @@ bin/ofarc
 bin/ofdns
 bin/ofhash
 bin/ofhttp
+include/ObjFW/OFAAAADNSResourceRecord.h
+include/ObjFW/OFADNSResourceRecord.h
 include/ObjFW/OFAcceptSocketFailedException.h
 include/ObjFW/OFAllocFailedException.h
 include/ObjFW/OFAlreadyOpenException.h
@@ -18,6 +20,7 @@ include/ObjFW/OFBindSocketFailedException.h
 include/ObjFW/OFBindUNIXSocketFailedException.h
 include/ObjFW/OFBlock.h
 include/ObjFW/OFBroadcastConditionFailedException.h
+include/ObjFW/OFCNAMEDNSResourceRecord.h
 include/ObjFW/OFChangeCurrentDirectoryFailedException.h
 include/ObjFW/OFCharacterSet.h
 include/ObjFW/OFChecksumMismatchException.h
@@ -54,6 +57,7 @@ include/ObjFW/OFGZIPStream.h
 include/ObjFW/OFGetCurrentDirectoryFailedException.h
 include/ObjFW/OFGetItemAttributesFailedException.h
 include/ObjFW/OFGetOptionFailedException.h
+include/ObjFW/OFHINFODNSResourceRecord.h
 include/ObjFW/OFHMAC.h
 include/ObjFW/OFHTTPClient.h
 include/ObjFW/OFHTTPCookie.h
@@ -83,6 +87,7 @@ include/ObjFW/OFKernelEventObserver.h
 include/ObjFW/OFKeyValueCoding.h
 include/ObjFW/OFLHAArchive.h
 include/ObjFW/OFLHAArchiveEntry.h
+include/ObjFW/OFLOCDNSResourceRecord.h
 include/ObjFW/OFLinkItemFailedException.h
 include/ObjFW/OFList.h
 include/ObjFW/OFListenOnSocketFailedException.h
@@ -91,6 +96,7 @@ include/ObjFW/OFLocale.h
 include/ObjFW/OFLockFailedException.h
 include/ObjFW/OFLocking.h
 include/ObjFW/OFMD5Hash.h
+include/ObjFW/OFMXDNSResourceRecord.h
 include/ObjFW/OFMalformedXMLException.h
 include/ObjFW/OFMapTable.h
 include/ObjFW/OFMatrix4x4.h
@@ -111,7 +117,9 @@ include/ObjFW/OFMutableString.h
 include/ObjFW/OFMutableTarArchiveEntry.h
 include/ObjFW/OFMutableTriple.h
 include/ObjFW/OFMutableZIPArchiveEntry.h
+include/ObjFW/OFMutableZooArchiveEntry.h
 include/ObjFW/OFMutex.h
+include/ObjFW/OFNSDNSResourceRecord.h
 include/ObjFW/OFNotImplementedException.h
 include/ObjFW/OFNotOpenException.h
 include/ObjFW/OFNotification.h
@@ -127,12 +135,14 @@ include/ObjFW/OFOptionsParser.h
 include/ObjFW/OFOutOfMemoryException.h
 include/ObjFW/OFOutOfRangeException.h
 include/ObjFW/OFPBKDF2.h
+include/ObjFW/OFPTRDNSResourceRecord.h
 include/ObjFW/OFPair.h
 include/ObjFW/OFPlainCondition.h
 include/ObjFW/OFPlainMutex.h
 include/ObjFW/OFPlainThread.h
 include/ObjFW/OFPlugin.h
 include/ObjFW/OFRIPEMD160Hash.h
+include/ObjFW/OFRPDNSResourceRecord.h
 include/ObjFW/OFReadFailedException.h
 include/ObjFW/OFReadOrWriteFailedException.h
 include/ObjFW/OFRecursiveMutex.h
@@ -146,6 +156,8 @@ include/ObjFW/OFSHA256Hash.h
 include/ObjFW/OFSHA384Hash.h
 include/ObjFW/OFSHA384Or512Hash.h
 include/ObjFW/OFSHA512Hash.h
+include/ObjFW/OFSOADNSResourceRecord.h
+include/ObjFW/OFSRVDNSResourceRecord.h
 include/ObjFW/OFScrypt.h
 include/ObjFW/OFSecureData.h
 include/ObjFW/OFSeekFailedException.h
@@ -178,6 +190,7 @@ include/ObjFW/OFTCPSocket.h
 include/ObjFW/OFTLSHandshakeFailedException.h
 include/ObjFW/OFTLSKey.h
 include/ObjFW/OFTLSStream.h
+include/ObjFW/OFTXTDNSResourceRecord.h
 include/ObjFW/OFTarArchive.h
 include/ObjFW/OFTarArchiveEntry.h
 include/ObjFW/OFThread.h
@@ -188,6 +201,7 @@ include/ObjFW/OFTruncatedDataException.h
 include/ObjFW/OFUDPSocket.h
 include/ObjFW/OFUNIXDatagramSocket.h
 include/ObjFW/OFUNIXStreamSocket.h
+include/ObjFW/OFURIDNSResourceRecord.h
 include/ObjFW/OFUUID.h
 include/ObjFW/OFUnboundNamespaceException.h
 include/ObjFW/OFUnboundPrefixException.h
@@ -210,6 +224,8 @@ include/ObjFW/OFXMLParser.h
 include/ObjFW/OFXMLProcessingInstruction.h
 include/ObjFW/OFZIPArchive.h
 include/ObjFW/OFZIPArchiveEntry.h
+include/ObjFW/OFZooArchive.h
+include/ObjFW/OFZooArchiveEntry.h
 include/ObjFW/ObjFW.h
 include/ObjFW/macros.h
 include/ObjFW/objfw-defs.h
@@ -221,15 +237,24 @@ include/ObjFW/platform/macOS/OFAtomic.h
 include/ObjFW/platform/x86/OFAtomic.h
 include/ObjFWRT/ObjFWRT.h
 %%TLS%%include/ObjFWTLS/ObjFWTLS.h
+include/ObjFWTest/OTAssert.h
+include/ObjFWTest/OTOrderedDictionary.h
+include/ObjFWTest/OTTestCase.h
+include/ObjFWTest/ObjFWTest.h
 lib/libobjfw.so
 lib/libobjfw.so.1
-lib/libobjfw.so.1.0.2
+lib/libobjfw.so.1.1.0
 lib/libobjfwrt.so
 lib/libobjfwrt.so.1
-lib/libobjfwrt.so.1.0.0
+lib/libobjfwrt.so.1.1.0
+lib/libobjfwtest.a
 %%TLS%%lib/libobjfwtls.so
 %%TLS%%lib/libobjfwtls.so.1
-%%TLS%%lib/libobjfwtls.so.1.0.1
+%%TLS%%lib/libobjfwtls.so.1.0.2
+%%TLS%%lib/objfw-config/ObjFWTLS.oc
+lib/objfw-config/ObjFWTest.oc
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFAAAADNSResourceRecord_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFADNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFASPrintF_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFAcceptSocketFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFActivateSandboxFailedException_8h_source.html
@@ -253,6 +278,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFBitSetCharacterSet_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFBlock_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFBroadcastConditionFailedException_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFCNAMEDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFCRC16_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFCRC32_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFChangeCurrentDirectoryFailedException_8h_source.html
@@ -320,6 +346,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFGetItemAttributesFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFGetOptionFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFGetWindowsRegistryValueFailedException_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFHINFODNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFHMAC_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFHTTPClient_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFHTTPCookieManager_8h_source.html
@@ -361,6 +388,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLHAArchiveEntry_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLHAArchive_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLHADecompressingStream_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFLOCDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLinkItemFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFList_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFList_8h_source.html
@@ -371,6 +399,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLockFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFLocking_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMD5Hash_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFMXDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMalformedXMLException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMapTable_09Private_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMapTable_8h.html
@@ -396,7 +425,9 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMutableTriple_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMutableUTF8String_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMutableZIPArchiveEntry_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFMutableZooArchiveEntry_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFMutex_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFNSDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFNotImplementedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFNotOpenException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFNotificationCenter_8h_source.html
@@ -418,6 +449,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFOutOfRangeException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPBKDF2_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPBKDF2_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFPTRDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPair_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlainCondition_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlainMutex_8h_source.html
@@ -425,6 +457,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPlugin_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFPollKernelEventObserver_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFRIPEMD160Hash_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFRPDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFRangeCharacterSet_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFReadFailedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFReadOrWriteFailedException_8h_source.html
@@ -441,10 +474,12 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSHA384Hash_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSHA384Or512Hash_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSHA512Hash_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFSOADNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSPXSocket_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSPXSocket_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSPXStreamSocket_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSPXStreamSocket_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFSRVDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFSandbox_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFScrypt_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFScrypt_8h_source.html
@@ -502,6 +537,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTLSKey_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTLSStream_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTLSStream_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFTXTDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTaggedPointerColor_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTaggedPointerDate_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFTaggedPointerNumber_8h_source.html
@@ -522,6 +558,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUDPSocket_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUNIXDatagramSocket_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUNIXStreamSocket_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFURIDNSResourceRecord_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUTF8String_09Private_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUTF8String_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFUUID_8h_source.html
@@ -551,16 +588,27 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFZIPArchiveEntry_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFZIPArchiveEntry_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/OFZIPArchive_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFZooArchiveEntry_09Private_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFZooArchiveEntry_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OFZooArchive_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTAssert_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTAssert_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTAssertionFailedException_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTOrderedDictionary_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTTestCase_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/OTTestSkippedException_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/ObjFWRT_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/ObjFWRT_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/ObjFWTest_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/ObjFW_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/bc_s.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/bc_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/bdwn.png
-%%PORTDOCS%%%%DOCSDIR%%/objfw/classOFRPNSResourceRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/dir_120ed4da3e3217b1e7fc0b4f48568e79.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/dir_68267d1309a1af8e8297ef4c3efbcdba.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/dir_6e33d6500a76933db4361f663e54ab12.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/dir_bf9f26469d00835ba20ff8d80ee5a804.html
@@ -922,6 +970,9 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLHAArchiveEntry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLHAArchiveEntry.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLHAArchiveEntry.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLOCDNSResourceRecord-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLOCDNSResourceRecord.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLOCDNSResourceRecord.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLinkItemFailedException-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLinkItemFailedException.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFLinkItemFailedException.png
@@ -1003,6 +1054,9 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZIPArchiveEntry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZIPArchiveEntry.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZIPArchiveEntry.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZooArchiveEntry-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZooArchiveEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutableZooArchiveEntry.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutex-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutex.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFMutex.png
@@ -1060,6 +1114,9 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRIPEMD160Hash-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRIPEMD160Hash.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRIPEMD160Hash.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRPDNSResourceRecord-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRPDNSResourceRecord.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFRPDNSResourceRecord.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFReadFailedException-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFReadFailedException.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFReadFailedException.png
@@ -1210,6 +1267,9 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUNIXStreamSocket-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUNIXStreamSocket.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUNIXStreamSocket.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFURIDNSResourceRecord-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFURIDNSResourceRecord.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFURIDNSResourceRecord.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUUID-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUUID.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFUUID.png
@@ -1276,6 +1336,18 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZIPArchiveEntry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZIPArchiveEntry.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZIPArchiveEntry.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchive-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchive.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchive.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchiveEntry-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchiveEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOFZooArchiveEntry.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTOrderedDictionary-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTOrderedDictionary.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTOrderedDictionary.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTTestCase-members.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTTestCase.html
+%%PORTDOCS%%%%DOCSDIR%%/objfw/interfaceOTTestCase.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/objfw/macros_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/menu.js
@@ -1287,6 +1359,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/nav_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/objfw/objfw-defs_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/open.png
+%%PORTDOCS%%%%DOCSDIR%%/objfw/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/platform_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/private_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/objfw/protocolOFApplicationDelegate-p-members.html
@@ -1468,6 +1541,7 @@ lib/libobjfwrt.so.1.0.0
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/mag_d.svg
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/mag_sel.svg
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/mag_seld.svg
+%%PORTDOCS%%%%DOCSDIR%%/objfw/search/pages_0.js
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/properties_0.js
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/properties_1.js
 %%PORTDOCS%%%%DOCSDIR%%/objfw/search/properties_10.js
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index e97f0bb32d4d..8a41e735a74e 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	IO-Tty
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-IO-Tty/files/patch-Makefile.PL b/devel/p5-IO-Tty/files/patch-Makefile.PL
deleted file mode 100644
index a8901338a67e..000000000000
--- a/devel/p5-IO-Tty/files/patch-Makefile.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.PL.orig	2021-01-22 08:02:35 UTC
-+++ Makefile.PL
-@@ -146,7 +146,7 @@ char $f ();
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char $f ();
--char (*f) ();
-+char f;
- 
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
diff --git a/devel/packr/Makefile b/devel/packr/Makefile
index 44629332b91e..3725d9588b7b 100644
--- a/devel/packr/Makefile
+++ b/devel/packr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	packr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8.3
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index ee1f76990ff3..3e9c53a56a71 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	composer
-DISTVERSION=	2.7.2
+DISTVERSION=	2.7.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://getcomposer.org/download/${DISTVERSION}/
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
diff --git a/devel/php-composer/distinfo b/devel/php-composer/distinfo
index 189bd8e4ef89..faf50b3c04f5 100644
--- a/devel/php-composer/distinfo
+++ b/devel/php-composer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710180164
-SHA256 (composer-2.7.2/composer.phar) = 049b8e0ed9f264d770a0510858cffbc35401510759edc9a784b3a5c6e020bcac
-SIZE (composer-2.7.2/composer.phar) = 2977479
+TIMESTAMP = 1718171682
+SHA256 (composer-2.7.7/composer.phar) = aab940cd53d285a54c50465820a2080fcb7182a4ba1e5f795abfb10414a4b4be
+SIZE (composer-2.7.7/composer.phar) = 2994603
diff --git a/devel/please/Makefile b/devel/please/Makefile
index 6b2d1c829abc..b80bb9545985 100644
--- a/devel/please/Makefile
+++ b/devel/please/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	please
 DISTVERSIONPREFIX=	v
 DISTVERSION=	15.17.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 PKGNAMESUFFIX=	.build
 
diff --git a/devel/pprof/Makefile b/devel/pprof/Makefile
index 63c0b2935ba6..f5966b3912f8 100644
--- a/devel/pprof/Makefile
+++ b/devel/pprof/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pprof
 DISTVERSION=	g20200905
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/prototool/Makefile b/devel/prototool/Makefile
index 9f6c4e9bda51..2472b178891b 100644
--- a/devel/prototool/Makefile
+++ b/devel/prototool/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prototool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.10.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/py-hologram/Makefile b/devel/py-hologram/Makefile
index 618e050ea3e4..bc9edf8d2325 100644
--- a/devel/py-hologram/Makefile
+++ b/devel/py-hologram/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	hologram
 PORTVERSION=	0.0.16
+PORTREVISION=   1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ WWW=		https://github.com/dbt-labs/hologram
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8,<2.9:devel/py-dateutil@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.8:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0:devel/py-jsonschema@${PY_FLAVOR}
 
 USES=		python
diff --git a/devel/py-optree/Makefile b/devel/py-optree/Makefile
index 6a480a634f0d..f0002928bf47 100644
--- a/devel/py-optree/Makefile
+++ b/devel/py-optree/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	optree
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-optree/files/patch-i386 b/devel/py-optree/files/patch-i386
new file mode 100644
index 000000000000..3bb59348376e
--- /dev/null
+++ b/devel/py-optree/files/patch-i386
@@ -0,0 +1,397 @@
+Obtained from:	https://github.com/metaopt/optree/commit/9a613a705ee18e18784ba3a16b2786f56f9c74d2 (based on)
+
+--- include/treespec.h.orig	2024-03-25 18:01:43 UTC
++++ include/treespec.h
+@@ -19,6 +19,7 @@ limitations under the License.
+ 
+ #include <pybind11/pybind11.h>
+ 
++#include <algorithm>      // std::min
+ #include <memory>         // std::unique_ptr
+ #include <optional>       // std::optional, std::nullopt
+ #include <string>         // std::string
+@@ -38,7 +39,10 @@ using ssize_t = py::ssize_t;
+ using ssize_t = py::ssize_t;
+ 
+ // The maximum depth of a pytree.
+-constexpr ssize_t MAX_RECURSION_DEPTH = 1000;
++#ifndef Py_C_RECURSION_LIMIT
++#define Py_C_RECURSION_LIMIT 1000
++#endif
++constexpr ssize_t MAX_RECURSION_DEPTH = std::min(1000, Py_C_RECURSION_LIMIT);
+ 
+ // Test whether the given object is a leaf node.
+ bool IsLeaf(const py::object &object,
+--- include/utils.h.orig	2024-03-25 18:01:43 UTC
++++ include/utils.h
+@@ -208,6 +208,9 @@ inline ssize_t GET_SIZE<py::list>(const py::handle& si
+ inline ssize_t GET_SIZE<py::list>(const py::handle& sized) {
+     return PyList_GET_SIZE(sized.ptr());
+ }
++#ifndef PyDict_GET_SIZE
++#define PyDict_GET_SIZE PyDict_GetSize
++#endif
+ template <>
+ inline ssize_t GET_SIZE<py::dict>(const py::handle& sized) {
+     return PyDict_GET_SIZE(sized.ptr());
+@@ -222,91 +225,35 @@ template <>
+     return PyTuple_GET_ITEM(container.ptr(), item);
+ }
+ template <>
+-inline py::handle GET_ITEM_HANDLE<py::tuple>(const py::handle& container, const py::size_t& item) {
+-    return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+-}
+-template <>
+-inline py::handle GET_ITEM_HANDLE<py::tuple>(const py::handle& container, const int& item) {
+-    return PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+-}
+-template <>
+ inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const py::ssize_t& item) {
+     return PyList_GET_ITEM(container.ptr(), item);
+ }
+-template <>
+-inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const py::size_t& item) {
+-    return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+-}
+-template <>
+-inline py::handle GET_ITEM_HANDLE<py::list>(const py::handle& container, const int& item) {
+-    return PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item));
+-}
+ 
+ template <typename Container, typename Item>
+ inline py::object GET_ITEM_BORROW(const py::handle& container, const Item& item) {
+-    return container[item];
++    return py::reinterpret_borrow<py::object>(container[item]);
+ }
+ template <>
+ inline py::object GET_ITEM_BORROW<py::tuple>(const py::handle& container, const py::ssize_t& item) {
+     return py::reinterpret_borrow<py::object>(PyTuple_GET_ITEM(container.ptr(), item));
+ }
+ template <>
+-inline py::object GET_ITEM_BORROW<py::tuple>(const py::handle& container, const py::size_t& item) {
+-    return py::reinterpret_borrow<py::object>(
+-        PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+-inline py::object GET_ITEM_BORROW<py::tuple>(const py::handle& container, const int& item) {
+-    return py::reinterpret_borrow<py::object>(
+-        PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+ inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const py::ssize_t& item) {
+     return py::reinterpret_borrow<py::object>(PyList_GET_ITEM(container.ptr(), item));
+ }
+-template <>
+-inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const py::size_t& item) {
+-    return py::reinterpret_borrow<py::object>(
+-        PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+-inline py::object GET_ITEM_BORROW<py::list>(const py::handle& container, const int& item) {
+-    return py::reinterpret_borrow<py::object>(
+-        PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+ 
+ template <typename Container, typename Item>
+ inline py::object GET_ITEM_STEAL(const py::handle& container, const Item& item) {
+-    return container[item];
++    return py::reinterpret_steal<py::object>(container[item]);
+ }
+ template <>
+ inline py::object GET_ITEM_STEAL<py::tuple>(const py::handle& container, const py::ssize_t& item) {
+     return py::reinterpret_steal<py::object>(PyTuple_GET_ITEM(container.ptr(), item));
+ }
+ template <>
+-inline py::object GET_ITEM_STEAL<py::tuple>(const py::handle& container, const py::size_t& item) {
+-    return py::reinterpret_steal<py::object>(
+-        PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+-inline py::object GET_ITEM_STEAL<py::tuple>(const py::handle& container, const int& item) {
+-    return py::reinterpret_steal<py::object>(
+-        PyTuple_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+ inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const py::ssize_t& item) {
+     return py::reinterpret_steal<py::object>(PyList_GET_ITEM(container.ptr(), item));
+ }
+-template <>
+-inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const py::size_t& item) {
+-    return py::reinterpret_steal<py::object>(
+-        PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+-template <>
+-inline py::object GET_ITEM_STEAL<py::list>(const py::handle& container, const int& item) {
+-    return py::reinterpret_steal<py::object>(
+-        PyList_GET_ITEM(container.ptr(), py::ssize_t_cast(item)));
+-}
+ 
+ template <typename Container, typename Item>
+ inline void SET_ITEM(const py::handle& container, const Item& item, const py::handle& value) {
+@@ -314,39 +261,15 @@ inline void SET_ITEM<py::tuple>(const py::handle& cont
+ }
+ template <>
+ inline void SET_ITEM<py::tuple>(const py::handle& container,
+-                                const ssize_t& item,
++                                const py::ssize_t& item,
+                                 const py::handle& value) {
+     PyTuple_SET_ITEM(container.ptr(), item, value.inc_ref().ptr());
+ }
+ template <>
+-inline void SET_ITEM<py::tuple>(const py::handle& container,
+-                                const py::size_t& item,
+-                                const py::handle& value) {
+-    PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+-}
+-template <>
+-inline void SET_ITEM<py::tuple>(const py::handle& container,
+-                                const int& item,
+-                                const py::handle& value) {
+-    PyTuple_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+-}
+-template <>
+ inline void SET_ITEM<py::list>(const py::handle& container,
+-                               const ssize_t& item,
++                               const py::ssize_t& item,
+                                const py::handle& value) {
+     PyList_SET_ITEM(container.ptr(), item, value.inc_ref().ptr());
+-}
+-template <>
+-inline void SET_ITEM<py::list>(const py::handle& container,
+-                               const py::size_t& item,
+-                               const py::handle& value) {
+-    PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+-}
+-template <>
+-inline void SET_ITEM<py::list>(const py::handle& container,
+-                               const int& item,
+-                               const py::handle& value) {
+-    PyList_SET_ITEM(container.ptr(), py::ssize_t_cast(item), value.inc_ref().ptr());
+ }
+ 
+ inline std::string PyRepr(const py::handle& object) {
+--- src/treespec/constructor.cpp.orig	2024-03-25 18:01:43 UTC
++++ src/treespec/constructor.cpp
+@@ -78,7 +78,7 @@ template <bool NoneIsLeaf>
+                                             std::vector<PyTreeSpec>& treespecs,
+                                             std::string& register_namespace) {
+         for (const py::object& child : children) {
+-            if (!py::isinstance<PyTreeSpec>(child)) {
++            if (!py::isinstance<PyTreeSpec>(child)) [[unlikely]] {
+                 std::ostringstream oss{};
+                 oss << "Expected a(n) " << NodeKindToString(node) << " of PyTreeSpec(s), got "
+                     << PyRepr(handle) << ".";
+@@ -213,15 +213,15 @@ template <bool NoneIsLeaf>
+                 throw std::runtime_error(oss.str());
+             }
+             node.arity = 0;
+-            node.node_data = GET_ITEM_BORROW<py::tuple>(out, 1);
++            node.node_data = GET_ITEM_BORROW<py::tuple>(out, ssize_t(1));
+             for (const py::handle& child :
+-                 py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, 0))) {
++                 py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)))) {
+                 ++node.arity;
+                 children.emplace_back(py::reinterpret_borrow<py::object>(child));
+             }
+             verify_children(children, treespecs, registry_namespace);
+             if (num_out == 3) [[likely]] {
+-                py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, 2);
++                py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, ssize_t(2));
+                 if (!node_entries.is_none()) [[likely]] {
+                     node.node_entries = py::cast<py::tuple>(std::move(node_entries));
+                     const ssize_t num_entries = GET_SIZE<py::tuple>(node.node_entries);
+--- src/treespec/flatten.cpp.orig	2024-03-25 18:01:43 UTC
++++ src/treespec/flatten.cpp
+@@ -144,14 +144,14 @@ bool PyTreeSpec::FlattenIntoImpl(const py::handle& han
+                     throw std::runtime_error(oss.str());
+                 }
+                 node.arity = 0;
+-                node.node_data = GET_ITEM_BORROW<py::tuple>(out, 1);
++                node.node_data = GET_ITEM_BORROW<py::tuple>(out, ssize_t(1));
+                 for (const py::handle& child :
+-                     py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, 0))) {
++                     py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)))) {
+                     ++node.arity;
+                     recurse(child);
+                 }
+                 if (num_out == 3) [[likely]] {
+-                    py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, 2);
++                    py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, ssize_t(2));
+                     if (!node_entries.is_none()) [[likely]] {
+                         node.node_entries = py::cast<py::tuple>(std::move(node_entries));
+                         const ssize_t num_entries = GET_SIZE<py::tuple>(node.node_entries);
+@@ -338,16 +338,16 @@ bool PyTreeSpec::FlattenIntoWithPathImpl(const py::han
+                     throw std::runtime_error(oss.str());
+                 }
+                 node.arity = 0;
+-                node.node_data = GET_ITEM_BORROW<py::tuple>(out, 1);
++                node.node_data = GET_ITEM_BORROW<py::tuple>(out, ssize_t(1));
+                 py::object node_entries;
+                 if (num_out == 3) [[likely]] {
+-                    node_entries = GET_ITEM_BORROW<py::tuple>(out, 2);
++                    node_entries = GET_ITEM_BORROW<py::tuple>(out, ssize_t(2));
+                 } else [[unlikely]] {
+                     node_entries = py::none();
+                 }
+                 if (node_entries.is_none()) [[unlikely]] {
+                     for (const py::handle& child :
+-                         py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, 0))) {
++                         py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)))) {
+                         recurse(child, py::int_(node.arity++));
+                     }
+                 } else [[likely]] {
+@@ -355,7 +355,7 @@ bool PyTreeSpec::FlattenIntoWithPathImpl(const py::han
+                     node.arity = GET_SIZE<py::tuple>(node.node_entries);
+                     ssize_t num_children = 0;
+                     for (const py::handle& child :
+-                         py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, 0))) {
++                         py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)))) {
+                         if (num_children >= node.arity) [[unlikely]] {
+                             throw std::runtime_error(
+                                 "PyTree custom flatten function for type " +
+@@ -500,9 +500,10 @@ py::list PyTreeSpec::FlattenUpTo(const py::object& ful
+             case PyTreeKind::DefaultDict: {
+                 AssertExactStandardDict(object);
+                 auto dict = py::reinterpret_borrow<py::dict>(object);
+-                py::list expected_keys = (node.kind != PyTreeKind::DefaultDict
+-                                              ? node.node_data
+-                                              : GET_ITEM_BORROW<py::tuple>(node.node_data, 1));
++                py::list expected_keys =
++                    (node.kind != PyTreeKind::DefaultDict
++                         ? node.node_data
++                         : GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(1)));
+                 if (!DictKeysEqual(expected_keys, dict)) [[unlikely]] {
+                     py::list keys = SortedDictKeys(dict);
+                     auto [missing_keys, extra_keys] = DictKeysDifference(expected_keys, dict);
+@@ -619,7 +620,7 @@ py::list PyTreeSpec::FlattenUpTo(const py::object& ful
+                         << " should return a 2- or 3-tuple, got " << num_out << ".";
+                     throw std::runtime_error(oss.str());
+                 }
+-                py::object node_data = GET_ITEM_BORROW<py::tuple>(out, 1);
++                py::object node_data = GET_ITEM_BORROW<py::tuple>(out, ssize_t(1));
+                 if (node.node_data.not_equal(node_data)) [[unlikely]] {
+                     std::ostringstream oss{};
+                     oss << "Mismatch custom node data; expected: " << PyRepr(node.node_data)
+@@ -628,7 +629,7 @@ py::list PyTreeSpec::FlattenUpTo(const py::object& ful
+                 }
+                 ssize_t arity = 0;
+                 for (const py::handle& child :
+-                     py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, 0))) {
++                     py::cast<py::iterable>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)))) {
+                     ++arity;
+                     agenda.emplace_back(py::reinterpret_borrow<py::object>(child));
+                 }
+--- src/treespec/traversal.cpp.orig	2024-03-25 18:01:43 UTC
++++ src/treespec/traversal.cpp
+@@ -123,10 +123,10 @@ py::object PyTreeIter::NextImpl() {
+                         << " should return a 2- or 3-tuple, got " << num_out << ".";
+                     throw std::runtime_error(oss.str());
+                 }
+-                auto children = py::cast<py::tuple>(GET_ITEM_BORROW<py::tuple>(out, 0));
++                auto children = py::cast<py::tuple>(GET_ITEM_BORROW<py::tuple>(out, ssize_t(0)));
+                 ssize_t arity = GET_SIZE<py::tuple>(children);
+                 if (num_out == 3) [[likely]] {
+-                    py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, 2);
++                    py::object node_entries = GET_ITEM_BORROW<py::tuple>(out, ssize_t(2));
+                     if (!node_entries.is_none()) [[likely]] {
+                         const ssize_t num_entries =
+                             GET_SIZE<py::tuple>(py::cast<py::tuple>(std::move(node_entries)));
+--- src/treespec/treespec.cpp.orig	2024-03-25 18:01:43 UTC
++++ src/treespec/treespec.cpp
+@@ -138,8 +138,8 @@ namespace optree {
+ 
+         case PyTreeKind::DefaultDict: {
+             py::dict dict{};
+-            py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, 0);
+-            py::list keys = GET_ITEM_BORROW<py::tuple>(node.node_data, 1);
++            py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(0));
++            py::list keys = GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(1));
+             if (node.original_keys) [[unlikely]] {
+                 for (ssize_t i = 0; i < node.arity; ++i) {
+                     dict[GET_ITEM_HANDLE<py::list>(node.original_keys, i)] = py::none();
+@@ -254,11 +254,11 @@ namespace optree {
+             auto expected_keys = py::reinterpret_borrow<py::list>(
+                 root.kind != PyTreeKind::DefaultDict
+                     ? root.node_data
+-                    : GET_ITEM_BORROW<py::tuple>(root.node_data, 1));
++                    : GET_ITEM_BORROW<py::tuple>(root.node_data, ssize_t(1)));
+             auto other_keys = py::reinterpret_borrow<py::list>(
+                 other_root.kind != PyTreeKind::DefaultDict
+                     ? other_root.node_data
+-                    : GET_ITEM_BORROW<py::tuple>(other_root.node_data, 1));
++                    : GET_ITEM_BORROW<py::tuple>(other_root.node_data, ssize_t(1)));
+             py::dict dict{};
+             for (ssize_t i = 0; i < other_root.arity; ++i) {
+                 dict[GET_ITEM_HANDLE<py::list>(other_keys, i)] = py::int_(i);
+@@ -530,7 +530,7 @@ ssize_t PyTreeSpec::PathsImpl(Span& paths,
+                 auto keys = py::reinterpret_borrow<py::list>(
+                     root.kind != PyTreeKind::DefaultDict
+                         ? root.node_data
+-                        : GET_ITEM_BORROW<py::tuple>(root.node_data, 1));
++                        : GET_ITEM_BORROW<py::tuple>(root.node_data, ssize_t(1)));
+                 for (ssize_t i = root.arity - 1; i >= 0; --i) {
+                     cur -= recurse(cur, GET_ITEM_HANDLE<py::list>(keys, i));
+                 }
+@@ -595,7 +595,8 @@ py::list PyTreeSpec::Entries() const {
+             return py::getattr(root.node_data, Py_Get_ID(copy))();
+         }
+         case PyTreeKind::DefaultDict: {
+-            return py::getattr(GET_ITEM_BORROW<py::tuple>(root.node_data, 1), Py_Get_ID(copy))();
++            return py::getattr(GET_ITEM_BORROW<py::tuple>(root.node_data, ssize_t(1)),
++                               Py_Get_ID(copy))();
+         }
+ 
+         default:
+@@ -631,7 +632,8 @@ py::object PyTreeSpec::Entry(ssize_t index) const {
+             return GET_ITEM_BORROW<py::list>(root.node_data, index);
+         }
+         case PyTreeKind::DefaultDict: {
+-            return GET_ITEM_BORROW<py::list>(GET_ITEM_BORROW<py::tuple>(root.node_data, 1), index);
++            return GET_ITEM_BORROW<py::list>(GET_ITEM_BORROW<py::tuple>(root.node_data, ssize_t(1)),
++                                             index);
+         }
+ 
+         case PyTreeKind::None:
+@@ -804,11 +806,11 @@ bool PyTreeSpec::IsPrefix(const PyTreeSpec& other, con
+                 auto expected_keys = py::reinterpret_borrow<py::list>(
+                     a->kind != PyTreeKind::DefaultDict
+                         ? a->node_data
+-                        : GET_ITEM_BORROW<py::tuple>(a->node_data, 1));
++                        : GET_ITEM_BORROW<py::tuple>(a->node_data, ssize_t(1)));
+                 auto other_keys = py::reinterpret_borrow<py::list>(
+                     b->kind != PyTreeKind::DefaultDict
+                         ? b->node_data
+-                        : GET_ITEM_BORROW<py::tuple>(b->node_data, 1));
++                        : GET_ITEM_BORROW<py::tuple>(b->node_data, ssize_t(1)));
+                 py::dict dict{};
+                 for (ssize_t i = 0; i < b->arity; ++i) {
+                     dict[GET_ITEM_HANDLE<py::list>(other_keys, i)] = py::int_(i);
+@@ -1023,9 +1025,9 @@ std::string PyTreeSpec::ToStringImpl() const {
+             case PyTreeKind::DefaultDict: {
+                 EXPECT_EQ(
+                     GET_SIZE<py::tuple>(node.node_data), 2, "Number of auxiliary data mismatch.");
+-                py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, 0);
+-                auto keys =
+-                    py::reinterpret_borrow<py::list>(GET_ITEM_BORROW<py::tuple>(node.node_data, 1));
++                py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(0));
++                auto keys = py::reinterpret_borrow<py::list>(
++                    GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(1)));
+                 EXPECT_EQ(GET_SIZE<py::list>(keys),
+                           node.arity,
+                           "Number of keys and entries does not match.");
+@@ -1146,13 +1148,13 @@ std::string PyTreeSpec::ToString() const {
+             if (node.kind == PyTreeKind::DefaultDict) [[unlikely]] {
+                 EXPECT_EQ(
+                     GET_SIZE<py::tuple>(node.node_data), 2, "Number of auxiliary data mismatch.");
+-                py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, 0);
++                py::object default_factory = GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(0));
+                 data_hash = py::hash(default_factory);
+             }
+             auto keys = py::reinterpret_borrow<py::list>(
+                 node.kind != PyTreeKind::DefaultDict
+                     ? node.node_data
+-                    : GET_ITEM_BORROW<py::tuple>(node.node_data, 1));
++                    : GET_ITEM_BORROW<py::tuple>(node.node_data, ssize_t(1)));
+             EXPECT_EQ(
+                 GET_SIZE<py::list>(keys), node.arity, "Number of keys and entries does not match.");
+             for (const py::handle& key : keys) {
diff --git a/devel/py-pylibsrtp/Makefile b/devel/py-pylibsrtp/Makefile
index 2ca590cdb8ad..20c77b663847 100644
--- a/devel/py-pylibsrtp/Makefile
+++ b/devel/py-pylibsrtp/Makefile
@@ -13,7 +13,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsrtp2.so:net/libsrtp2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 
 USES=		localbase python
diff --git a/devel/py-qcs-sdk-python/Makefile b/devel/py-qcs-sdk-python/Makefile
index b8b8ea785f0a..b8853d5cd6d2 100644
--- a/devel/py-qcs-sdk-python/Makefile
+++ b/devel/py-qcs-sdk-python/Makefile
@@ -24,6 +24,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	rigetti
 GH_PROJECT=	qcs-sdk-rust
 
+RUSTFLAGS=	${ARCH:S/i386/YES/:C/^[a-z].*//:S/YES/-C target-feature=+sse,+sse2/} # add sse sse2 target-features only on i386
+
 CARGO_CRATES=	addr2line-0.21.0 \
 		adler-1.0.2 \
 		aho-corasick-1.1.2 \
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index 86be00ae82a6..4df559c4e5e9 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	pyqt
-PORTVERSION=	${PYQT_VERSION}
+DISTVERSION=	${PYQT_VERSION}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_PYQT}
 PKGNAMEPREFIX=	${PYQT_PY_RELNAME}-
 DISTNAME=	${PYQT_DISTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt6 toolkit, QtCore module
+COMMENT=	Python bindings for the Qt6 toolkit
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 PYQT_DIST=	yes
@@ -17,8 +17,7 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR}
 
 USES=		gl pkgconfig python pyqt:6 qt:6
-USE_GL+=	gl opengl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYTHON=	concurrent flavors
 USE_PYQT=	pysip qtbuilder sip
 USE_QT=		base connectivity declarative imageformats multimedia \
diff --git a/devel/py-qt6-pyqt/distinfo b/devel/py-qt6-pyqt/distinfo
index 1d1e78af0bb2..d03553ac245f 100644
--- a/devel/py-qt6-pyqt/distinfo
+++ b/devel/py-qt6-pyqt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701802289
-SHA256 (PyQt6-6.6.1.tar.gz) = 9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379
-SIZE (PyQt6-6.6.1.tar.gz) = 1043203
+TIMESTAMP = 1714270793
+SHA256 (PyQt6-6.7.0.tar.gz) = 3d31b2c59dc378ee26e16586d9469842483588142fc377280aad22aaf2fa6235
+SIZE (PyQt6-6.7.0.tar.gz) = 1050408
diff --git a/devel/py-qt6-pyqt/pkg-descr b/devel/py-qt6-pyqt/pkg-descr
index e94deea7a2c0..f9bc7673c880 100644
--- a/devel/py-qt6-pyqt/pkg-descr
+++ b/devel/py-qt6-pyqt/pkg-descr
@@ -1,2 +1,8 @@
-PyQt6 is a set of Python bindings for Qt6 application framework.
-This package provides the QtCore module.
+PyQt6 is a comprehensive set of Python bindings for Qt6. It is
+implemented as more than 35 extension modules and enables Python
+to be used as an alternative application development language to
+C++ on all supported platforms.
+
+PyQt6 may also be embedded in C++ based applications to allow users
+of those applications to configure or enhance the functionality of
+those applications.
diff --git a/devel/py-qt6-pyqt/pkg-plist b/devel/py-qt6-pyqt/pkg-plist
index 1b92e9fe76e6..741bedcd9a28 100644
--- a/devel/py-qt6-pyqt/pkg-plist
+++ b/devel/py-qt6-pyqt/pkg-plist
@@ -154,6 +154,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qlist.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qmap.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_qset.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_optional.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_std_pair.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qpycore_virtual_error_handler.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qrandom.sip
@@ -195,6 +196,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtranslator.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtransposeproxymodel.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtversion.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtyperevision.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qtypes.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurl.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qurlquery.sip
@@ -205,6 +207,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwaitcondition.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qwineventnotifier.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qxmlstream.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtCore/qyieldcpu.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBus.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/QtDBusmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtDBus/qdbusabstractadaptor.sip
@@ -378,6 +381,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qpymultimedia_qlist.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qscreencapture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qsoundeffect.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qtvideo.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframe.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideoframeformat.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtMultimedia/qvideosink.sip
@@ -397,6 +401,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhstspolicy.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp1configuration.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttp2configuration.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpheaders.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qhttpmultipart.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalserver.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtNetwork/qlocalsocket.sip
@@ -563,6 +568,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgrendernode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimplerectnode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgsimpletexturenode.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtextnode.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexture_platform.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtQuick/qsgtexturematerial.sip
@@ -634,6 +640,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/QtSvgmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvggenerator.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qsvgrenderer.sip
+%%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvg/qtsvgglobal.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgets.toml
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/QtSvgWidgetsmod.sip
 %%PYTHON_SITELIBDIR%%/PyQt6/bindings/QtSvgWidgets/qgraphicssvgitem.sip
@@ -878,6 +885,8 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qscintilla%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtcharts%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtopenglwidgets%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtprintsupport%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/__pycache__/qtquickwidgets%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -887,6 +896,7 @@ bin/pyuic6
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qaxcontainer.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qscintilla.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtcharts.py
+%%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtopenglwidgets.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtprintsupport.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtquickwidgets.py
 %%PYTHON_SITELIBDIR%%/PyQt6/uic/widget-plugins/qtwebenginewidgets.py
diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile
index 121d63e24a79..641e3aeb3c21 100644
--- a/devel/py-qtconsole/Makefile
+++ b/devel/py-qtconsole/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qtconsole
-DISTVERSION=	5.5.1
+DISTVERSION=	5.5.2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-qtconsole/distinfo b/devel/py-qtconsole/distinfo
index 89d5e8925227..8b0ffb45eabc 100644
--- a/devel/py-qtconsole/distinfo
+++ b/devel/py-qtconsole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700130554
-SHA256 (qtconsole-5.5.1.tar.gz) = a0e806c6951db9490628e4df80caec9669b65149c7ba40f9bf033c025a5b56bc
-SIZE (qtconsole-5.5.1.tar.gz) = 438961
+TIMESTAMP = 1715258333
+SHA256 (qtconsole-5.5.2.tar.gz) = 6b5fb11274b297463706af84dcbbd5c92273b1f619e6d25d08874b0a88516989
+SIZE (qtconsole-5.5.2.tar.gz) = 439219
diff --git a/devel/py-schema/Makefile b/devel/py-schema/Makefile
index ed0c6f8bd507..2f920a404cce 100644
--- a/devel/py-schema/Makefile
+++ b/devel/py-schema/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	schema
-DISTVERSION=	0.7.6
+DISTVERSION=	0.7.7
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -8,13 +8,12 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple data validation library
 WWW=		https://github.com/keleshev/schema
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}contextlib2>=0.5.5:devel/py-contextlib2@${PY_FLAVOR}
-
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE-MIT
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist pytest
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-schema/distinfo b/devel/py-schema/distinfo
index 419177564988..6d6b70d50ec6 100644
--- a/devel/py-schema/distinfo
+++ b/devel/py-schema/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712365940
-SHA256 (schema-0.7.6.tar.gz) = ce0186666940271e5faeb31b92c830aab6e7eb3f0d6feb88a107a76bba964ba7
-SIZE (schema-0.7.6.tar.gz) = 43804
+TIMESTAMP = 1714892029
+SHA256 (schema-0.7.7.tar.gz) = 7da553abd2958a19dc2547c388cde53398b39196175a9be59ea1caf5ab0a1807
+SIZE (schema-0.7.7.tar.gz) = 44245
diff --git a/devel/pyside2-tools/distinfo b/devel/pyside2-tools/distinfo
index 1e66f2fd1b52..456174f58430 100644
--- a/devel/pyside2-tools/distinfo
+++ b/devel/pyside2-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711882482
-SHA256 (pyside-setup-opensource-src-5.15.13.tar.xz) = 7a57797b20268d6ebcb39deba48c754a69abf9221aee03e1f3dca6f6565b7da9
-SIZE (pyside-setup-opensource-src-5.15.13.tar.xz) = 3585684
+TIMESTAMP = 1716932559
+SHA256 (pyside-setup-opensource-src-5.15.14.tar.xz) = 32651194f6a6b7bce42f04e68b1401ad2087e4789a4c8f3fb8649e86189c6372
+SIZE (pyside-setup-opensource-src-5.15.14.tar.xz) = 3586520
diff --git a/devel/pyside2/distinfo b/devel/pyside2/distinfo
index 0524e5230876..19e234e6612d 100644
--- a/devel/pyside2/distinfo
+++ b/devel/pyside2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711882453
-SHA256 (pyside-setup-opensource-src-5.15.13.tar.xz) = 7a57797b20268d6ebcb39deba48c754a69abf9221aee03e1f3dca6f6565b7da9
-SIZE (pyside-setup-opensource-src-5.15.13.tar.xz) = 3585684
+TIMESTAMP = 1716932549
+SHA256 (pyside-setup-opensource-src-5.15.14.tar.xz) = 32651194f6a6b7bce42f04e68b1401ad2087e4789a4c8f3fb8649e86189c6372
+SIZE (pyside-setup-opensource-src-5.15.14.tar.xz) = 3586520
diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile
index d291d6e57606..e6acf9df55e7 100644
--- a/devel/pyside6-tools/Makefile
+++ b/devel/pyside6-tools/Makefile
@@ -18,15 +18,15 @@ LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR}
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
-USES=		cmake gl llvm:lib python qt:6 shebangfix tar:xz
-USE_GL=		gl
+USES=		cmake gl llvm:lib,noexport python qt:6 shebangfix tar:xz
+USE_GL=		opengl
 USE_PYTHON=	flavors
-USE_QT=		base declarative languageserver tools
+USE_QT=		base declarative languageserver quick3d shadertools tools
 
 SHEBANG_FILES=	pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py
 
 PLIST_SUB=	PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL}
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools
+WRKSRC_SUBDIR=	sources/pyside-tools
 
 PYSIDE_RELNAME=		${PORTNAME}
 PYSIDE_BINDIR_REL?=	bin/${PYSIDE_RELNAME}
@@ -41,6 +41,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}
 	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin
 # These directories contain templates that should not be byte-compiled.
+# Temporarily relocate them to avoid errors.
 	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android/recipes ${WRKDIR}
 
 .for d in deploy_lib project qtpy2cpp_lib
@@ -52,6 +53,8 @@ post-install:
 		${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
 .endfor
 
+# Move the aforementioned templates back into STAGEDIR after the byte-compiling
+# operation has finished.
 	@${MV} ${WRKDIR}/recipes ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/deploy_lib/android
 
 .include <bsd.port.mk>
diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
index 6db1494a2bdd..d917fa059bb7 100644
--- a/devel/pyside6-tools/distinfo
+++ b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708228813
-SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
-SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
+TIMESTAMP = 1718779305
+SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7
+SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156
diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist
index 3588c387efa4..7c4547659f22 100644
--- a/devel/pyside6-tools/pkg-plist
+++ b/devel/pyside6-tools/pkg-plist
@@ -1,5 +1,7 @@
 %%PYSIDE_BINDIR_REL%%/android_deploy.py
 %%PYSIDE_BINDIR_REL%%/assistant
+%%PYSIDE_BINDIR_REL%%/balsam
+%%PYSIDE_BINDIR_REL%%/balsamui
 %%PYSIDE_BINDIR_REL%%/deploy.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__init__.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -8,6 +10,8 @@
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/commands%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/dependency_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -31,6 +35,7 @@
 %%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/config.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec
+%%PYSIDE_BINDIR_REL%%/deploy_lib/dependency_util.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py
 %%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.icns
@@ -63,6 +68,7 @@
 %%PYSIDE_BINDIR_REL%%/qmllint
 %%PYSIDE_BINDIR_REL%%/qmlls
 %%PYSIDE_BINDIR_REL%%/qmltyperegistrar
+%%PYSIDE_BINDIR_REL%%/qsb
 %%PYSIDE_BINDIR_REL%%/qtpy2cpp.py
 %%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.pyc
diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
index 232d6cd0cabe..de3d0b1c68c5 100644
--- a/devel/pyside6/Makefile
+++ b/devel/pyside6/Makefile
@@ -11,22 +11,24 @@ WWW=		https://wiki.qt.io/Qt_for_Python
 
 LICENSE=	LGPL3
 
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \
 		libxkbcommon.so:x11/libxkbcommon
 
-USES=		cmake gl llvm:lib python qt:6 tar:xz
-USE_GL=		gl
+USES=		cmake gl llvm:lib,noexport python qt:6 tar:xz
+USE_GL=		opengl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		3d base charts connectivity datavis3d declarative doc graphs \
 		httpserver imageformats location multimedia networkauth pdf \
 		positioning quick3d quicktimeline remoteobjects scxml sensors \
 		serialbus serialport shadertools speech svg tools translations \
-		wayland webchannel websockets
+		webchannel websockets
 
-CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
+CONFIGURE_ENV=	LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm"
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
+PATCH_WRKSRC=	${WRKSRC:H:H}
+WRKSRC_SUBDIR=	sources/pyside6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
index 52d7922c624b..9d5cb59bc83d 100644
--- a/devel/pyside6/distinfo
+++ b/devel/pyside6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708228795
-SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
-SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
+TIMESTAMP = 1718779292
+SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7
+SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156
diff --git a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake b/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake
index beb57e5a20cf..ae379547d829 100644
--- a/devel/pyside6/files/patch-cmake_Macros_PySideModules.cmake
+++ b/devel/pyside6/files/patch-sources_pyside6_cmake_Macros_PySideModules.cmake
@@ -1,5 +1,5 @@
---- cmake/Macros/PySideModules.cmake.orig	2023-11-27 12:04:49 UTC
-+++ cmake/Macros/PySideModules.cmake
+--- sources/pyside6/cmake/Macros/PySideModules.cmake.orig	2023-11-27 12:04:49 UTC
++++ sources/pyside6/cmake/Macros/PySideModules.cmake
 @@ -107,7 +107,7 @@ macro(create_pyside_module)
      get_target_property(qt_core_includes Qt${QT_MAJOR_VERSION}::Core
                          INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist
index 1d610064f5d5..7cd3b16bd011 100644
--- a/devel/pyside6/pkg-plist
+++ b/devel/pyside6/pkg-plist
@@ -8,6 +8,7 @@ include/PySide6/QtBluetooth/pyside6_qtbluetooth_python.h
 include/PySide6/QtCharts/pyside6_qtcharts_python.h
 include/PySide6/QtConcurrent/pyside6_qtconcurrent_python.h
 include/PySide6/QtCore/pyside6_qtcore_python.h
+include/PySide6/QtCore/qiopipe.h
 include/PySide6/QtCore/qtcorehelper.h
 include/PySide6/QtDBus/pyside6_qtdbus_python.h
 include/PySide6/QtDBus/qtdbushelper.h
@@ -38,6 +39,7 @@ include/PySide6/QtQml/pyside6_qtqml_python.h
 include/PySide6/QtQuick/pyside6_qtquick_python.h
 include/PySide6/QtQuick3D/pyside6_qtquick3d_python.h
 include/PySide6/QtQuickControls2/pyside6_qtquickcontrols2_python.h
+include/PySide6/QtQuickTest/pyside6_qtquicktest_python.h
 include/PySide6/QtQuickWidgets/pyside6_qtquickwidgets_python.h
 include/PySide6/QtRemoteObjects/pyside6_qtremoteobjects_python.h
 include/PySide6/QtScxml/pyside6_qtscxml_python.h
@@ -117,10 +119,10 @@ lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake
 lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/PySide6Qml/PySide6QmlTargets.cmake
 lib/libpyside6.abi3.so
-lib/libpyside6.abi3.so.6.6
+lib/libpyside6.abi3.so.6.7
 lib/libpyside6.abi3.so.%%DISTVERSION%%
 lib/libpyside6qml.abi3.so
-lib/libpyside6qml.abi3.so.6.6
+lib/libpyside6qml.abi3.so.6.7
 lib/libpyside6qml.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi3.so
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi
@@ -201,6 +203,8 @@ lib/libpyside6qml.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.abi3.so
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuickTest.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.abi3.so
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.abi3.so
@@ -273,9 +277,11 @@ share/PySide6/glue/qtmultimedia.cpp
 share/PySide6/glue/qtnetwork.cpp
 share/PySide6/glue/qtnetworkauth.cpp
 share/PySide6/glue/qtopengl.cpp
+share/PySide6/glue/qtpositioning.cpp
 share/PySide6/glue/qtprintsupport.cpp
 share/PySide6/glue/qtqml.cpp
 share/PySide6/glue/qtquick.cpp
+share/PySide6/glue/qtquicktest.cpp
 share/PySide6/glue/qtserialbus.cpp
 share/PySide6/glue/qtsql.cpp
 share/PySide6/glue/qtstatemachine.cpp
@@ -360,6 +366,7 @@ share/PySide6/typesystems/typesystem_qml.xml
 share/PySide6/typesystems/typesystem_quick.xml
 share/PySide6/typesystems/typesystem_quick3d.xml
 share/PySide6/typesystems/typesystem_quickcontrols2.xml
+share/PySide6/typesystems/typesystem_quicktest.xml
 share/PySide6/typesystems/typesystem_quickwidgets.xml
 share/PySide6/typesystems/typesystem_remoteobjects.xml
 share/PySide6/typesystems/typesystem_scxml.xml
diff --git a/devel/qt5-assistant/distinfo b/devel/qt5-assistant/distinfo
index 5e6df02e00e7..3f00796fcd24 100644
--- a/devel/qt5-assistant/distinfo
+++ b/devel/qt5-assistant/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770890
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929102
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-buildtools/distinfo b/devel/qt5-buildtools/distinfo
index 22c65d153aa9..1c52e979d71a 100644
--- a/devel/qt5-buildtools/distinfo
+++ b/devel/qt5-buildtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770891
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929104
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-concurrent/distinfo b/devel/qt5-concurrent/distinfo
index 351295e7b9c3..77924dc87d97 100644
--- a/devel/qt5-concurrent/distinfo
+++ b/devel/qt5-concurrent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770892
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929105
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-core/distinfo b/devel/qt5-core/distinfo
index 526504917fa3..6639bbce5ab6 100644
--- a/devel/qt5-core/distinfo
+++ b/devel/qt5-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770894
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929106
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-dbus/distinfo b/devel/qt5-dbus/distinfo
index 9e3ab78c7514..3a8ae3105a92 100644
--- a/devel/qt5-dbus/distinfo
+++ b/devel/qt5-dbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770895
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929107
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-designer/distinfo b/devel/qt5-designer/distinfo
index 4c416907af7f..1dc6f0d15d9d 100644
--- a/devel/qt5-designer/distinfo
+++ b/devel/qt5-designer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770896
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929108
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-help/distinfo b/devel/qt5-help/distinfo
index 6136553eca8e..1dc6f0d15d9d 100644
--- a/devel/qt5-help/distinfo
+++ b/devel/qt5-help/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770897
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929108
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-linguist/distinfo b/devel/qt5-linguist/distinfo
index ddfcb0412b19..ddbfe55f63d8 100644
--- a/devel/qt5-linguist/distinfo
+++ b/devel/qt5-linguist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770898
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929109
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-linguisttools/distinfo b/devel/qt5-linguisttools/distinfo
index cd01b7902a04..cd50cd201661 100644
--- a/devel/qt5-linguisttools/distinfo
+++ b/devel/qt5-linguisttools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770900
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929110
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-location/distinfo b/devel/qt5-location/distinfo
index 70d824b57c9e..71626578de7d 100644
--- a/devel/qt5-location/distinfo
+++ b/devel/qt5-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770901
-SHA256 (KDE/Qt/5.15.13/kde-qtlocation-5.15.13p6.tar.xz) = 5b61bfccc1e98ce4acfdaad0069b68dff2f8501fe0aa053567d33d1bbdfc4d03
-SIZE (KDE/Qt/5.15.13/kde-qtlocation-5.15.13p6.tar.xz) = 6479492
+TIMESTAMP = 1716929111
+SHA256 (KDE/Qt/5.15.14/kde-qtlocation-5.15.14p7.tar.xz) = b62f159df2078955539f5621823cbe0a51ec49e6693c0eb6fc71b1ded82386ac
+SIZE (KDE/Qt/5.15.14/kde-qtlocation-5.15.14p7.tar.xz) = 6478028
diff --git a/devel/qt5-qdbus/distinfo b/devel/qt5-qdbus/distinfo
index 61caa8277a7f..2b4d98e78f31 100644
--- a/devel/qt5-qdbus/distinfo
+++ b/devel/qt5-qdbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770902
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929112
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-qdbusviewer/distinfo b/devel/qt5-qdbusviewer/distinfo
index ce8a459c54ab..00c02cf9bb7c 100644
--- a/devel/qt5-qdbusviewer/distinfo
+++ b/devel/qt5-qdbusviewer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711770903
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929113
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-qdoc-data/distinfo b/devel/qt5-qdoc-data/distinfo
index 838309ab304d..d42556f12dcd 100644
--- a/devel/qt5-qdoc-data/distinfo
+++ b/devel/qt5-qdoc-data/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771112
-SHA256 (KDE/Qt/5.15.13/qtbase-everywhere-opensource-src-5.15.13.tar.xz) = 4cca51dcc1f22ceeee6b3e33cd1c3a60b14e85e24644dca3af89a2c2989ab809
-SIZE (KDE/Qt/5.15.13/qtbase-everywhere-opensource-src-5.15.13.tar.xz) = 50862768
+TIMESTAMP = 1716929155
+SHA256 (KDE/Qt/5.15.14/qtbase-everywhere-opensource-src-5.15.14.tar.xz) = 500d3b390048e9538c28b5f523dfea6936f9c2e10d24ab46580ff57d430b98be
+SIZE (KDE/Qt/5.15.14/qtbase-everywhere-opensource-src-5.15.14.tar.xz) = 50887988
diff --git a/devel/qt5-qdoc/distinfo b/devel/qt5-qdoc/distinfo
index df3d8f01af42..cabc057e87fd 100644
--- a/devel/qt5-qdoc/distinfo
+++ b/devel/qt5-qdoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771113
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929156
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5-qmake/distinfo b/devel/qt5-qmake/distinfo
index 2278f2291cc1..d36f34e488fd 100644
--- a/devel/qt5-qmake/distinfo
+++ b/devel/qt5-qmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771115
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929157
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-remoteobjects/distinfo b/devel/qt5-remoteobjects/distinfo
index cadd24a1f2bc..ee8a6db5c832 100644
--- a/devel/qt5-remoteobjects/distinfo
+++ b/devel/qt5-remoteobjects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771116
-SHA256 (KDE/Qt/5.15.13/kde-qtremoteobjects-5.15.13p0.tar.xz) = fb7ae95bf8a296f71e542355dc8941937b05e8f416c18c4b9ef3b798d6e3a2ae
-SIZE (KDE/Qt/5.15.13/kde-qtremoteobjects-5.15.13p0.tar.xz) = 352492
+TIMESTAMP = 1716929158
+SHA256 (KDE/Qt/5.15.14/kde-qtremoteobjects-5.15.14p0.tar.xz) = c71e933da25e3d27f5a19f6f00e9137932891bf15ab4b3628715848b606ce95f
+SIZE (KDE/Qt/5.15.14/kde-qtremoteobjects-5.15.14p0.tar.xz) = 352412
diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile
index 5fbf625428c9..8454e5172ae0 100644
--- a/devel/qt5-script/Makefile
+++ b/devel/qt5-script/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	script
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-script/distinfo b/devel/qt5-script/distinfo
index 94b022c49052..37bd4374993d 100644
--- a/devel/qt5-script/distinfo
+++ b/devel/qt5-script/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700946055
-SHA256 (KDE/Qt/5.15.16/kde-qtscript-5.15.16p0.tar.xz) = bb0920fa98757e2f7e58cec95427149ef4795b50d4f8f22ef5ae7b5abecaef0c
-SIZE (KDE/Qt/5.15.16/kde-qtscript-5.15.16p0.tar.xz) = 2625416
+TIMESTAMP = 1716917189
+SHA256 (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = ad1f5d9e74833e96144791304b604924f92cd9486bb05c2243d477524366beeb
+SIZE (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = 2623608
diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile
index 4512408c1d84..a9dec4b9e764 100644
--- a/devel/qt5-scripttools/Makefile
+++ b/devel/qt5-scripttools/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	scripttools
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-scripttools/distinfo b/devel/qt5-scripttools/distinfo
index 26db9d1ee0bd..36121183e38c 100644
--- a/devel/qt5-scripttools/distinfo
+++ b/devel/qt5-scripttools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700946069
-SHA256 (KDE/Qt/5.15.16/kde-qtscript-5.15.16p0.tar.xz) = bb0920fa98757e2f7e58cec95427149ef4795b50d4f8f22ef5ae7b5abecaef0c
-SIZE (KDE/Qt/5.15.16/kde-qtscript-5.15.16p0.tar.xz) = 2625416
+TIMESTAMP = 1716917471
+SHA256 (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = ad1f5d9e74833e96144791304b604924f92cd9486bb05c2243d477524366beeb
+SIZE (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = 2623608
diff --git a/devel/qt5-scxml/distinfo b/devel/qt5-scxml/distinfo
index 39339f2ab2d9..7f3bfc402139 100644
--- a/devel/qt5-scxml/distinfo
+++ b/devel/qt5-scxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771117
-SHA256 (KDE/Qt/5.15.13/kde-qtscxml-5.15.13p0.tar.xz) = d3df8c1feac458cda23d1dc77c5b289f1c5ea0a153fea44bcbda940e568ed660
-SIZE (KDE/Qt/5.15.13/kde-qtscxml-5.15.13p0.tar.xz) = 409712
+TIMESTAMP = 1716929159
+SHA256 (KDE/Qt/5.15.14/kde-qtscxml-5.15.14p0.tar.xz) = 38b63d5f0741801c96c62c2e3515f573ef39058cba140771e9e73f39537f6378
+SIZE (KDE/Qt/5.15.14/kde-qtscxml-5.15.14p0.tar.xz) = 409764
diff --git a/devel/qt5-testlib/distinfo b/devel/qt5-testlib/distinfo
index 0852c383e9c5..9511eecd734c 100644
--- a/devel/qt5-testlib/distinfo
+++ b/devel/qt5-testlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771118
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929160
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/devel/qt5-uitools/distinfo b/devel/qt5-uitools/distinfo
index f731be872b22..fa8d91428048 100644
--- a/devel/qt5-uitools/distinfo
+++ b/devel/qt5-uitools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771119
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929161
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/devel/qt5/files/create_kde-qt_release.sh b/devel/qt5/files/create_kde-qt_release.sh
index a255ea5e79f7..9fbf78957139 100644
--- a/devel/qt5/files/create_kde-qt_release.sh
+++ b/devel/qt5/files/create_kde-qt_release.sh
@@ -29,9 +29,10 @@ if [ ! -d "${CHECKOUT}" ] ; then
 fi
 
 # Update the checkout of the required branch
+git -C "${CHECKOUT}" fetch --tags && \
 git -C "${CHECKOUT}" checkout "${BRANCH}" && \
-git -C "${CHECKOUT}" pull --ff-only --rebase --autostash && \
-git -C "${CHECKOUT}" submodule update
+git -C "${CHECKOUT}" pull --no-ff --rebase --autostash && \
+git -C "${CHECKOUT}" submodule update --force --checkout
 
 if [ $? -ne 0 ] ; then
 	echo "Failed to update ${CHECKOUT}"
@@ -46,14 +47,19 @@ DISTNAME="kde-${PROJECT}-${VERSION}p${PATCH_COUNT}"
 DISTFILE_TAR="${BASE_DIRECTORY}/${DISTNAME}.tar"
 DISTFILE="${DISTFILE_TAR}.xz"
 
-# Tar and compress distfile
-git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD --output ${DISTFILE_TAR} && \
-git -C ${CHECKOUT} submodule foreach --recursive "git archive --prefix="${DISTNAME}"/\$path/ --output=${BASE_DIRECTORY}/\$sha1.tar HEAD && tar -r --file=${DISTFILE_TAR} @${BASE_DIRECTORY}/\$sha1.tar && rm ${BASE_DIRECTORY}/\$sha1.tar" && \
-xz ${DISTFILE_TAR}
+# Tar and compress distfile if it does not exist
+if [ ! -f "${DISTFILE}" ] ; then
 
-if [ $? -ne 0 ] ; then
-	echo "Failed to create tarball ${DISTFILE}"
-	exit 1
+	git -C ${CHECKOUT} archive --format=tar --prefix="${DISTNAME}/" HEAD --output ${DISTFILE_TAR} && \
+	git -C ${CHECKOUT} submodule foreach --recursive "git archive --prefix="${DISTNAME}"/\$path/ --output=${BASE_DIRECTORY}/\$sha1.tar HEAD && tar -r --file=${DISTFILE_TAR} @${BASE_DIRECTORY}/\$sha1.tar && rm ${BASE_DIRECTORY}/\$sha1.tar" && \
+	xz ${DISTFILE_TAR}
+
+	if [ $? -ne 0 ] ; then
+		echo "Failed to create tarball ${DISTFILE}"
+		exit 1
+	fi
+else
+	echo "Distfile already exists, skipping creation."
 fi
 
 # Print out information required in qt-dist.mk
diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo
index 55282398ffde..12bb4c811d34 100644
--- a/devel/qt6-5compat/distinfo
+++ b/devel/qt6-5compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661020
-SHA256 (KDE/Qt/6.6.3/qt5compat-everywhere-src-6.6.3.tar.xz) = 68c2cf4e5eabfea27626fe40d088cb0dbb2c0414d3961ef132b7e06c60ceec0b
-SIZE (KDE/Qt/6.6.3/qt5compat-everywhere-src-6.6.3.tar.xz) = 14634848
+TIMESTAMP = 1718777701
+SHA256 (KDE/Qt/6.7.2/qt5compat-everywhere-src-6.7.2.tar.xz) = 8826b5189efc4d9bdb64fdb1aa89d0fdf4e53c60948ed7995621ed046e38c003
+SIZE (KDE/Qt/6.7.2/qt5compat-everywhere-src-6.7.2.tar.xz) = 14632348
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 048dc7a6f13c..3f62825bb99f 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -55,7 +55,6 @@ CMAKE_OFF+=	FEATURE_sql_mysql \
 SHEBANG_FILES=	${WRKSRC}/mkspecs/features/uikit/device_destinations.sh \
 		${WRKSRC}/mkspecs/features/uikit/devices.py \
 		${WRKSRC}/mkspecs/features/data/mac/objc_namespace.sh \
-		${WRKSRC}/util/android/android_emulator_launcher.sh \
 		${WRKSRC}/util/testrunner/qt-testrunner.py \
 		${WRKSRC}/util/testrunner/sanitizer-testrunner.py
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index 356bc1c3352b..cf1cfad7821c 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661021
-SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
-SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
+TIMESTAMP = 1718777702
+SHA256 (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599
+SIZE (KDE/Qt/6.7.2/qtbase-everywhere-src-6.7.2.tar.xz) = 49364504
diff --git a/devel/qt6-base/files/patch-cmake_FindMySQL.cmake b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake
new file mode 100644
index 000000000000..3d94148a38ae
--- /dev/null
+++ b/devel/qt6-base/files/patch-cmake_FindMySQL.cmake
@@ -0,0 +1,13 @@
+Use pkgconf to set hints for MariaDB, as well.
+
+--- cmake/FindMySQL.cmake.orig	2024-05-08 09:42:08 UTC
++++ cmake/FindMySQL.cmake
+@@ -43,7 +43,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
+     find_package(PkgConfig QUIET)
+ endif()
+ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
+-    pkg_check_modules(PC_MySQL QUIET "mysqlclient")
++    pkg_search_module(PC_MySQL QUIET "libmariadb" "mysqlclient")
+     set(MySQL_include_dir_hints ${PC_MySQL_INCLUDEDIR})
+     set(MySQL_library_hints ${PC_MySQL_LIBDIR})
+     set(MySQL_library_hints_debug "")
diff --git a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake
index 8df0968ae885..d1c33877dc66 100644
--- a/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake
+++ b/devel/qt6-base/files/patch-cmake_QtBuildPathsHelpers.cmake
@@ -1,4 +1,4 @@
---- cmake/QtBuildPathsHelpers.cmake.orig	2024-02-08 16:01:05 UTC
+--- cmake/QtBuildPathsHelpers.cmake.orig	2023-09-15 10:20:51 UTC
 +++ cmake/QtBuildPathsHelpers.cmake
 @@ -100,7 +100,7 @@ function(qt_internal_setup_build_and_install_paths)
      if(QT_CONFIG_INSTALL_DIR)
diff --git a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
index a1e02bb2b362..39f338bc0a6a 100644
--- a/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
+++ b/devel/qt6-base/files/patch-cmake_QtFlagHandlingHelpers.cmake
@@ -1,6 +1,6 @@
---- cmake/QtFlagHandlingHelpers.cmake.orig	2023-11-15 13:58:42 UTC
+--- cmake/QtFlagHandlingHelpers.cmake.orig	2023-09-15 10:20:51 UTC
 +++ cmake/QtFlagHandlingHelpers.cmake
-@@ -132,6 +132,10 @@ function(qt_internal_add_link_flags_no_undefined targe
+@@ -167,6 +167,10 @@ function(qt_internal_add_link_flags_no_undefined targe
              set(no_undefined_flag "-Wl,--no-undefined")
          endif()
  
diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompare.h b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h
new file mode 100644
index 000000000000..dca740aacab1
--- /dev/null
+++ b/devel/qt6-base/files/patch-src_corelib_global_qcompare.h
@@ -0,0 +1,37 @@
+Also disable spurious zero as null pointer constant warnings for Clang which
+are errors in www/dooble due to -Werror being passed.
+
+--- src/corelib/global/qcompare.h.orig	2024-01-22 10:20:09 UTC
++++ src/corelib/global/qcompare.h
+@@ -195,6 +195,7 @@ class partial_ordering (private)
+ 
+     QT_WARNING_PUSH
+     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
+     QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
+     friend constexpr bool is_eq  (partial_ordering o) noexcept { return o == 0; }
+     friend constexpr bool is_neq (partial_ordering o) noexcept { return o != 0; }
+@@ -380,6 +381,7 @@ class weak_ordering (private)
+ 
+     QT_WARNING_PUSH
+     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
+     QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
+     friend constexpr bool is_eq  (weak_ordering o) noexcept { return o == 0; }
+     friend constexpr bool is_neq (weak_ordering o) noexcept { return o != 0; }
+@@ -575,6 +577,7 @@ class strong_ordering (public)
+ 
+     QT_WARNING_PUSH
+     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
+     QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
+     friend constexpr bool is_eq  (strong_ordering o) noexcept { return o == 0; }
+     friend constexpr bool is_neq (strong_ordering o) noexcept { return o != 0; }
+@@ -859,6 +862,7 @@ class QPartialOrdering (private)
+ 
+     QT_WARNING_PUSH
+     // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100903
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant")
+     QT_WARNING_DISABLE_GCC("-Wzero-as-null-pointer-constant")
+     friend constexpr bool is_eq  (QPartialOrdering o) noexcept { return o == 0; }
+     friend constexpr bool is_neq (QPartialOrdering o) noexcept { return o != 0; }
diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h
new file mode 100644
index 000000000000..f28c5a926a13
--- /dev/null
+++ b/devel/qt6-base/files/patch-src_corelib_global_qcomparehelpers.h
@@ -0,0 +1,49 @@
+Suppress spurious zero as null pointer constant warnings which cause errors
+in www/dooble due to -Werror being passed. This is the same problem as in
+qcompare.h that upstream suppresses for GCC.
+
+/usr/local/include/qt6/QtCore/qfloat16.h:209:5: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant]
+...
+/usr/local/include/qt6/QtCore/qcomparehelpers.h:211:43: note: expanded from macro 'QT_DECLARE_ORDERING_HELPER_TEMPLATE'
+  211 |     { return compareThreeWay(lhs, rhs) >= 0; }
+
+--- src/corelib/global/qcomparehelpers.h.orig	2024-01-22 10:20:09 UTC
++++ src/corelib/global/qcomparehelpers.h
+@@ -197,6 +197,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
+     { return !comparesEqual(rhs, lhs); }
+ 
+ #define QT_DECLARE_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \
++    QT_WARNING_PUSH \
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \
+     friend Constexpr bool operator<(LeftType const &lhs, RightType const &rhs) \
+         noexcept(noexcept(compareThreeWay(lhs, rhs))) \
+     { return compareThreeWay(lhs, rhs) < 0; } \
+@@ -208,7 +210,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
+     { return compareThreeWay(lhs, rhs) <= 0; } \
+     friend Constexpr bool operator>=(LeftType const &lhs, RightType const &rhs) \
+         noexcept(noexcept(compareThreeWay(lhs, rhs))) \
+-    { return compareThreeWay(lhs, rhs) >= 0; }
++    { return compareThreeWay(lhs, rhs) >= 0; } \
++    QT_WARNING_POP
+ 
+ #define QT_DECLARE_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \
+     QT_DECLARE_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)
+@@ -225,6 +228,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
+ 
+ // Helpers for reversed ordering, using the existing compareThreeWay() function.
+ #define QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(OrderingType, LeftType, RightType, Constexpr) \
++    QT_WARNING_PUSH \
++    QT_WARNING_DISABLE_CLANG("-Wzero-as-null-pointer-constant") \
+     friend Constexpr bool operator<(RightType const &lhs, LeftType const &rhs) \
+         noexcept(noexcept(compareThreeWay(rhs, lhs))) \
+     { return compareThreeWay(rhs, lhs) > 0; } \
+@@ -236,7 +241,8 @@ template <typename In> constexpr auto to_Qt(In in) noe
+     { return compareThreeWay(rhs, lhs) >= 0; } \
+     friend Constexpr bool operator>=(RightType const &lhs, LeftType const &rhs) \
+         noexcept(noexcept(compareThreeWay(rhs, lhs))) \
+-    { return compareThreeWay(rhs, lhs) <= 0; }
++    { return compareThreeWay(rhs, lhs) <= 0; } \
++    QT_WARNING_POP
+ 
+ #define QT_DECLARE_REVERSED_ORDERING_HELPER_PARTIAL(LeftType, RightType, Constexpr) \
+     QT_DECLARE_REVERSED_ORDERING_HELPER_TEMPLATE(Qt::partial_ordering, LeftType, RightType, Constexpr)
diff --git a/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h
new file mode 100644
index 000000000000..6766a7584185
--- /dev/null
+++ b/devel/qt6-base/files/patch-src_corelib_global_qcompilerdetection.h
@@ -0,0 +1,18 @@
+Suppress warnings when -pedantic is passed and using std < c++20, which could
+also be errors if -Werror is also passed as is the case with www/dooble.
+
+error: use of the 'nodiscard' attribute is a C++20 extension
+
+https://github.com/llvm/llvm-project/issues/32865
+
+--- src/corelib/global/qcompilerdetection.h.orig	2024-01-22 10:20:09 UTC
++++ src/corelib/global/qcompilerdetection.h
+@@ -964,7 +964,7 @@
+ #  define Q_REQUIRED_RESULT [[nodiscard]]
+ #endif
+ 
+-#if __has_cpp_attribute(nodiscard) >= 201907L /* used for both P1771 and P1301... */
++#if __has_cpp_attribute(nodiscard) >= 201907L && (!defined(Q_CC_CLANG) || __cplusplus >= 201907L) /* used for both P1771 and P1301... */
+ // [[nodiscard]] constructor (P1771)
+ #  ifndef Q_NODISCARD_CTOR
+ #    define Q_NODISCARD_CTOR [[nodiscard]]
diff --git a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
index 15331f44334e..1fae16c7af55 100644
--- a/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
+++ b/devel/qt6-base/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
@@ -1,6 +1,6 @@
---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig	2023-09-21 19:24:26 UTC
+--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig	2023-09-15 10:20:51 UTC
 +++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -17,11 +17,7 @@
+@@ -19,11 +19,7 @@
  
  #include <mutex>
  
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp
index 3f0e8a5a8dc0..3f65f6206cf6 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslcontext__openssl.cpp
@@ -1,4 +1,4 @@
---- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig	2023-09-21 19:24:26 UTC
+--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig	2023-09-15 10:20:51 UTC
 +++ src/plugins/tls/openssl/qsslcontext_openssl.cpp
 @@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons
  }
@@ -41,7 +41,7 @@
  
  #if QT_CONFIG(dtls)
      // DTLS cookies:
-@@ -758,6 +760,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -760,6 +762,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
      }
  #endif // ocsp
  
@@ -49,7 +49,7 @@
      QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
      if (cctx) {
          q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -804,7 +807,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -806,7 +809,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
              sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
              sslContext->errorCode = QSslError::UnspecifiedError;
          }
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
index 902f6ae2be64..b8f5dfd475da 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols.cpp
@@ -1,4 +1,4 @@
---- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig	2023-11-15 13:58:42 UTC
+--- src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp.orig	2024-03-19 15:46:43 UTC
 +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
 @@ -112,23 +112,36 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, retur
  DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
@@ -37,19 +37,7 @@
  #ifdef TLS1_3_VERSION
  DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
  DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -154,7 +167,11 @@ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC3(int, CRYPTO_memcmp, const void * in_a, in_a, const void * in_b, in_b, size_t len, len, return 1, return);
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
-@@ -193,7 +210,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int
+@@ -193,7 +206,9 @@ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int
              ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
              return 0, return)
  DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
@@ -59,7 +47,7 @@
  DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
  DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
              int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -214,7 +233,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **
+@@ -214,7 +229,9 @@ DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **
  DEFINEFUNC2(int, ASN1_INTEGER_cmp, const ASN1_INTEGER *a, a, const ASN1_INTEGER *b, b, return 1, return)
  DEFINEFUNC(int, ASN1_STRING_length, ASN1_STRING *a, a, return 0, return)
  DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return)
@@ -69,7 +57,7 @@
  DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
  DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
  DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return nullptr, return)
-@@ -289,12 +310,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const
+@@ -289,12 +306,14 @@ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const
  DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -1, return)
  DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
  DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
@@ -84,7 +72,7 @@
  DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
  DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
  DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -761,8 +784,8 @@ static LoadedOpenSsl loadOpenSsl()
+@@ -761,8 +780,8 @@ static LoadedOpenSsl loadOpenSsl()
      libcrypto->setFileNameAndVersion("crypto"_L1, shlibVersion);
  #elif defined(SHLIB_VERSION_NUMBER)
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -95,7 +83,7 @@
  #endif // OPENSSL_SHLIB_VERSION
  
      if (libcrypto->load() && libssl->load()) {
-@@ -795,8 +818,8 @@ static LoadedOpenSsl loadOpenSsl()
+@@ -795,8 +814,8 @@ static LoadedOpenSsl loadOpenSsl()
      libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1);
      libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1);
  # else
@@ -106,7 +94,7 @@
  # endif
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.0 and libcrypto.so.0 found
-@@ -865,21 +888,34 @@ bool q_resolveOpenSslSymbols()
+@@ -865,21 +884,34 @@ bool q_resolveOpenSslSymbols()
          RESOLVEFUNC(EVP_CIPHER_CTX_reset)
          RESOLVEFUNC(AUTHORITY_INFO_ACCESS_free)
          RESOLVEFUNC(EVP_PKEY_up_ref)
@@ -141,7 +129,7 @@
  #ifdef TLS1_3_VERSION
          RESOLVEFUNC(SSL_CTX_set_ciphersuites)
          RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -961,7 +997,9 @@ bool q_resolveOpenSslSymbols()
+@@ -961,7 +993,9 @@ bool q_resolveOpenSslSymbols()
          RESOLVEFUNC(OCSP_check_validity)
          RESOLVEFUNC(OCSP_cert_to_id)
          RESOLVEFUNC(OCSP_id_get0_info)
@@ -152,7 +140,7 @@
          RESOLVEFUNC(OCSP_basic_sign)
          RESOLVEFUNC(OCSP_response_create)
          RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1056,12 +1094,14 @@ bool q_resolveOpenSslSymbols()
+@@ -1056,12 +1090,14 @@ bool q_resolveOpenSslSymbols()
          RESOLVEFUNC(SSL_CTX_use_PrivateKey)
          RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
          RESOLVEFUNC(SSL_CTX_get_cert_store);
@@ -167,7 +155,7 @@
          RESOLVEFUNC(SSL_accept)
          RESOLVEFUNC(SSL_clear)
          RESOLVEFUNC(SSL_connect)
-@@ -1121,7 +1161,9 @@ bool q_resolveOpenSslSymbols()
+@@ -1121,7 +1157,9 @@ bool q_resolveOpenSslSymbols()
          RESOLVEFUNC(RSA_free)
  
          RESOLVEFUNC(DH_bits)
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h
index 911ffd8d9f99..0f92172a0f4c 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qsslsocket__openssl__symbols__p.h
@@ -1,4 +1,4 @@
---- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig	2023-09-13 16:02:48 UTC
+--- src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h.orig	2024-03-19 15:46:43 UTC
 +++ src/plugins/tls/openssl/qsslsocket_openssl_symbols_p.h
 @@ -46,6 +46,13 @@ QT_BEGIN_NAMESPACE
  
@@ -47,7 +47,7 @@
  int q_SSL_session_reused(SSL *a);
  qssloptions q_SSL_CTX_set_options(SSL_CTX *ctx, qssloptions op);
  int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -237,9 +261,15 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE
+@@ -237,8 +261,13 @@ STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE
  # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
                                                         | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
  
@@ -59,11 +59,9 @@
 +#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
 +#endif // LIBRESSL_VERSION_NUMBER
  
-+
  #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS \
-                                                                    | OPENSSL_INIT_LOAD_CONFIG, NULL)
-@@ -423,12 +453,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a)
+@@ -423,12 +452,14 @@ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a)
  int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
  int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
  X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
@@ -78,7 +76,7 @@
  void q_SSL_free(SSL *a);
  STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
  const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -536,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12);
+@@ -537,14 +568,26 @@ void q_PKCS12_free(PKCS12 *pkcs12);
  #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
  #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
  #define q_SSL_CTX_set_mode(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
@@ -105,43 +103,3 @@
  #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
  #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
          q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-@@ -645,7 +689,11 @@ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#else
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#endif
- OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-@@ -664,8 +712,15 @@ void *q_CRYPTO_malloc(size_t num, const char *file, in
- 
- void *q_CRYPTO_malloc(size_t num, const char *file, int line);
- #define q_OPENSSL_malloc(num) q_CRYPTO_malloc(num, "", 0)
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
- # define q_OPENSSL_free(addr) q_CRYPTO_free(addr, "", 0)
-+#else
-+void q_CRYPTO_free(void *a);
-+# define q_OPENSSL_free(addr) q_CRYPTO_free(addr)
-+#endif
-+
- int q_CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
- 
- void q_SSL_set_info_callback(SSL *ssl, void (*cb) (const SSL *ssl, int type, int val));
-@@ -729,7 +784,11 @@ int q_RSA_bits(RSA *a);
- 
- int q_DH_bits(DH *dh);
- int q_RSA_bits(RSA *a);
-+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3050000fL)
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#else
- int q_DSA_bits(DSA *a);
-+#endif
- 
- int q_EVP_PKEY_assign(EVP_PKEY *a, int b, void *r);
- int q_EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
diff --git a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
index 2c822ea8c44c..a391e32bdd42 100644
--- a/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
+++ b/devel/qt6-base/files/patch-src_plugins_tls_openssl_qx509__openssl.cpp
@@ -1,48 +1,6 @@
---- src/plugins/tls/openssl/qx509_openssl.cpp.orig	2023-09-21 19:24:26 UTC
+--- src/plugins/tls/openssl/qx509_openssl.cpp.orig	2024-03-19 15:46:43 UTC
 +++ src/plugins/tls/openssl/qx509_openssl.cpp
-@@ -64,7 +64,12 @@ QMultiMap<QByteArray, QString> mapFromX509Name(X509_NA
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--        q_CRYPTO_free(data, nullptr, 0);
-+#ifndef LIBRESSL_VERSION_NUMBER
-+         q_CRYPTO_free(data, nullptr, 0);
-+#else
-+         q_CRYPTO_free(data);
-+#endif
-+
-     }
- 
-     return info;
-@@ -75,11 +80,27 @@ QDateTime dateTimeFromASN1(const ASN1_TIME *aTime)
-     QDateTime result;
-     tm lTime;
- 
-+#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x3060000fL)
-+    const char *data;
-+    size_t len;
-+    int type;
-+
-+    data = (const char*)ASN1_STRING_get0_data((const ASN1_STRING *)aTime);
-+    len = ASN1_STRING_length(aTime);
-+    type = ASN1_STRING_type(aTime);
-+
-+    if (ASN1_time_parse(data, len, &lTime, type) == type) {
-+        QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday);
-+        QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
-+        result = QDateTime(resDate, resTime, Qt::UTC);
-+    }
-+#else
-     if (q_ASN1_TIME_to_tm(aTime, &lTime)) {
-         QDate resDate(lTime.tm_year + 1900, lTime.tm_mon + 1, lTime.tm_mday);
-         QTime resTime(lTime.tm_hour, lTime.tm_min, lTime.tm_sec);
-         result = QDateTime(resDate, resTime, QTimeZone::UTC);
-     }
-+#endif
- 
-     return result;
- }
-@@ -190,7 +211,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e
+@@ -190,7 +190,11 @@ QVariant x509UnknownExtensionToValue(X509_EXTENSION *e
          QVariantList list;
          bool isMap = false;
  
@@ -54,7 +12,7 @@
              CONF_VALUE *nval = q_SKM_sk_value(CONF_VALUE, val, j);
              if (nval->name && nval->value) {
                  isMap = true;
-@@ -286,7 +311,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext)
+@@ -286,7 +290,11 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext)
              if (!info)
                  return {};
              QVariantMap result;
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index f9441889733f..8ebb068d2b74 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -30,7 +30,6 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractitemmodel_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstractproxymodel_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
-%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qatomicscopedvaluerollback_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
@@ -42,6 +41,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreevent_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h
@@ -72,6 +72,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_freebsd_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutex_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h
@@ -144,6 +145,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsharedmemory_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsimd_x86_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsingleshottimer_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qspan_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h
 %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h
@@ -200,6 +202,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/QAtomicInt
 %%QT_INCDIR%%/QtCore/QAtomicInteger
 %%QT_INCDIR%%/QtCore/QAtomicPointer
+%%QT_INCDIR%%/QtCore/QAtomicScopedValueRollback
 %%QT_INCDIR%%/QtCore/QBEInteger
 %%QT_INCDIR%%/QtCore/QBaseIterator
 %%QT_INCDIR%%/QtCore/QBasicMutex
@@ -252,7 +255,6 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/QDeadlineTimer
 %%QT_INCDIR%%/QtCore/QDebug
 %%QT_INCDIR%%/QtCore/QDebugStateSaver
-%%QT_INCDIR%%/QtCore/QDeferredDeleteEvent
 %%QT_INCDIR%%/QtCore/QDir
 %%QT_INCDIR%%/QtCore/QDirIterator
 %%QT_INCDIR%%/QtCore/QDynamicPropertyChangeEvent
@@ -461,11 +463,13 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/QSocketDescriptor
 %%QT_INCDIR%%/QtCore/QSocketNotifier
 %%QT_INCDIR%%/QtCore/QSortFilterProxyModel
+%%QT_INCDIR%%/QtCore/QSpan
 %%QT_INCDIR%%/QtCore/QSpecialInteger
 %%QT_INCDIR%%/QtCore/QStack
 %%QT_INCDIR%%/QtCore/QStandardPaths
 %%QT_INCDIR%%/QtCore/QStaticByteArrayMatcher
 %%QT_INCDIR%%/QtCore/QStaticByteArrayMatcherBase
+%%QT_INCDIR%%/QtCore/QStaticLatin1StringMatcher
 %%QT_INCDIR%%/QtCore/QStaticPlugin
 %%QT_INCDIR%%/QtCore/QStorageInfo
 %%QT_INCDIR%%/QtCore/QString
@@ -487,6 +491,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/QSystemSemaphore
 %%QT_INCDIR%%/QtCore/QTaggedIterator
 %%QT_INCDIR%%/QtCore/QTaggedPointer
+%%QT_INCDIR%%/QtCore/QTemplatedMetaMethodReturnArgument
 %%QT_INCDIR%%/QtCore/QTemporaryDir
 %%QT_INCDIR%%/QtCore/QTemporaryFile
 %%QT_INCDIR%%/QtCore/QTextBoundaryFinder
@@ -589,8 +594,10 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/q20chrono.h
 %%QT_INCDIR%%/QtCore/q20functional.h
 %%QT_INCDIR%%/QtCore/q20iterator.h
+%%QT_INCDIR%%/QtCore/q20map.h
 %%QT_INCDIR%%/QtCore/q20memory.h
 %%QT_INCDIR%%/QtCore/q20type_traits.h
+%%QT_INCDIR%%/QtCore/q20vector.h
 %%QT_INCDIR%%/QtCore/q23functional.h
 %%QT_INCDIR%%/QtCore/q23utility.h
 %%QT_INCDIR%%/QtCore/qabstractanimation.h
@@ -609,6 +616,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qassociativeiterable.h
 %%QT_INCDIR%%/QtCore/qatomic.h
 %%QT_INCDIR%%/QtCore/qatomic_cxx11.h
+%%QT_INCDIR%%/QtCore/qatomicscopedvaluerollback.h
 %%QT_INCDIR%%/QtCore/qbasicatomic.h
 %%QT_INCDIR%%/QtCore/qbasictimer.h
 %%QT_INCDIR%%/QtCore/qbindingstorage.h
@@ -634,6 +642,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qcommandlineparser.h
 %%QT_INCDIR%%/QtCore/qcompare.h
 %%QT_INCDIR%%/QtCore/qcompare_impl.h
+%%QT_INCDIR%%/QtCore/qcomparehelpers.h
 %%QT_INCDIR%%/QtCore/qcompilerdetection.h
 %%QT_INCDIR%%/QtCore/qconcatenatetablesproxymodel.h
 %%QT_INCDIR%%/QtCore/qconfig.h
@@ -765,8 +774,10 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qsize.h
 %%QT_INCDIR%%/QtCore/qsocketnotifier.h
 %%QT_INCDIR%%/QtCore/qsortfilterproxymodel.h
+%%QT_INCDIR%%/QtCore/qspan.h
 %%QT_INCDIR%%/QtCore/qstack.h
 %%QT_INCDIR%%/QtCore/qstandardpaths.h
+%%QT_INCDIR%%/QtCore/qstaticlatin1stringmatcher.h
 %%QT_INCDIR%%/QtCore/qstorageinfo.h
 %%QT_INCDIR%%/QtCore/qstring.h
 %%QT_INCDIR%%/QtCore/qstringalgorithms.h
@@ -813,6 +824,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qtransposeproxymodel.h
 %%QT_INCDIR%%/QtCore/qtresource.h
 %%QT_INCDIR%%/QtCore/qtsan_impl.h
+%%QT_INCDIR%%/QtCore/qtsymbolmacros.h
 %%QT_INCDIR%%/QtCore/qttranslation.h
 %%QT_INCDIR%%/QtCore/qttypetraits.h
 %%QT_INCDIR%%/QtCore/qtversion.h
@@ -838,6 +850,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtCore/qxmlstream.h
 %%QT_INCDIR%%/QtCore/qxpfunctional.h
 %%QT_INCDIR%%/QtCore/qxptype_traits.h
+%%QT_INCDIR%%/QtCore/qyieldcpu.h
 %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/dbus_minimal_p.h
 %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbus_symbols_p.h
 %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusabstractadaptor_p.h
@@ -892,7 +905,6 @@ bin/qmake6
 %%QT_INCDIR%%/QtDBus/qdbuserror.h
 %%QT_INCDIR%%/QtDBus/qdbusextratypes.h
 %%QT_INCDIR%%/QtDBus/qdbusinterface.h
-%%QT_INCDIR%%/QtDBus/qdbusmacros.h
 %%QT_INCDIR%%/QtDBus/qdbusmessage.h
 %%QT_INCDIR%%/QtDBus/qdbusmetatype.h
 %%QT_INCDIR%%/QtDBus/qdbuspendingcall.h
@@ -1129,6 +1141,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegration.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationfactory_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformintegrationplugin.h
+%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformkeymapper.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformmenu_p.h
 %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformnativeinterface.h
@@ -1192,6 +1205,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtGui/QBrush
 %%QT_INCDIR%%/QtGui/QBrushData
 %%QT_INCDIR%%/QtGui/QBrushDataPointerDeleter
+%%QT_INCDIR%%/QtGui/QChildWindowEvent
 %%QT_INCDIR%%/QtGui/QClipboard
 %%QT_INCDIR%%/QtGui/QCloseEvent
 %%QT_INCDIR%%/QtGui/QColor
@@ -1462,6 +1476,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtGui/qrgba64.h
 %%QT_INCDIR%%/QtGui/qrgbafloat.h
 %%QT_INCDIR%%/QtGui/qscreen.h
+%%QT_INCDIR%%/QtGui/qscreen_platform.h
 %%QT_INCDIR%%/QtGui/qsessionmanager.h
 %%QT_INCDIR%%/QtGui/qshortcut.h
 %%QT_INCDIR%%/QtGui/qstandarditemmodel.h
@@ -1544,6 +1559,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostinfo_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhsts_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhstsstore_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2connection_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpheaderparser_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h
@@ -1581,8 +1597,11 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyhttpimpl_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequestfactory_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocsp_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qocspresponse_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestaccessmanager_p.h
+%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qrestreply_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qssl_p.h
 %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcertificate_p.h
@@ -1612,6 +1631,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/QDnsTextRecord
 %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtls
 %%DTLS%%%%QT_INCDIR%%/QtNetwork/QDtlsClientVerifier
+%%QT_INCDIR%%/QtNetwork/QHttpHeaders
 %%QT_INCDIR%%/QtNetwork/QHostAddress
 %%QT_INCDIR%%/QtNetwork/QHostInfo
 %%QT_INCDIR%%/QtNetwork/QHstsPolicy
@@ -1636,8 +1656,11 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/QNetworkProxyQuery
 %%QT_INCDIR%%/QtNetwork/QNetworkReply
 %%QT_INCDIR%%/QtNetwork/QNetworkRequest
+%%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory
 %%QT_INCDIR%%/QtNetwork/QOcspResponse
 %%QT_INCDIR%%/QtNetwork/QPasswordDigestor
+%%QT_INCDIR%%/QtNetwork/QRestAccessManager
+%%QT_INCDIR%%/QtNetwork/QRestReply
 %%QT_INCDIR%%/QtNetwork/QSsl
 %%QT_INCDIR%%/QtNetwork/QSslCertificate
 %%QT_INCDIR%%/QtNetwork/QSslCertificateExtension
@@ -1667,6 +1690,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/qhstspolicy.h
 %%QT_INCDIR%%/QtNetwork/qhttp1configuration.h
 %%QT_INCDIR%%/QtNetwork/qhttp2configuration.h
+%%QT_INCDIR%%/QtNetwork/qhttpheaders.h
 %%QT_INCDIR%%/QtNetwork/qhttpmultipart.h
 %%QT_INCDIR%%/QtNetwork/qlocalserver.h
 %%QT_INCDIR%%/QtNetwork/qlocalsocket.h
@@ -1680,8 +1704,11 @@ bin/qmake6
 %%QT_INCDIR%%/QtNetwork/qnetworkproxy.h
 %%QT_INCDIR%%/QtNetwork/qnetworkreply.h
 %%QT_INCDIR%%/QtNetwork/qnetworkrequest.h
+%%QT_INCDIR%%/QtNetwork/qnetworkrequestfactory.h
 %%QT_INCDIR%%/QtNetwork/qocspresponse.h
 %%QT_INCDIR%%/QtNetwork/qpassworddigestor.h
+%%QT_INCDIR%%/QtNetwork/qrestaccessmanager.h
+%%QT_INCDIR%%/QtNetwork/qrestreply.h
 %%QT_INCDIR%%/QtNetwork/qssl.h
 %%QT_INCDIR%%/QtNetwork/qsslcertificate.h
 %%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h
@@ -1887,7 +1914,6 @@ bin/qmake6
 %%QT_INCDIR%%/QtSql/QtSql
 %%QT_INCDIR%%/QtSql/QtSqlDepends
 %%QT_INCDIR%%/QtSql/QtSqlVersion
-%%QT_INCDIR%%/QtSql/qsql.h
 %%QT_INCDIR%%/QtSql/qsqldatabase.h
 %%QT_INCDIR%%/QtSql/qsqldriver.h
 %%QT_INCDIR%%/QtSql/qsqldriverplugin.h
@@ -1913,6 +1939,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmetric_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkperfevents_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
+%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcomparisontesthelper_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qemulationdetector_p.h
 %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
@@ -1959,7 +1986,6 @@ bin/qmake6
 %%QT_INCDIR%%/QtTest/qbenchmarkmetric.h
 %%QT_INCDIR%%/QtTest/qsignalspy.h
 %%QT_INCDIR%%/QtTest/qtest.h
-%%QT_INCDIR%%/QtTest/qtest_global.h
 %%QT_INCDIR%%/QtTest/qtest_gui.h
 %%QT_INCDIR%%/QtTest/qtest_network.h
 %%QT_INCDIR%%/QtTest/qtest_widgets.h
@@ -2052,6 +2078,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpushbutton_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qrhiwidget_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollarea_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscrollbar_p.h
 %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qscroller_p.h
@@ -2205,6 +2232,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtWidgets/QProxyStyle
 %%QT_INCDIR%%/QtWidgets/QPushButton
 %%QT_INCDIR%%/QtWidgets/QRadioButton
+%%QT_INCDIR%%/QtWidgets/QRhiWidget
 %%QT_INCDIR%%/QtWidgets/QRubberBand
 %%QT_INCDIR%%/QtWidgets/QScrollArea
 %%QT_INCDIR%%/QtWidgets/QScrollBar
@@ -2369,6 +2397,7 @@ bin/qmake6
 %%QT_INCDIR%%/QtWidgets/qproxystyle.h
 %%QT_INCDIR%%/QtWidgets/qpushbutton.h
 %%QT_INCDIR%%/QtWidgets/qradiobutton.h
+%%QT_INCDIR%%/QtWidgets/qrhiwidget.h
 %%QT_INCDIR%%/QtWidgets/qrubberband.h
 %%QT_INCDIR%%/QtWidgets/qscrollarea.h
 %%QT_INCDIR%%/QtWidgets/qscrollbar.h
@@ -2478,6 +2507,7 @@ lib/cmake/Qt6/FindMySQL.cmake
 lib/cmake/Qt6/FindOracle.cmake
 lib/cmake/Qt6/FindPPS.cmake
 lib/cmake/Qt6/FindPostgreSQL.cmake
+lib/cmake/Qt6/FindRenderDoc.cmake
 lib/cmake/Qt6/FindSlog2.cmake
 lib/cmake/Qt6/FindTslib.cmake
 lib/cmake/Qt6/FindWrapAtomic.cmake
@@ -2667,6 +2697,7 @@ lib/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in
 lib/cmake/Qt6Core/Qt6CoreDependencies.cmake
 lib/cmake/Qt6Core/Qt6CoreDeploySupport.cmake
 lib/cmake/Qt6Core/Qt6CoreMacros.cmake
+lib/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp
 lib/cmake/Qt6Core/Qt6CoreTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6Core/Qt6CoreTargets.cmake
 lib/cmake/Qt6Core/Qt6CoreVersionlessTargets.cmake
@@ -3074,8 +3105,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json
-%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
-%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
+%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
+%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
 %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
 %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
 %%QT_MKSPECDIR%%/aix-g++/qmake.conf
@@ -3132,6 +3163,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/common/uikit/clang.conf
 %%QT_MKSPECDIR%%/common/uikit/qmake.conf
 %%QT_MKSPECDIR%%/common/unix.conf
+%%QT_MKSPECDIR%%/common/vxworks/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/wasm/qplatformdefs.h
 %%QT_MKSPECDIR%%/common/wasm/wasm.conf
 %%QT_MKSPECDIR%%/common/watchos.conf
@@ -3527,6 +3559,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf
 %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+%%QT_MKSPECDIR%%/vxworks-clang/qplatformdefs.h
 %%QT_MKSPECDIR%%/wasm-emscripten-64/qmake.conf
 %%QT_MKSPECDIR%%/wasm-emscripten-64/qplatformdefs.h
 %%QT_MKSPECDIR%%/wasm-emscripten/qmake.conf
@@ -3582,7 +3615,6 @@ libdata/pkgconfig/Qt6Sql.pc
 libdata/pkgconfig/Qt6Test.pc
 libdata/pkgconfig/Qt6Widgets.pc
 libdata/pkgconfig/Qt6Xml.pc
-%%QT_TOOLDIR%%/android_emulator_launcher.sh
 %%QT_TOOLDIR%%/cmake_automoc_parser
 %%QT_TOOLDIR%%/ensure_pro_file.cmake
 %%QT_TOOLDIR%%/moc
@@ -3590,6 +3622,7 @@ libdata/pkgconfig/Qt6Xml.pc
 %%QT_TOOLDIR%%/qt-cmake-private
 %%QT_TOOLDIR%%/qt-cmake-private-install.cmake
 %%QT_TOOLDIR%%/qt-cmake-standalone-test
+%%QT_TOOLDIR%%/qt-internal-configure-examples
 %%QT_TOOLDIR%%/qt-internal-configure-tests
 %%QT_TOOLDIR%%/qt-testrunner.py
 %%QT_TOOLDIR%%/qvkgen
@@ -3726,6 +3759,7 @@ libdata/pkgconfig/Qt6Xml.pc
 %%QT_DOCDIR%%/global/template/style/online.css
 %%QT_DOCDIR%%/global/template/style/tech_preview.svg
 %%QT_DOCDIR%%/global/template/style/theqtcompany.png
+%%QT_DOCDIR%%/global/warninglimit.qdocconf
 %%QT_DATADIR%%/modules/Concurrent.json
 %%QT_DATADIR%%/modules/Core.json
 %%QT_DATADIR%%/modules/DBus.json
diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo
index f4089cb0c0f8..f52669203646 100644
--- a/devel/qt6-languageserver/distinfo
+++ b/devel/qt6-languageserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661023
-SHA256 (KDE/Qt/6.6.3/qtlanguageserver-everywhere-src-6.6.3.tar.xz) = 1021b4b9024bd23bef86292f4b6c15cc7db620b6c47be8cb6e539bfae7f6cf8c
-SIZE (KDE/Qt/6.6.3/qtlanguageserver-everywhere-src-6.6.3.tar.xz) = 145420
+TIMESTAMP = 1718777703
+SHA256 (KDE/Qt/6.7.2/qtlanguageserver-everywhere-src-6.7.2.tar.xz) = b659fe655144ffa061e3ae509eadb42ae373230517295a96935434340e101a92
+SIZE (KDE/Qt/6.7.2/qtlanguageserver-everywhere-src-6.7.2.tar.xz) = 145660
diff --git a/devel/qt6-location/distinfo b/devel/qt6-location/distinfo
index 3b4044add279..be047b8969a5 100644
--- a/devel/qt6-location/distinfo
+++ b/devel/qt6-location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661029
-SHA256 (KDE/Qt/6.6.3/qtlocation-everywhere-src-6.6.3.tar.xz) = d7b42920f30a6a3fc4edffae541332fceaa6f5f7a4776c6809e0fd80fff801d1
-SIZE (KDE/Qt/6.6.3/qtlocation-everywhere-src-6.6.3.tar.xz) = 3028756
+TIMESTAMP = 1718777704
+SHA256 (KDE/Qt/6.7.2/qtlocation-everywhere-src-6.7.2.tar.xz) = f232da58bf1189b69f1f7029417ddfeffcfb801b275aedc720e38244f88a485d
+SIZE (KDE/Qt/6.7.2/qtlocation-everywhere-src-6.7.2.tar.xz) = 3166188
diff --git a/devel/qt6-location/pkg-plist b/devel/qt6-location/pkg-plist
index 4d37c40560a6..fdcc8e074803 100644
--- a/devel/qt6-location/pkg-plist
+++ b/devel/qt6-location/pkg-plist
@@ -6,6 +6,7 @@
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetails_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
+%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeojsondata_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomap_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h
 %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
diff --git a/devel/qt6-positioning/distinfo b/devel/qt6-positioning/distinfo
index 3c664af6107a..97347f1a0280 100644
--- a/devel/qt6-positioning/distinfo
+++ b/devel/qt6-positioning/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661032
-SHA256 (KDE/Qt/6.6.3/qtpositioning-everywhere-src-6.6.3.tar.xz) = 9a37b6502aa00f6caf6701d3d0ed95f6de13a8d0934ec8348e6631ad9bfd3fbb
-SIZE (KDE/Qt/6.6.3/qtpositioning-everywhere-src-6.6.3.tar.xz) = 1505028
+TIMESTAMP = 1718777705
+SHA256 (KDE/Qt/6.7.2/qtpositioning-everywhere-src-6.7.2.tar.xz) = 020009f0aa8f6b1042963a45b6e19f2784cc937949cdb673f3b876153e087b1c
+SIZE (KDE/Qt/6.7.2/qtpositioning-everywhere-src-6.7.2.tar.xz) = 658112
diff --git a/devel/qt6-remoteobjects/distinfo b/devel/qt6-remoteobjects/distinfo
index 243c822553c7..31205ab5b908 100644
--- a/devel/qt6-remoteobjects/distinfo
+++ b/devel/qt6-remoteobjects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661034
-SHA256 (KDE/Qt/6.6.3/qtremoteobjects-everywhere-src-6.6.3.tar.xz) = 5f7e573f64aeb0b9edf4c19ea2064663430435bcf0e283c0fcf43b3fda276d99
-SIZE (KDE/Qt/6.6.3/qtremoteobjects-everywhere-src-6.6.3.tar.xz) = 534172
+TIMESTAMP = 1718777706
+SHA256 (KDE/Qt/6.7.2/qtremoteobjects-everywhere-src-6.7.2.tar.xz) = 0b906b81aa7d6f4e47d4a298da67894433f3096a06f4c4237788c1b2cb9b7483
+SIZE (KDE/Qt/6.7.2/qtremoteobjects-everywhere-src-6.7.2.tar.xz) = 537040
diff --git a/devel/qt6-scxml/distinfo b/devel/qt6-scxml/distinfo
index fb549b237938..d57894ae681f 100644
--- a/devel/qt6-scxml/distinfo
+++ b/devel/qt6-scxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661037
-SHA256 (KDE/Qt/6.6.3/qtscxml-everywhere-src-6.6.3.tar.xz) = 0f1b6a4db03d30b8770bc1c0eb11280acb41bfaf91b577928bb9686d31e16cb5
-SIZE (KDE/Qt/6.6.3/qtscxml-everywhere-src-6.6.3.tar.xz) = 1167484
+TIMESTAMP = 1718777707
+SHA256 (KDE/Qt/6.7.2/qtscxml-everywhere-src-6.7.2.tar.xz) = 20ecf93506d48f27b492ad3dd9d88830e08d642faec3071ce53396a8ae05c86f
+SIZE (KDE/Qt/6.7.2/qtscxml-everywhere-src-6.7.2.tar.xz) = 1168452
diff --git a/devel/qt6-tools/Makefile b/devel/qt6-tools/Makefile
index c4f065572e5e..fd2666492e86 100644
--- a/devel/qt6-tools/Makefile
+++ b/devel/qt6-tools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tools
 DISTVERSION=	${QT6_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
@@ -13,7 +14,7 @@ LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
 USES=		cmake compiler:c++17-lang gl llvm:lib,noexport python:build \
 		qt-dist:6
 USE_GL=		opengl
-USE_QT=		base declarative
+USE_QT=		base declarative sqldriver-sqlite:run
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 CMAKE_ARGS+=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
diff --git a/devel/qt6-tools/distinfo b/devel/qt6-tools/distinfo
index a6b6b9a440b9..d490d0ef479b 100644
--- a/devel/qt6-tools/distinfo
+++ b/devel/qt6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661051
-SHA256 (KDE/Qt/6.6.3/qttools-everywhere-src-6.6.3.tar.xz) = aa6d4c822d8cb74066ef30ab42283ac24e5cc702f33e6d78a9ebef5b0df91bc0
-SIZE (KDE/Qt/6.6.3/qttools-everywhere-src-6.6.3.tar.xz) = 8596272
+TIMESTAMP = 1718777708
+SHA256 (KDE/Qt/6.7.2/qttools-everywhere-src-6.7.2.tar.xz) = 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a
+SIZE (KDE/Qt/6.7.2/qttools-everywhere-src-6.7.2.tar.xz) = 9019636
diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist
index 4f94015b3e5f..ed028d34a528 100644
--- a/devel/qt6-tools/pkg-plist
+++ b/devel/qt6-tools/pkg-plist
@@ -229,23 +229,23 @@ bin/qtplugininfo6
 %%QT_INCDIR%%/QtHelp/qthelpversion.h
 %%QT_INCDIR%%/QtQDocCatch/QtQDocCatchDepends
 %%QT_INCDIR%%/QtQDocCatch/catch/catch.hpp
-%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/QtQDocCatchConversionsPrivateDepends
-%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qdoc_catch_conversions.h
-%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/qt_catch_conversions.h
-%%QT_INCDIR%%/QtQDocCatchConversionsPrivate/catch_conversions/std_catch_conversions.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/QtQDocCatchGeneratorsPrivateDepends
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/cycle_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/combinators/oneof_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/k_partition_of_r_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/path_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qchar_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/generators/qstring_generator.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/namespaces.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/copy_value.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/generator_handler.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/semantics/move_into_vector.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/distribution.h
-%%QT_INCDIR%%/QtQDocCatchGeneratorsPrivate/catch_generators/utilities/statistics/percentages.h
+%%QT_INCDIR%%/QtQDocCatchConversions/QtQDocCatchConversionsDepends
+%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/qdoc_catch_conversions.h
+%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/qt_catch_conversions.h
+%%QT_INCDIR%%/QtQDocCatchConversions/catch_conversions/std_catch_conversions.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/QtQDocCatchGeneratorsDepends
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/combinators/cycle_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/combinators/oneof_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/k_partition_of_r_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/path_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/qchar_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/generators/qstring_generator.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/namespaces.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/copy_value.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/generator_handler.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/semantics/move_into_vector.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/statistics/distribution.h
+%%QT_INCDIR%%/QtQDocCatchGenerators/catch_generators/utilities/statistics/percentages.h
 %%QT_INCDIR%%/QtTools/%%FULLVER%%/QtTools/private/qttools-config_p.h
 %%QT_INCDIR%%/QtTools/QtTools
 %%QT_INCDIR%%/QtTools/QtToolsDepends
@@ -407,12 +407,9 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_help.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_linguist.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_linguist_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qdoccatch_private.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversionsprivate_private.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchconversions_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qdoccatchgenerators_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_tools_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri
@@ -421,8 +418,6 @@ lib/cmake/Qt6UiTools/Qt6UiToolsVersionlessTargets.cmake
 libdata/pkgconfig/Qt6Designer.pc
 libdata/pkgconfig/Qt6Help.pc
 libdata/pkgconfig/Qt6Linguist.pc
-libdata/pkgconfig/Qt6QDocCatchConversionsPrivate.pc
-libdata/pkgconfig/Qt6QDocCatchGeneratorsPrivate.pc
 libdata/pkgconfig/Qt6UiPlugin.pc
 libdata/pkgconfig/Qt6UiTools.pc
 %%QT_TOOLDIR%%/lprodump
diff --git a/devel/qt6-translations/distinfo b/devel/qt6-translations/distinfo
index 5f809613ae4a..c728341e627e 100644
--- a/devel/qt6-translations/distinfo
+++ b/devel/qt6-translations/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661068
-SHA256 (KDE/Qt/6.6.3/qttranslations-everywhere-src-6.6.3.tar.xz) = 12e35f2ac9a262e41827d95f168d4de6eb85c166bdaf7e5b3291f8f516cf73cf
-SIZE (KDE/Qt/6.6.3/qttranslations-everywhere-src-6.6.3.tar.xz) = 1472412
+TIMESTAMP = 1718777709
+SHA256 (KDE/Qt/6.7.2/qttranslations-everywhere-src-6.7.2.tar.xz) = 9845780b5dc1b7279d57836db51aeaf2e4a1160c42be09750616f39157582ca9
+SIZE (KDE/Qt/6.7.2/qttranslations-everywhere-src-6.7.2.tar.xz) = 1547608
diff --git a/devel/qt6-translations/pkg-plist b/devel/qt6-translations/pkg-plist
index b59afb032346..13bdb38c5227 100644
--- a/devel/qt6-translations/pkg-plist
+++ b/devel/qt6-translations/pkg-plist
@@ -9,6 +9,7 @@
 %%QT_L10NDIR%%/assistant_hr.qm
 %%QT_L10NDIR%%/assistant_hu.qm
 %%QT_L10NDIR%%/assistant_ja.qm
+%%QT_L10NDIR%%/assistant_ka.qm
 %%QT_L10NDIR%%/assistant_ko.qm
 %%QT_L10NDIR%%/assistant_nl.qm
 %%QT_L10NDIR%%/assistant_pl.qm
@@ -32,6 +33,7 @@
 %%QT_L10NDIR%%/designer_hr.qm
 %%QT_L10NDIR%%/designer_hu.qm
 %%QT_L10NDIR%%/designer_ja.qm
+%%QT_L10NDIR%%/designer_ka.qm
 %%QT_L10NDIR%%/designer_ko.qm
 %%QT_L10NDIR%%/designer_nl.qm
 %%QT_L10NDIR%%/designer_pl.qm
@@ -54,6 +56,7 @@
 %%QT_L10NDIR%%/linguist_hu.qm
 %%QT_L10NDIR%%/linguist_it.qm
 %%QT_L10NDIR%%/linguist_ja.qm
+%%QT_L10NDIR%%/linguist_ka.qm
 %%QT_L10NDIR%%/linguist_ko.qm
 %%QT_L10NDIR%%/linguist_nl.qm
 %%QT_L10NDIR%%/linguist_pl.qm
@@ -93,6 +96,7 @@
 %%QT_L10NDIR%%/qt_help_hu.qm
 %%QT_L10NDIR%%/qt_help_it.qm
 %%QT_L10NDIR%%/qt_help_ja.qm
+%%QT_L10NDIR%%/qt_help_ka.qm
 %%QT_L10NDIR%%/qt_help_ko.qm
 %%QT_L10NDIR%%/qt_help_nl.qm
 %%QT_L10NDIR%%/qt_help_nn.qm
@@ -109,6 +113,7 @@
 %%QT_L10NDIR%%/qt_hu.qm
 %%QT_L10NDIR%%/qt_it.qm
 %%QT_L10NDIR%%/qt_ja.qm
+%%QT_L10NDIR%%/qt_ka.qm
 %%QT_L10NDIR%%/qt_ko.qm
 %%QT_L10NDIR%%/qt_lt.qm
 %%QT_L10NDIR%%/qt_lv.qm
@@ -142,6 +147,7 @@
 %%QT_L10NDIR%%/qtbase_hu.qm
 %%QT_L10NDIR%%/qtbase_it.qm
 %%QT_L10NDIR%%/qtbase_ja.qm
+%%QT_L10NDIR%%/qtbase_ka.qm
 %%QT_L10NDIR%%/qtbase_ko.qm
 %%QT_L10NDIR%%/qtbase_lv.qm
 %%QT_L10NDIR%%/qtbase_nl.qm
@@ -162,6 +168,7 @@
 %%QT_L10NDIR%%/qtconnectivity_es.qm
 %%QT_L10NDIR%%/qtconnectivity_hr.qm
 %%QT_L10NDIR%%/qtconnectivity_hu.qm
+%%QT_L10NDIR%%/qtconnectivity_ka.qm
 %%QT_L10NDIR%%/qtconnectivity_ko.qm
 %%QT_L10NDIR%%/qtconnectivity_nl.qm
 %%QT_L10NDIR%%/qtconnectivity_pl.qm
@@ -183,6 +190,7 @@
 %%QT_L10NDIR%%/qtdeclarative_hr.qm
 %%QT_L10NDIR%%/qtdeclarative_hu.qm
 %%QT_L10NDIR%%/qtdeclarative_ja.qm
+%%QT_L10NDIR%%/qtdeclarative_ka.qm
 %%QT_L10NDIR%%/qtdeclarative_ko.qm
 %%QT_L10NDIR%%/qtdeclarative_lv.qm
 %%QT_L10NDIR%%/qtdeclarative_nl.qm
@@ -205,6 +213,7 @@
 %%QT_L10NDIR%%/qtlocation_fr.qm
 %%QT_L10NDIR%%/qtlocation_hr.qm
 %%QT_L10NDIR%%/qtlocation_hu.qm
+%%QT_L10NDIR%%/qtlocation_ka.qm
 %%QT_L10NDIR%%/qtlocation_ko.qm
 %%QT_L10NDIR%%/qtlocation_nl.qm
 %%QT_L10NDIR%%/qtlocation_pl.qm
@@ -228,6 +237,7 @@
 %%QT_L10NDIR%%/qtmultimedia_hu.qm
 %%QT_L10NDIR%%/qtmultimedia_it.qm
 %%QT_L10NDIR%%/qtmultimedia_ja.qm
+%%QT_L10NDIR%%/qtmultimedia_ka.qm
 %%QT_L10NDIR%%/qtmultimedia_ko.qm
 %%QT_L10NDIR%%/qtmultimedia_nl.qm
 %%QT_L10NDIR%%/qtmultimedia_nn.qm
@@ -243,6 +253,7 @@
 %%QT_L10NDIR%%/qtserialport_en.qm
 %%QT_L10NDIR%%/qtserialport_es.qm
 %%QT_L10NDIR%%/qtserialport_ja.qm
+%%QT_L10NDIR%%/qtserialport_ka.qm
 %%QT_L10NDIR%%/qtserialport_ko.qm
 %%QT_L10NDIR%%/qtserialport_pl.qm
 %%QT_L10NDIR%%/qtserialport_ru.qm
@@ -252,6 +263,7 @@
 %%QT_L10NDIR%%/qtwebengine_de.qm
 %%QT_L10NDIR%%/qtwebengine_en.qm
 %%QT_L10NDIR%%/qtwebengine_es.qm
+%%QT_L10NDIR%%/qtwebengine_ka.qm
 %%QT_L10NDIR%%/qtwebengine_ko.qm
 %%QT_L10NDIR%%/qtwebengine_pl.qm
 %%QT_L10NDIR%%/qtwebengine_ru.qm
@@ -263,7 +275,9 @@
 %%QT_L10NDIR%%/qtwebsockets_es.qm
 %%QT_L10NDIR%%/qtwebsockets_fr.qm
 %%QT_L10NDIR%%/qtwebsockets_ja.qm
+%%QT_L10NDIR%%/qtwebsockets_ka.qm
 %%QT_L10NDIR%%/qtwebsockets_ko.qm
 %%QT_L10NDIR%%/qtwebsockets_pl.qm
 %%QT_L10NDIR%%/qtwebsockets_ru.qm
 %%QT_L10NDIR%%/qtwebsockets_uk.qm
+%%QT_L10NDIR%%/qtwebsockets_zh_CN.qm
diff --git a/devel/qt6/Makefile b/devel/qt6/Makefile
index c4e795320e42..ef815c0d2e94 100644
--- a/devel/qt6/Makefile
+++ b/devel/qt6/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	qt6
 DISTVERSION=	${QT6_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index b67b0fbfcc5a..d25d1ea92a39 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qtcreator
-DISTVERSION=	12.0.2
+DISTVERSION=	13.0.1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.GPL3-EXCEPT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
-
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
@@ -30,8 +29,7 @@ USE_QT=		5compat base declarative positioning quick3d quicktimeline \
 		serialport shadertools sqldriver-sqlite svg tools translations webchannel
 
 SHEBANG_GLOB=	*.pl *.py *.sh
-SHEBANG_FILES=	src/libs/qt-breakpad/qtbreakpadsymbols \
-		src/plugins/terminal/tests/* \
+SHEBANG_FILES=	src/plugins/terminal/tests/* \
 		src/plugins/terminal/tests/cursor/* \
 		tests/manual/distribution/elflint
 python_OLD_CMD+="/usr/bin/env python3.10"
@@ -54,16 +52,22 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/src/shared/qbs'
 
 PLIST_SUB=		SHLIB_VER="${PORTVERSION}" \
 			SHLIB_SHVER="${PORTVERSION:C/\..*//}"
+.if defined(WITH_DEBUG)
+PLIST_SUB+=		DEBUG=""
+.else
+PLIST_SUB+=		DEBUG="@comment "
+.endif
 PORTDOCS=		*
 
-OPTIONS_DEFINE=		DOCS EXAMPLES QTWEBENGINE
-OPTIONS_DEFAULT=	DOCS EXAMPLES
+OPTIONS_DEFINE=		DOCS EXAMPLES LIBSECRET QTWEBENGINE
+OPTIONS_DEFAULT=	DOCS EXAMPLES LIBSECRET
 OPTIONS_DEFAULT_amd64=	QTWEBENGINE
 OPTIONS_DEFAULT_i386=	QTWEBENGINE
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install the Qt6 api documentation
 EXAMPLES_DESC=		Install the Qt6 example projects
+LIBSECRET_DESC=		Libsecret keychain support in qtkeychain
 QTWEBENGINE_DESC=	Add dependency on qt6-webengine
 
 DOCS_USE=		QT=doc:run
@@ -71,18 +75,29 @@ DOCS_CMAKE_BOOL=	WITH_DOCS
 
 EXAMPLES_USE=		QT=examples:run
 
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
+LIBSECRET_USES=		gettext-runtime gnome localbase:ldflags
+LIBSECRET_USE=		GNOME=glib20
+LIBSECRET_CMAKE_BOOL=	LIBSECRET_SUPPORT
+
 QTWEBENGINE_USE=	qt=webengine
 QTWEBENGINE_CMAKE_BOOL=	BUILD_HELPVIEWERBACKEND_QTWEBENGINE
 
 # Documentation is excluded from the default build targets.
 do-build-DOCS-on:
-	${CMAKE_BIN} --build ${BUILD_WRKSRC} --target docs
+	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
+		--build ${BUILD_WRKSRC} \
+		--target docs
 
 # This also means separate install steps for documentation.
 do-install-DOCS-on:
-	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} \
-	    --component qch_docs
-	${CMAKE_BIN} --install ${BUILD_WRKSRC} --prefix ${STAGEDIR}${PREFIX} \
-	    --component html_docs
+	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
+		--install ${BUILD_WRKSRC} \
+		--prefix ${STAGEDIR}${PREFIX} \
+		--component qch_docs
+	${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \
+		--install ${BUILD_WRKSRC} \
+		--prefix ${STAGEDIR}${PREFIX} \
+		--component html_docs
 
 .include <bsd.port.mk>
diff --git a/devel/qtcreator/distinfo b/devel/qtcreator/distinfo
index 4776357559d3..fc572e83fadc 100644
--- a/devel/qtcreator/distinfo
+++ b/devel/qtcreator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707326413
-SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-12.0.2.tar.xz) = ace811ac3aee9bfbd1a55eb6cb49479a4823ead6f39f203571e9d77648450381
-SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-12.0.2.tar.xz) = 51028300
+TIMESTAMP = 1715829525
+SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-13.0.1.tar.xz) = 819006d1921f61cc675980bcc9d795a2248cfd796115dad466a4454759dab32e
+SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-13.0.1.tar.xz) = 51891908
diff --git a/devel/qtcreator/pkg-plist b/devel/qtcreator/pkg-plist
index fd3d8a7b9847..fdbc138fb883 100644
--- a/devel/qtcreator/pkg-plist
+++ b/devel/qtcreator/pkg-plist
@@ -18,6 +18,8 @@ lib/qtcreator/libLanguageUtils.so.%%SHLIB_SHVER%%
 lib/qtcreator/libLanguageUtils.so.%%SHLIB_VER%%
 lib/qtcreator/libModeling.so.%%SHLIB_SHVER%%
 lib/qtcreator/libModeling.so.%%SHLIB_VER%%
+lib/qtcreator/libNanotrace.so.%%SHLIB_SHVER%%
+lib/qtcreator/libNanotrace.so.%%SHLIB_VER%%
 lib/qtcreator/libProParser.so.%%SHLIB_SHVER%%
 lib/qtcreator/libProParser.so.%%SHLIB_VER%%
 lib/qtcreator/libQmlDebug.so.%%SHLIB_SHVER%%
@@ -36,6 +38,8 @@ lib/qtcreator/libUtils.so.%%SHLIB_SHVER%%
 lib/qtcreator/libUtils.so.%%SHLIB_VER%%
 lib/qtcreator/libqlitehtml.so.%%SHLIB_SHVER%%
 lib/qtcreator/libqlitehtml.so.%%SHLIB_VER%%
+lib/qtcreator/libqtkeychain.so.%%SHLIB_SHVER%%
+lib/qtcreator/libqtkeychain.so.%%SHLIB_VER%%
 lib/qtcreator/libyaml-cpp.so.%%SHLIB_SHVER%%
 lib/qtcreator/libyaml-cpp.so.%%SHLIB_VER%%
 lib/qtcreator/plugins/libAndroid.so
@@ -68,7 +72,9 @@ lib/qtcreator/plugins/libDebugger.so
 lib/qtcreator/plugins/libDesigner.so
 lib/qtcreator/plugins/libDiffEditor.so
 lib/qtcreator/plugins/libDocker.so
+lib/qtcreator/plugins/libEffectComposer.so
 lib/qtcreator/plugins/libEmacsKeys.so
+lib/qtcreator/plugins/libExtensionManager.so
 lib/qtcreator/plugins/libFakeVim.so
 lib/qtcreator/plugins/libFossil.so
 lib/qtcreator/plugins/libGLSLEditor.so
@@ -104,6 +110,7 @@ lib/qtcreator/plugins/libQmlPreview.so
 lib/qtcreator/plugins/libQmlProfiler.so
 lib/qtcreator/plugins/libQmlProjectManager.so
 lib/qtcreator/plugins/libQnx.so
+lib/qtcreator/plugins/libQtApplicationManagerIntegration.so
 lib/qtcreator/plugins/libQtSupport.so
 lib/qtcreator/plugins/libRemoteLinux.so
 lib/qtcreator/plugins/libResourceEditor.so
@@ -132,6 +139,7 @@ libexec/qtcreator/buildoutputparser
 libexec/qtcreator/cpaster
 libexec/qtcreator/qml2puppet-%%SHLIB_VER%%
 libexec/qtcreator/qtc-askpass
+%%DEBUG%%libexec/qtcreator/qtcreator_crash_handler
 libexec/qtcreator/qtcreator_process_stub
 libexec/qtcreator/qtcreator_processlauncher
 libexec/qtcreator/qtpromaker
@@ -163,6 +171,8 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/changelog/changes-12.0.0.md
 %%DATADIR%%/changelog/changes-12.0.1.md
 %%DATADIR%%/changelog/changes-12.0.2.md
+%%DATADIR%%/changelog/changes-13.0.0.md
+%%DATADIR%%/changelog/changes-13.0.1.md
 %%DATADIR%%/changelog/changes-2.0.0
 %%DATADIR%%/changelog/changes-2.0.1
 %%DATADIR%%/changelog/changes-2.1.0
@@ -297,6 +307,8 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/fonts/SourceCodePro-Bold.ttf
 %%DATADIR%%/fonts/SourceCodePro-BoldIt.ttf
 %%DATADIR%%/fonts/SourceCodePro-It.ttf
+%%DATADIR%%/fonts/SourceCodePro-Medium.ttf
+%%DATADIR%%/fonts/SourceCodePro-MediumIt.ttf
 %%DATADIR%%/fonts/SourceCodePro-Regular.ttf
 %%DATADIR%%/fonts/SourceCodePro.txt
 %%DATADIR%%/generic-highlighter/syntax/alert.xml
@@ -317,18 +329,18 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.GPLv3
 %%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.LGPLv21
 %%DATADIR%%/generic-highlighter/syntax/licenses/LICENSE.LGPLv3
-%%DATADIR%%/generic-highlighter/syntax/makefile.xml
 %%DATADIR%%/generic-highlighter/syntax/markdown.xml
 %%DATADIR%%/generic-highlighter/syntax/modelines.xml
 %%DATADIR%%/generic-highlighter/syntax/perl.xml
 %%DATADIR%%/generic-highlighter/syntax/powershell.xml
-%%DATADIR%%/generic-highlighter/syntax/python.xml
 %%DATADIR%%/generic-highlighter/syntax/qdocconf.xml
 %%DATADIR%%/generic-highlighter/syntax/ruby.xml
 %%DATADIR%%/generic-highlighter/syntax/spdx-comments.xml
+%%DATADIR%%/generic-highlighter/syntax/toml.xml
 %%DATADIR%%/generic-highlighter/syntax/valgrind-suppression.xml
 %%DATADIR%%/generic-highlighter/syntax/xml.xml
 %%DATADIR%%/generic-highlighter/syntax/yacc.xml
+%%DATADIR%%/generic-highlighter/syntax/yaml.xml
 %%DATADIR%%/glsl/glsl_120.frag
 %%DATADIR%%/glsl/glsl_120.vert
 %%DATADIR%%/glsl/glsl_120_common.glsl
@@ -343,6 +355,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/indexer_preincludes/qglobal.h
 %%DATADIR%%/indexer_preincludes/windows.h
 %%DATADIR%%/modeleditor/standard.def
+%%DATADIR%%/package-manager/LICENSE.conan
 %%DATADIR%%/package-manager/auto-setup.cmake
 %%DATADIR%%/package-manager/conan.cmake
 %%DATADIR%%/package-manager/conan_provider.cmake
@@ -383,15 +396,18 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/assetsLibraryQmlSources/NewEffectDialog.qml
 %%DATADIR%%/qmldesigner/assetsLibraryQmlSources/NewFolderDialog.qml
 %%DATADIR%%/qmldesigner/assetsLibraryQmlSources/RenameFolderDialog.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/CollectionDetailsEditDelegate.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/CollectionDetailsToolbar.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/CollectionDetailsView.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/CollectionItem.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/CollectionView.qml
-%%DATADIR%%/qmldesigner/collectionEditorQmlSource/CsvImport.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/EditPropertyDialog.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/IconTextButton.qml
-%%DATADIR%%/qmldesigner/collectionEditorQmlSource/JsonImport.qml
+%%DATADIR%%/qmldesigner/collectionEditorQmlSource/ImportDialog.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/Message.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml
 %%DATADIR%%/qmldesigner/collectionEditorQmlSource/NewCollectionDialog.qml
-%%DATADIR%%/qmldesigner/collectionEditorQmlSource/SingleCollectionView.qml
 %%DATADIR%%/qmldesigner/connectionseditor/BindingsDialog.qml
 %%DATADIR%%/qmldesigner/connectionseditor/BindingsDialogForm.qml
 %%DATADIR%%/qmldesigner/connectionseditor/BindingsListView.qml
@@ -403,7 +419,6 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/connectionseditor/MyListViewDelegate.qml
 %%DATADIR%%/qmldesigner/connectionseditor/MyTreeViewDelegate.qml
 %%DATADIR%%/qmldesigner/connectionseditor/Pill.qml
-%%DATADIR%%/qmldesigner/connectionseditor/PopupDialog.qml
 %%DATADIR%%/qmldesigner/connectionseditor/PopupLabel.qml
 %%DATADIR%%/qmldesigner/connectionseditor/PropertiesDialog.qml
 %%DATADIR%%/qmldesigner/connectionseditor/PropertiesDialogForm.qml
@@ -433,28 +448,31 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/edit3dQmlSource/BakeLightsProgressDialog.qml
 %%DATADIR%%/qmldesigner/edit3dQmlSource/BakeLightsSetupDialog.qml
 %%DATADIR%%/qmldesigner/edit3dQmlSource/SnapConfigurationDialog.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectCompositionNode.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectCompositionNodeUniform.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectMaker.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectMakerPreview.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectMakerTopBar.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectNode.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/EffectNodesComboBox.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/PreviewImagesComboBox.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueBool.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueColor.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueDefine.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueFloat.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueImage.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueInt.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueVec2.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueVec3.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/ValueVec4.qml
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/images/preview0.png
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/images/preview1.png
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/images/preview2.png
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/images/preview3.png
-%%DATADIR%%/qmldesigner/effectMakerQmlSources/images/preview4.png
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/BlurHelper.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectComposer.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectComposerPreview.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectComposerTopBar.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectCompositionNode.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectCompositionNodeUniform.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectNode.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/EffectNodesComboBox.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/PreviewImagesComboBox.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/SaveAsDialog.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/SaveChangesDialog.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueBool.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueColor.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueDefine.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueFloat.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueImage.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueInt.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueVec2.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueVec3.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/ValueVec4.qml
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/images/preview0.png
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/images/preview1.png
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/images/preview2.png
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/images/preview3.png
+%%DATADIR%%/qmldesigner/effectComposerQmlSources/images/preview4.png
 %%DATADIR%%/qmldesigner/feedback/FeedbackPopup.qml
 %%DATADIR%%/qmldesigner/feedback/star_empty.png
 %%DATADIR%%/qmldesigner/feedback/star_empty@2x.png
@@ -548,8 +566,6 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/Vector3dEditorTemplate.template
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/PropertyTemplates/Vector4dEditorTemplate.template
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QML/QtObjectPane.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/Qt5HelperWindow.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/Qt6HelperWindow.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioOutputSpecifics.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/AudioSection.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtMultimedia/MediaPlayerSection.qml
@@ -564,6 +580,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AlignDistributeSection.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedImageSpecifics.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AnimatedSpriteSpecifics.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationSection.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/AnimationTargetSection.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/QtQuick/BorderImageSpecifics.qml
@@ -687,10 +704,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/CheckBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLine.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorLogic.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorPalette.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorPicker.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComboBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentButton.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
@@ -714,7 +728,6 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPropertySpinBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HorizontalScrollBar.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/HueSlider.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconButton.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconIndicator.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/IconLabel.qml
@@ -726,10 +739,8 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LineEdit.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LinkIndicator2D.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ListViewComboBox.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/LuminanceSlider.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MarginSection.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/MultiIconLabel.qml
-%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OpacitySlider.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginIndicator.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml
@@ -774,6 +785,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ButtonRow.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ColorEditor.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ComboBoxInput.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ContextMenu.qml
@@ -781,6 +793,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/DialogButton.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/DialogButtonBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/FilterComboBox.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/IconIndicator.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/Indicator.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/InfinityLoopIndicator.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ItemDelegate.qml
@@ -791,6 +804,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItem.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuItemWithIcon.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/MenuSeparator.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/PopupDialog.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ProgressBar.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RadioButton.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSliderPopup.qml
@@ -816,9 +830,16 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextArea.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TextField.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ToolTip.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/ToolTipArea.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TopLevelComboBox.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TransientScrollBar.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/TranslationIndicator.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorEditorPopup.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorPalette.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/ColorPicker.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/HueSlider.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/LuminanceSlider.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/impl/OpacitySlider.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioControls/qmldir
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ConnectionPopupButtonStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ConnectionPopupControlStyle.qml
@@ -826,6 +847,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ControlStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/DefaultStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/InternalConstants.qml
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/MicroToolbarButtonStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/PrimaryButtonStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/SearchControlStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/StatesControlStyle.qml
@@ -839,6 +861,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/ViewStyle.qml
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
 %%DATADIR%%/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/qmldir
+%%DATADIR%%/qmldesigner/propertyEditorQmlSources/quick.metainfo
 %%DATADIR%%/qmldesigner/qt4mcu/metadata.qml
 %%DATADIR%%/qmldesigner/qt4mcu/qul-14.qml
 %%DATADIR%%/qmldesigner/qt4mcu/qul-17.qml
@@ -1051,11 +1074,15 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/studio_templates/projects/mobile-swipe/wizard.json
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/CMakeLists.importmodule.txt.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl
+%%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/DataStore.qml.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/EventListModel.qml.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/EventListSimulator.qml.tpl
+%%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/JsonData.qml.tpl
+%%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/data.json.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/designer/plugin.metainfo
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/importmodule.qmldir.tpl
+%%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/models.json.tpl
 %%DATADIR%%/qmldesigner/studio_templates/projects/shared-plugin/name/qmldir
 %%DATADIR%%/qmldesigner/textureEditorQmlSource/EmptyTextureEditorPane.qml
 %%DATADIR%%/qmldesigner/textureEditorQmlSource/TextureEditorPane.qml
@@ -1065,6 +1092,84 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmldesigner/toolbar/CrumbleBread.qml
 %%DATADIR%%/qmldesigner/toolbar/Main.qml
 %%DATADIR%%/qmldesigner/toolbar/ToolbarButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/BrandBar.qml
+%%DATADIR%%/qmldesigner/welcomepage/CheckButton.ui.qml
+%%DATADIR%%/qmldesigner/welcomepage/CustomDialog.qml
+%%DATADIR%%/qmldesigner/welcomepage/CustomDialogButtonBox.qml
+%%DATADIR%%/qmldesigner/welcomepage/CustomGrid.qml
+%%DATADIR%%/qmldesigner/welcomepage/CustomScrollBar.qml
+%%DATADIR%%/qmldesigner/welcomepage/CustomScrollView.qml
+%%DATADIR%%/qmldesigner/welcomepage/DialogButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/DownloadButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/DownloadPanel.qml
+%%DATADIR%%/qmldesigner/welcomepage/DownloadProgressBar.qml
+%%DATADIR%%/qmldesigner/welcomepage/FigmaButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/MainGridStack.qml
+%%DATADIR%%/qmldesigner/welcomepage/MainScreen.qml
+%%DATADIR%%/qmldesigner/welcomepage/PushButton.ui.qml
+%%DATADIR%%/qmldesigner/welcomepage/RangeMapper.qml
+%%DATADIR%%/qmldesigner/welcomepage/SocialButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/StringMapper.qml
+%%DATADIR%%/qmldesigner/welcomepage/Tag.qml
+%%DATADIR%%/qmldesigner/welcomepage/TagArea.qml
+%%DATADIR%%/qmldesigner/welcomepage/TestControlPanel.qml
+%%DATADIR%%/qmldesigner/welcomepage/ThumbnailDelegate.qml
+%%DATADIR%%/qmldesigner/welcomepage/TourDialogButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/TourModel.qml
+%%DATADIR%%/qmldesigner/welcomepage/TourProgressBar.qml
+%%DATADIR%%/qmldesigner/welcomepage/TourRestartButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/TourThumbnailDelegate.qml
+%%DATADIR%%/qmldesigner/welcomepage/TwirlButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/WelcomePage.qml
+%%DATADIR%%/qmldesigner/welcomepage/WelcomeScreen.qmlproject
+%%DATADIR%%/qmldesigner/welcomepage/YoutubeButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/fonts/fonts.txt
+%%DATADIR%%/qmldesigner/welcomepage/images/adding-assets.png
+%%DATADIR%%/qmldesigner/welcomepage/images/animation-2d.png
+%%DATADIR%%/qmldesigner/welcomepage/images/border-arc.png
+%%DATADIR%%/qmldesigner/welcomepage/images/complex-shapes.png
+%%DATADIR%%/qmldesigner/welcomepage/images/congratulations.png
+%%DATADIR%%/qmldesigner/welcomepage/images/connecting-components.png
+%%DATADIR%%/qmldesigner/welcomepage/images/ds.png
+%%DATADIR%%/qmldesigner/welcomepage/images/ellipse-pie.png
+%%DATADIR%%/qmldesigner/welcomepage/images/figmaDarkNormal.png
+%%DATADIR%%/qmldesigner/welcomepage/images/figmaHover.png
+%%DATADIR%%/qmldesigner/welcomepage/images/figmaLightNormal.png
+%%DATADIR%%/qmldesigner/welcomepage/images/newThumbnail.png
+%%DATADIR%%/qmldesigner/welcomepage/images/noPreview.png
+%%DATADIR%%/qmldesigner/welcomepage/images/place_holder.png
+%%DATADIR%%/qmldesigner/welcomepage/images/sorting-components.png
+%%DATADIR%%/qmldesigner/welcomepage/images/states.png
+%%DATADIR%%/qmldesigner/welcomepage/images/thumbnailImage.png
+%%DATADIR%%/qmldesigner/welcomepage/images/thumbnail_test.png
+%%DATADIR%%/qmldesigner/welcomepage/images/top-toolbar.png
+%%DATADIR%%/qmldesigner/welcomepage/images/welcome-page.png
+%%DATADIR%%/qmldesigner/welcomepage/images/workspaces.png
+%%DATADIR%%/qmldesigner/welcomepage/images/youtubeDarkHover.png
+%%DATADIR%%/qmldesigner/welcomepage/images/youtubeDarkNormal.png
+%%DATADIR%%/qmldesigner/welcomepage/images/youtubeLightHover.png
+%%DATADIR%%/qmldesigner/welcomepage/images/youtubeLightNormal.png
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/Highlight.ui.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/Slide.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/SlideNavButton.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/SlidePlayer.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/SlideShow.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/StrongHighlight.ui.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/gradientRect.webp
+%%DATADIR%%/qmldesigner/welcomepage/imports/UiTour/qmldir
+%%DATADIR%%/qmldesigner/welcomepage/imports/WelcomeScreen/Constants.qml
+%%DATADIR%%/qmldesigner/welcomepage/imports/WelcomeScreen/designer/plugin.metainfo
+%%DATADIR%%/qmldesigner/welcomepage/imports/WelcomeScreen/qmldir
+%%DATADIR%%/qmldesigner/welcomepage/main.qml
+%%DATADIR%%/qmldesigner/welcomepage/main.qml.qml
+%%DATADIR%%/qmldesigner/welcomepage/mockData/ExampleCheckout/FileDownloader.qml
+%%DATADIR%%/qmldesigner/welcomepage/mockData/ExampleCheckout/FileExtractor.qml
+%%DATADIR%%/qmldesigner/welcomepage/mockData/ExampleCheckout/qmldir
+%%DATADIR%%/qmldesigner/welcomepage/mockData/projectmodel/ProjectModel.qml
+%%DATADIR%%/qmldesigner/welcomepage/mockData/projectmodel/qmldir
+%%DATADIR%%/qmldesigner/welcomepage/mockData/usagestatistics/UsageStatisticModel.qml
+%%DATADIR%%/qmldesigner/welcomepage/mockData/usagestatistics/qmldir
+%%DATADIR%%/qmldesigner/welcomepage/qtquickcontrols2.conf
 %%DATADIR%%/qmldesigner/workspacePresets/Advanced-3D.wrk
 %%DATADIR%%/qmldesigner/workspacePresets/Animation-2D.wrk
 %%DATADIR%%/qmldesigner/workspacePresets/Animation-3D.wrk
@@ -1129,6 +1234,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/qmlicons/Qt/16x16/item-icon16.png
 %%DATADIR%%/qmlicons/QtWebkit/16x16/WebView.png
 %%DATADIR%%/schemes/MS_Visual_C++.kms
+%%DATADIR%%/schemes/MS_Visual_Studio_Code.kms
 %%DATADIR%%/schemes/Xcode.kms
 %%DATADIR%%/snippets/cmake.xml
 %%DATADIR%%/snippets/cpp.xml
@@ -1238,6 +1344,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/templates/wizards/files/testing/wizard.json
 %%DATADIR%%/templates/wizards/files/text/file.txt
 %%DATADIR%%/templates/wizards/files/text/wizard.json
+%%DATADIR%%/templates/wizards/files/translation/wizard.json
 %%DATADIR%%/templates/wizards/global/consoleapplication.png
 %%DATADIR%%/templates/wizards/global/consoleapplication@2x.png
 %%DATADIR%%/templates/wizards/global/guiapplication.png
@@ -1307,6 +1414,7 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/templates/wizards/projects/qtforpythonapplication/qtquickapplication/main.pyproject
 %%DATADIR%%/templates/wizards/projects/qtforpythonapplication/qtquickapplication/main.qml.tpl
 %%DATADIR%%/templates/wizards/projects/qtforpythonapplication/qtquickapplication/wizard.json
+%%DATADIR%%/templates/wizards/projects/qtforpythonapplication/requirements.txt
 %%DATADIR%%/templates/wizards/projects/qtforpythonapplication/widget/main.pyproject
 %%DATADIR%%/templates/wizards/projects/qtforpythonapplication/widget/wizard.json
 %%DATADIR%%/templates/wizards/projects/qtquick2-extension/CMakeLists.6.x.txt
@@ -1378,16 +1486,19 @@ share/metainfo/org.qt-project.qtcreator.appdata.xml
 %%DATADIR%%/templates/wizards/qtcreatorplugin/myplugin.h
 %%DATADIR%%/templates/wizards/qtcreatorplugin/myplugin_global.h
 %%DATADIR%%/templates/wizards/qtcreatorplugin/mypluginconstants.h
+%%DATADIR%%/templates/wizards/qtcreatorplugin/myplugintr.h
 %%DATADIR%%/templates/wizards/qtcreatorplugin/qtcreatorplugin.png
 %%DATADIR%%/templates/wizards/qtcreatorplugin/qtcreatorplugin@2x.png
 %%DATADIR%%/templates/wizards/qtcreatorplugin/wizard.json
 %%DATADIR%%/themes/dark.creatortheme
+%%DATADIR%%/themes/dark.figmatokens
 %%DATADIR%%/themes/default.creatortheme
 %%DATADIR%%/themes/design-light.creatortheme
 %%DATADIR%%/themes/design.creatortheme
 %%DATADIR%%/themes/flat-dark.creatortheme
 %%DATADIR%%/themes/flat-light.creatortheme
 %%DATADIR%%/themes/flat.creatortheme
+%%DATADIR%%/themes/light.figmatokens
 %%DATADIR%%/translations/qtcreator_cs.qm
 %%DATADIR%%/translations/qtcreator_da.qm
 %%DATADIR%%/translations/qtcreator_de.qm
diff --git a/devel/revive/Makefile b/devel/revive/Makefile
index bf771f344f9e..953b783f9c2e 100644
--- a/devel/revive/Makefile
+++ b/devel/revive/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	revive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/root/Makefile b/devel/root/Makefile
index fb7f875369d5..2b0fafa380b7 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	root
-DISTVERSION=	6.30.02
-PORTREVISION=	1
+DISTVERSION=	6.32.00
 CATEGORIES=	devel science math parallel python
 MASTER_SITES=	https://root.cern/download/
 DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
@@ -13,98 +12,231 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL2_1.txt
 
 BUILD_AND_RUN_DEPENDS=	bash:shells/bash \
-			nlohmann-json>=3:devel/nlohmann-json
+		nlohmann-json>=3:devel/nlohmann-json
 BUILD_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
-LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
-		libcurl.so:ftp/curl \
-		libfreetype.so:print/freetype2 \
-		libgsl.so:math/gsl \
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		liblz4.so:archivers/liblz4 \
-		libopenblas.so:math/openblas \
-		libpcre.so:devel/pcre \
-		libtbb.so:devel/onetbb \
-		libvdt.so:math/vdt \
-		libXrdCl.so:databases/xrootd \
+		libpcre2-8.so:devel/pcre2 \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
 
 USES=		cmake compiler:c++17-lang desktop-file-utils \
-		gnome iconv shebangfix ssl
-USE_GNOME=	libxml2
-
-SHEBANG_FILES=	config/rootssh etc/dictpch/makepch.py etc/proof/utils/circle.sh \
-		etc/proof/utils/crypt etc/proof/utils/pps \
-		etc/proof/utils/proofctl.sh etc/proof/utils/proofinstall.sh \
+		iconv shebangfix
+
+SHEBANG_FILES=	main/python/rootbrowse.py \
+		main/python/rootcp.py \
+		main/python/rootdrawtree.py \
+		main/python/rooteventselector.py \
+		main/python/rootls.py \
+		main/python/rootmkdir.py \
+		main/python/rootmv.py \
+		main/python/rootprint.py \
+		main/python/rootrm.py \
+		main/python/rootslimtree.py \
+		config/rootssh \
+		etc/dictpch/makepch.py \
+		etc/proof/utils/circle.sh \
+		etc/proof/utils/crypt \
+		etc/proof/utils/pps \
+		etc/proof/utils/proofctl.sh \
+		etc/proof/utils/proofinstall.sh \
 		etc/pdg_table_update.py
+# add a port-specific shebang to be replaced
+python_OLD_CMD+=	"/usr/bin/env @python@"
 
 # Flags and environment variables for building
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
-CMAKE_ON=	gnuinstall soversion mathmore
-CMAKE_OFF=	builtin_gtest clad
+CMAKE_ON=	builtin_clang builtin_cling builtin_llvm builtin_openui5 gnuinstall \
+		rpath runtime_cxxmodules shared soversion
+CMAKE_OFF=	arrow builtin_afterimage builtin_cfitsio builtin_cppzmq builtin_davix \
+		builtin_fftw3 builtin_freetype builtin_ftgl builtin_gl2ps builtin_glew \
+		builtin_gsl builtin_gtest builtin_lz4 builtin_lzma builtin_nlohmannjson \
+		builtin_openssl builtin_pcre builtin_tbb builtin_unuran builtin_vc builtin_vdt \
+		builtin_veccore builtin_xrootd builtin_xxhash builtin_zeromq builtin_zlib \
+		builtin_zstd cefweb clad cocoa cuda cudnn daos davix dcache fcgi fftw3 gviz \
+		libcxx llvm13_broken_tests macos_native memory_termination minuit2_mpi \
+		minuit2_omp mpi odbc proof pythia8 qt5web qt6web r roofit_multiprocess \
+		shadowpw test_distrdf_dask test_distrdf_pyspark tmva-gpu tmva-rmva tmva-sofie \
+		unfold unuran uring vc veccore vecgeom win_broken_tests winrtdebug
 CONFIGURE_WRKSRC?=	${WRKDIR}/.build
 MAKE_ENV+=		ROOTSYS=${CONFIGURE_WRKSRC}
 
 # Port build options; DOCS also on by default
-OPTIONS_DEFINE=	DOCS MYSQL PGSQL PYROOT ROOT7 SQLITE X11
-OPTIONS_DEFAULT=	PYROOT ROOT7 X11
+# See https://root.cern/install/build_from_source/#all-build-options
+OPTIONS_DEFINE=	DOCS ASIMAGE DATAFRAME FITS FORTRAN GDML HTTP IMT MATHMORE MYSQL \
+		OPENGL PGSQL PYROOT ROOFIT ROOT7 SPECTRUM SQLITE SSL TMLP TMVAML VDT WEBGUI \
+		X11 XML XROOTD
+OPTIONS_DEFAULT=	ASIMAGE DATAFRAME FITS GDML HTTP IMT MATHMORE OPENGL PYROOT \
+		ROOFIT ROOT7 SPECTRUM SSL TMLP TMVAML VDT WEBGUI X11 XML XROOTD
 OPTIONS_SUB=	yes
 
-# Option: MYSQL
-MYSQL_DESC=		Enable MySQL bindings
-MYSQL_USES=		mysql
+ASIMAGE_CMAKE_BOOL=	asimage
+ASIMAGE_DESC=		Enable support for image processing via libAfterImage
+ASIMAGE_IMPLIES=	X11
+ASIMAGE_LIB_DEPENDS=	libAfterImage.so:graphics/libafterimage \
+		libgif.so:graphics/giflib \
+		libpng16.so:graphics/png \
+		libtiff.so:graphics/tiff
+ASIMAGE_USES=	gettext-runtime gnome jpeg
+ASIMAGE_USE=	gnome=cairo,gdkpixbuf2,glib20,librsvg2
+
+# TODO: clad can only be included in ROOT's configure stage
+# with network access, however, a port of clad is available -- patch
+#CLAD_CMAKE_BOOL=	clad
+#CLAD_DESC=		Build clad, the cling automatic differentiation plugin (requires network)
+#CLAD_LIB_DEPENDS=	libclad.so:math/clad
+
+DATAFRAME_CMAKE_BOOL=	dataframe
+DATAFRAME_DESC=			Enable ROOT RDataFrame
+
+# TODO: davix only comes with pkgconfig file on fbsd, while
+# ROOT's configure stage relies on find_package() -- patch
+#DAVIX_CMAKE_BOOL=	davix
+#DAVIX_DESC=		Enable support for Davix (HTTP/WebDAV access)
+#DAVIX_IMPLIES=	libuuid xml2 openssl
+#DAVIX_LIB_DEPENDS=	libdavix.so:www/davix
+
+FITS_CMAKE_BOOL=	fitsio
+FITS_DESC=		Enable support for reading FITS images
+FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
+		libcurl.so:ftp/curl
+
+FORTRAN_CMAKE_BOOL=	fortran
+FORTRAN_DESC=		Build Fortran components of ROOT
+FORTRAN_USES=		fortran
+
+GDML_CMAKE_BOOL=	gdml
+GDML_DESC=		Enable support for GDML (Geometry Description Markup Language)
+
+HTTP_CMAKE_BOOL=	http
+HTTP_DESC=		Enable support for HTTP server
+HTTP_IMPLIES=	WEBGUI
+
+IMT_CMAKE_BOOL=	imt
+IMT_DESC=		Enable support for implicit multi-threading via Intel® Thread Building Blocks (TBB)
+IMT_LIB_DEPENDS=	libtbb.so:devel/onetbb
+
+MATHMORE_CMAKE_BOOL=	mathmore
+MATHMORE_DESC=		Build libMathMore extended math library
+MATHMORE_LIB_DEPENDS=	libgsl.so:math/gsl
+
 MYSQL_CMAKE_BOOL=	mysql
+MYSQL_DESC=		Enable support for MySQL databases
+MYSQL_LIB_DEPENDS=	libunwind.so:devel/libunwind
+MYSQL_USES=		mysql ssl
+
+OPENGL_CMAKE_BOOL=	opengl
+OPENGL_DESC=		Enable support for OpenGL
+OPENGL_IMPLIES=	X11
+OPENGL_LIB_DEPENDS=	libftgl.so:graphics/ftgl \
+		libgl2ps.so:print/gl2ps
+OPENGL_USES=	gl
+OPENGL_USE=		gl=glew,glu,opengl
 
-# Option: PGSQL
-PGSQL_DESC=		Enable PostgreSQL bindings
-PGSQL_USES=		pgsql:13+
 PGSQL_CMAKE_BOOL=	pgsql
+PGSQL_DESC=		Enable support for PostgreSQL
+PGSQL_USES=		pgsql:13+
 
-#Option: PYROOT
+PYROOT_CMAKE_BOOL=	pyroot tmva-pymva
 PYROOT_DESC=		Enable bindings between Python and C++ with PyROOT
 PYROOT_BUILD_DEPENDS=	${PYNUMPY}
 PYROOT_USES=		python:3.9+,build,run
 PYROOT_USES_OFF=	python:3.9+,build
-PYROOT_CMAKE_BOOL=	pyroot
 
-# Option: ROOT7
-ROOT7_DESC=		Enable supplementary preview features of ROOT version 7
+ROOFIT_CMAKE_BOOL=	roofit
+ROOFIT_DESC=		Build the advanced fitting package RooFit, and RooStats for statistical tests
+
 ROOT7_CMAKE_BOOL=	root7
+ROOT7_DESC=		Build ROOT 7 components of ROOT
+
+SPECTRUM_CMAKE_BOOL=	spectrum
+SPECTRUM_DESC=		Enable support for TSpectrum
 
-# Option: SQLITE
-SQLITE_DESC=		Enable SQLite bindings
-SQLITE_USES=		sqlite
 SQLITE_CMAKE_BOOL=	sqlite
+SQLITE_DESC=		Enable support for SQLite
+SQLITE_USES=		sqlite
+
+SSL_CMAKE_BOOL=	ssl
+SSL_DESC=		Enable support for SSL encryption via OpenSSL
+SSL_USES=		ssl
+
+TMLP_CMAKE_BOOL=	mlp
+TMLP_DESC=		Enable support for TMultilayerPerceptron classes' federation
+TMLP_IMPLIES=	TMVAML
+
+TMVAML_CMAKE_BOOL=	tmva tmva-cpu
+TMVAML_DESC=		Build TMVA multi variate analysis library, including TMVA with CPU support for deep learning
+TMVAML_IMPLIES=	IMT
+TMVAML_LIB_DEPENDS=	libopenblas.so:math/openblas
+
+VDT_CMAKE_BOOL=	vdt
+VDT_DESC=		Enable support for VDT (fast and vectorisable mathematical functions)
+VDT_LIB_DEPENDS=	libvdt.so:math/vdt
 
-# Option: X11
-X11_DESC=		Enable interfacing with X11 graphics system
-X11_LIB_DEPENDS=	libAfterImage.so:graphics/libafterimage \
-			libftgl.so:graphics/ftgl \
-			libgif.so:graphics/giflib \
-			libgl2ps.so:print/gl2ps \
-			libpng16.so:graphics/png \
-			libtiff.so:graphics/tiff
-X11_USES=		gettext-runtime gl jpeg xorg
-X11_USE=		gl=glew,glu,opengl gnome=cairo,gdkpixbuf2,glib20,librsvg2 \
-			xorg=ice,sm,x11,xau,xaw,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xfont,xfont2,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xv,xxf86vm
-X11_CMAKE_BOOL=		x11
+WEBGUI_CMAKE_BOOL=	webgui
+WEBGUI_DESC=		Build Web-based UI components of ROOT
+WEBGUI_IMPLIES=	HTTP
+
+X11_CMAKE_BOOL=	x11
+X11_DESC=		Enable support for X11/Xft
+X11_USES=		xorg
+X11_USE=		xorg=ice,sm,x11,xau,xaw,xcb,xcomposite,xcursor,xdamage,xdmcp,xext \
+		xorg=xfixes,xfont,xfont2,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender \
+		xorg=xres,xscrnsaver,xt,xv,xxf86vm
+
+XML_CMAKE_BOOL=		xml
+XML_DESC=		Enable support for XML
+XML_USES=		gnome
+XML_USE=		gnome=libxml2
+
+XROOTD_CMAKE_BOOL=	xrootd
+XROOTD_DESC=		Enable support for XRootD file server and client
+XROOTD_LIB_DEPENDS=	libXrdCl.so:databases/xrootd
 
 .include <bsd.port.options.mk>
 
-PLIST_SUB+=	SHLIB_SHVER="${DISTVERSION:R}" \
+ROOT_CLANG_VER=	16
+
+PLIST_SUB+=	PYVER="${PYTHON_VER:S/./_/}" \
+		ROOT_CLANG_VER="${ROOT_CLANG_VER}" \
+		SHLIB_SHVER="${DISTVERSION:R}" \
 		SHLIB_VER="${DISTVERSION}"
 
-# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
-.if ${ARCH} == "aarch64"
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
+# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few headers are only installed on aarch64
+.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
+PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64=""
 .else
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
+PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment "
+.endif
+
+# atexit-like commands need 'throw()' specifier on 15aarch64
+.if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64" && ${OSVERSION} > 1499999
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64
+.endif
+
+# std_config.pcm exclusive to FreeBSD 14.0
+.if ${OPSYS} == FreeBSD && ${OSREL} == 14.0
+PLIST_SUB+=	ONLY_INSTALLED_ON_FBSD140=""
+.else
+PLIST_SUB+=	ONLY_INSTALLED_ON_FBSD140="@comment "
+.endif
+
+# Port patch removes implicit use of system's module.modulemap and applies
+# explicit use of the same module.modulemap, with modifications, provided
+# by the port
+eq_OSREL=	${OSREL}
+.if ${OPSYS} == FreeBSD && ${OSREL} == 14.1
+# module.modulemap identical on 14.1 and 15.0
+eq_OSREL=	15.0
 .endif
+post-patch:
+	${CP} \
+  ${PATCHDIR}/interpreter-cling-include-cling-std__fbsd${eq_OSREL}.modulemap \
+  ${WRKSRC}/interpreter/cling/include/cling/std_fbsd.modulemap
 
-# The following two files should not be staged. This happens even when PYROOT option is OFF.
+# Files in lib/root/__pycache__ have links into WRKDIR and should not be staged. This happens even when PYROOT option is OFF.
 post-install:
-	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.pyc
-	${RM} ${STAGEDIR}${PREFIX}/lib/root/__pycache__/cmdLineUtils.cpython-39.opt-1.pyc
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/root/__pycache__
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/root/__pycache__
 
 .include <bsd.port.mk>
diff --git a/devel/root/distinfo b/devel/root/distinfo
index e5b446340bd5..dd18fca4aee3 100644
--- a/devel/root/distinfo
+++ b/devel/root/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702064317
-SHA256 (root_v6.30.02.source.tar.gz) = 7965a456d1ad1ee0d5fe4769bf5a8fec291af684ed93db0f3080a9c362435183
-SIZE (root_v6.30.02.source.tar.gz) = 184758362
+TIMESTAMP = 1717088990
+SHA256 (root_v6.32.00.source.tar.gz) = 12f203681a59041c474ce9523761e6f0e8861b3bee78df5f799a8db55189e5d2
+SIZE (root_v6.32.00.source.tar.gz) = 192888872
diff --git a/devel/root/files/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64 b/devel/root/files/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64
new file mode 100644
index 000000000000..e5457155a021
--- /dev/null
+++ b/devel/root/files/extra-patch-interpreter_cling_lib_Interpreter_Interpreter.cpp.15aarch64
@@ -0,0 +1,11 @@
+--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig	2024-05-30 18:23:48 UTC
++++ interpreter/cling/lib/Interpreter/Interpreter.cpp
+@@ -499,7 +499,7 @@ namespace cling {
+ 
+     // C++ 11 at_quick_exit, std::at_quick_exit
+     if (LangOpts.CPlusPlus && LangOpts.CPlusPlus11) {
+-      Strm << LinkageCxx << " int at_quick_exit(void(*f)()) " << Attr;
++      Strm << LinkageCxx << " int at_quick_exit(void(*f)()) throw () " << Attr;
+       if (EmitDefinitions)
+         Strm
+           << " { return __cxa_atexit((void(*)(void*))f, 0, __dso_handle); }\n";
diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd13.2.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd13.2.modulemap
new file mode 100644
index 000000000000..e2b828a18fe1
--- /dev/null
+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd13.2.modulemap
@@ -0,0 +1,1097 @@
+// FreeBSD port maintainer note:
+// Taken from
+// https://github.com/freebsd/freebsd-src/blob/release/13.2.0/contrib/llvm-project/libcxx/include/module.modulemap
+// on 2024-05-15.
+
+// define the module for __config outside of the top level 'std' module
+// since __config may be included from C headers which may create an
+// include cycle.
+module std_config [system] [extern_c] {
+  textual header "__config"
+  textual header "__config_site"
+}
+
+module std [system] {
+  export std_config
+  // FIXME: The standard does not require that each of these submodules
+  // re-exports its imported modules. We should provide an alternative form of
+  // export that issues a warning if a name from the submodule is used, and
+  // use that to provide a 'strict mode' for libc++.
+
+  // Deprecated C-compatibility headers. These can all be included from within
+  // an 'extern "C"' context.
+  module depr [extern_c] {
+    // <assert.h> provided by C library.
+    module ctype_h {
+      header "ctype.h"
+      export *
+    }
+    module errno_h {
+      header "errno.h"
+      export *
+    }
+    module fenv_h {
+      header "fenv.h"
+      export *
+    }
+    // <float.h> provided by compiler or C library.
+    module inttypes_h {
+      header "inttypes.h"
+      export stdint_h
+      export *
+    }
+    // <iso646.h> provided by compiler.
+    // <limits.h> provided by compiler or C library.
+    module locale_h {
+      header "locale.h"
+      export *
+    }
+    module math_h {
+      header "math.h"
+      export *
+    }
+    module setjmp_h {
+      header "setjmp.h"
+      export *
+    }
+    // FIXME: <stdalign.h> is missing.
+    // <signal.h> provided by C library.
+    // <stdarg.h> provided by compiler.
+    // <stdbool.h> provided by compiler.
+    module stddef_h {
+      // <stddef.h>'s __need_* macros require textual inclusion.
+      textual header "stddef.h"
+    }
+    module stdint_h {
+      header "stdint.h"
+      export *
+      // FIXME: This module only exists on OS X and for some reason the
+      // wildcard above doesn't export it.
+      export Darwin.C.stdint
+    }
+    module stdio_h {
+      // <stdio.h>'s __need_* macros require textual inclusion.
+      textual header "stdio.h"
+      export *
+      export Darwin.C.stdio
+    }
+    module stdlib_h {
+      // <stdlib.h>'s __need_* macros require textual inclusion.
+      textual header "stdlib.h"
+      export *
+    }
+    module string_h {
+      header "string.h"
+      export *
+    }
+    // FIXME: <uchar.h> is missing.
+    // <time.h> provided by C library.
+    module wchar_h {
+      // <wchar.h>'s __need_* macros require textual inclusion.
+      textual header "wchar.h"
+      export *
+    }
+    module wctype_h {
+      header "wctype.h"
+      export *
+    }
+  }
+
+  // <complex.h> and <tgmath.h> are not C headers in any real sense, do not
+  // allow their use in extern "C" contexts.
+  module complex_h {
+    header "complex.h"
+    export ccomplex
+    export *
+  }
+  module tgmath_h {
+    header "tgmath.h"
+    export ccomplex
+    export cmath
+    export *
+  }
+
+  // C compatibility headers.
+  module compat {
+    module cassert {
+      // <cassert>'s use of NDEBUG requires textual inclusion.
+      textual header "cassert"
+    }
+    module ccomplex {
+      header "ccomplex"
+      export complex
+      export *
+    }
+    module cctype {
+      header "cctype"
+      export *
+    }
+    module cerrno {
+      header "cerrno"
+      export *
+    }
+    module cfenv {
+      header "cfenv"
+      export *
+    }
+    module cfloat {
+      header "cfloat"
+      export *
+    }
+    module cinttypes {
+      header "cinttypes"
+      export cstdint
+      export *
+    }
+    module ciso646 {
+      header "ciso646"
+      export *
+    }
+    module climits {
+      header "climits"
+      export *
+    }
+    module clocale {
+      header "clocale"
+      export *
+    }
+    module cmath {
+      header "cmath"
+      export *
+    }
+    module csetjmp {
+      header "csetjmp"
+      export *
+    }
+    module csignal {
+      header "csignal"
+      export *
+    }
+    // FIXME: <cstdalign> is missing.
+    module cstdarg {
+      header "cstdarg"
+      export *
+    }
+    module cstdbool {
+      header "cstdbool"
+      export *
+    }
+    module cstddef {
+      header "cstddef"
+      export *
+    }
+    module cstdint {
+      header "cstdint"
+      export depr.stdint_h
+      export *
+    }
+    module cstdio {
+      header "cstdio"
+      export *
+    }
+    module cstdlib {
+      header "cstdlib"
+      export *
+    }
+    module cstring {
+      header "cstring"
+      export *
+    }
+    module ctgmath {
+      header "ctgmath"
+      export ccomplex
+      export cmath
+      export *
+    }
+    module ctime {
+      header "ctime"
+      export *
+    }
+    // FIXME: <cuchar> is missing.
+    module cwchar {
+      header "cwchar"
+      export depr.stdio_h
+      export *
+    }
+    module cwctype {
+      header "cwctype"
+      export *
+    }
+  }
+
+  module algorithm {
+    header "algorithm"
+    export initializer_list
+    export *
+
+    module __algorithm {
+      module adjacent_find            { private header "__algorithm/adjacent_find.h" }
+      module all_of                   { private header "__algorithm/all_of.h" }
+      module any_of                   { private header "__algorithm/any_of.h" }
+      module binary_search            { private header "__algorithm/binary_search.h" }
+      module clamp                    { private header "__algorithm/clamp.h" }
+      module comp                     { private header "__algorithm/comp.h" }
+      module comp_ref_type            { private header "__algorithm/comp_ref_type.h" }
+      module copy                     { private header "__algorithm/copy.h" }
+      module copy_backward            { private header "__algorithm/copy_backward.h" }
+      module copy_if                  { private header "__algorithm/copy_if.h" }
+      module copy_n                   { private header "__algorithm/copy_n.h" }
+      module count                    { private header "__algorithm/count.h" }
+      module count_if                 { private header "__algorithm/count_if.h" }
+      module equal                    { private header "__algorithm/equal.h" }
+      module equal_range              { private header "__algorithm/equal_range.h" }
+      module fill                     { private header "__algorithm/fill.h" }
+      module fill_n                   { private header "__algorithm/fill_n.h" }
+      module find                     { private header "__algorithm/find.h" }
+      module find_end                 { private header "__algorithm/find_end.h" }
+      module find_first_of            { private header "__algorithm/find_first_of.h" }
+      module find_if                  { private header "__algorithm/find_if.h" }
+      module find_if_not              { private header "__algorithm/find_if_not.h" }
+      module for_each                 { private header "__algorithm/for_each.h" }
+      module for_each_n               { private header "__algorithm/for_each_n.h" }
+      module generate                 { private header "__algorithm/generate.h" }
+      module generate_n               { private header "__algorithm/generate_n.h" }
+      module half_positive            { private header "__algorithm/half_positive.h" }
+      module in_in_out_result         { private header "__algorithm/in_in_out_result.h" }
+      module in_in_result             { private header "__algorithm/in_in_result.h" }
+      module in_out_result            { private header "__algorithm/in_out_result.h" }
+      module includes                 { private header "__algorithm/includes.h" }
+      module inplace_merge            { private header "__algorithm/inplace_merge.h" }
+      module is_heap                  { private header "__algorithm/is_heap.h" }
+      module is_heap_until            { private header "__algorithm/is_heap_until.h" }
+      module is_partitioned           { private header "__algorithm/is_partitioned.h" }
+      module is_permutation           { private header "__algorithm/is_permutation.h" }
+      module is_sorted                { private header "__algorithm/is_sorted.h" }
+      module is_sorted_until          { private header "__algorithm/is_sorted_until.h" }
+      module iter_swap                { private header "__algorithm/iter_swap.h" }
+      module lexicographical_compare  { private header "__algorithm/lexicographical_compare.h" }
+      module lower_bound              { private header "__algorithm/lower_bound.h" }
+      module make_heap                { private header "__algorithm/make_heap.h" }
+      module max                      { private header "__algorithm/max.h" }
+      module max_element              { private header "__algorithm/max_element.h" }
+      module merge                    { private header "__algorithm/merge.h" }
+      module min                      { private header "__algorithm/min.h" }
+      module min_element              { private header "__algorithm/min_element.h" }
+      module minmax                   { private header "__algorithm/minmax.h" }
+      module minmax_element           { private header "__algorithm/minmax_element.h" }
+      module mismatch                 { private header "__algorithm/mismatch.h" }
+      module move                     { private header "__algorithm/move.h" }
+      module move_backward            { private header "__algorithm/move_backward.h" }
+      module next_permutation         { private header "__algorithm/next_permutation.h" }
+      module none_of                  { private header "__algorithm/none_of.h" }
+      module nth_element              { private header "__algorithm/nth_element.h" }
+      module partial_sort             { private header "__algorithm/partial_sort.h" }
+      module partial_sort_copy        { private header "__algorithm/partial_sort_copy.h" }
+      module partition                { private header "__algorithm/partition.h" }
+      module partition_copy           { private header "__algorithm/partition_copy.h" }
+      module partition_point          { private header "__algorithm/partition_point.h" }
+      module pop_heap                 { private header "__algorithm/pop_heap.h" }
+      module prev_permutation         { private header "__algorithm/prev_permutation.h" }
+      module push_heap                { private header "__algorithm/push_heap.h" }
+      module remove                   { private header "__algorithm/remove.h" }
+      module remove_copy              { private header "__algorithm/remove_copy.h" }
+      module remove_copy_if           { private header "__algorithm/remove_copy_if.h" }
+      module remove_if                { private header "__algorithm/remove_if.h" }
+      module replace                  { private header "__algorithm/replace.h" }
+      module replace_copy             { private header "__algorithm/replace_copy.h" }
+      module replace_copy_if          { private header "__algorithm/replace_copy_if.h" }
+      module replace_if               { private header "__algorithm/replace_if.h" }
+      module reverse                  { private header "__algorithm/reverse.h" }
+      module reverse_copy             { private header "__algorithm/reverse_copy.h" }
+      module rotate                   { private header "__algorithm/rotate.h" }
+      module rotate_copy              { private header "__algorithm/rotate_copy.h" }
+      module sample                   { private header "__algorithm/sample.h" }
+      module search                   { private header "__algorithm/search.h" }
+      module search_n                 { private header "__algorithm/search_n.h" }
+      module set_difference           { private header "__algorithm/set_difference.h" }
+      module set_intersection         { private header "__algorithm/set_intersection.h" }
+      module set_symmetric_difference { private header "__algorithm/set_symmetric_difference.h" }
+      module set_union                { private header "__algorithm/set_union.h" }
+      module shift_left               { private header "__algorithm/shift_left.h" }
+      module shift_right              { private header "__algorithm/shift_right.h" }
+      module shuffle                  { private header "__algorithm/shuffle.h" }
+      module sift_down                { private header "__algorithm/sift_down.h" }
+      module sort                     { private header "__algorithm/sort.h" }
+      module sort_heap                { private header "__algorithm/sort_heap.h" }
+      module stable_partition         { private header "__algorithm/stable_partition.h" }
+      module stable_sort              { private header "__algorithm/stable_sort.h" }
+      module swap_ranges              { private header "__algorithm/swap_ranges.h" }
+      module transform                { private header "__algorithm/transform.h" }
+      module unique                   { private header "__algorithm/unique.h" }
+      module unique_copy              { private header "__algorithm/unique_copy.h" }
+      module unwrap_iter              { private header "__algorithm/unwrap_iter.h" }
+      module upper_bound              { private header "__algorithm/upper_bound.h" }
+    }
+  }
+  module any {
+    header "any"
+    export *
+  }
+  module array {
+    header "array"
+    export initializer_list
+    export *
+  }
+  module atomic {
+    header "atomic"
+    export *
+  }
+  module barrier {
+    requires cplusplus14
+    header "barrier"
+    export *
+  }
+  module bit {
+    header "bit"
+    export *
+
+    module __bit {
+      module bit_cast { private header "__bit/bit_cast.h" }
+      module byteswap { private header "__bit/byteswap.h" }
+    }
+  }
+  module bitset {
+    header "bitset"
+    export string
+    export iosfwd
+    export *
+  }
+  // No submodule for cassert. It fundamentally needs repeated, textual inclusion.
+  module charconv {
+    header "charconv"
+    export *
+
+    module __charconv {
+      module chars_format      { private header "__charconv/chars_format.h" }
+      module from_chars_result { private header "__charconv/from_chars_result.h" }
+      module to_chars_result   { private header "__charconv/to_chars_result.h" }
+    }
+
+  }
+  module chrono {
+    header "chrono"
+    export *
+
+    module __chrono {
+      module calendar              { private header "__chrono/calendar.h" }
+      module convert_to_timespec   { private header "__chrono/convert_to_timespec.h" }
+      module duration              { private header "__chrono/duration.h" }
+      module file_clock            { private header "__chrono/file_clock.h" }
+      module high_resolution_clock { private header "__chrono/high_resolution_clock.h" }
+      module steady_clock          { private header "__chrono/steady_clock.h" }
+      module system_clock          { private header "__chrono/system_clock.h" }
+      module time_point            { private header "__chrono/time_point.h" }
+    }
+  }
+  module codecvt {
+    header "codecvt"
+    export *
+  }
+  module compare {
+    header "compare"
+    export *
+
+    module __compare {
+      module common_comparison_category     { private header "__compare/common_comparison_category.h" }
+      module compare_partial_order_fallback { private header "__compare/compare_partial_order_fallback.h" }
+      module compare_strong_order_fallback  { private header "__compare/compare_strong_order_fallback.h" }
+      module compare_three_way              { private header "__compare/compare_three_way.h" }
+      module compare_three_way_result       { private header "__compare/compare_three_way_result.h" }
+      module compare_weak_order_fallback    { private header "__compare/compare_weak_order_fallback.h" }
+      module is_eq                          { private header "__compare/is_eq.h" }
+      module ordering                       { private header "__compare/ordering.h" }
+      module partial_order                  { private header "__compare/partial_order.h" }
+      module strong_order                   { private header "__compare/strong_order.h" }
+      module synth_three_way                { private header "__compare/synth_three_way.h" }
+      module three_way_comparable           { private header "__compare/three_way_comparable.h" }
+      module weak_order                     { private header "__compare/weak_order.h" }
+    }
+  }
+  module complex {
+    header "complex"
+    export *
+  }
+  module concepts {
+    header "concepts"
+    export *
+
+    module __concepts {
+      module arithmetic                 { private header "__concepts/arithmetic.h" }
+      module assignable                 { private header "__concepts/assignable.h" }
+      module boolean_testable           { private header "__concepts/boolean_testable.h" }
+      module class_or_enum              { private header "__concepts/class_or_enum.h" }
+      module common_reference_with      { private header "__concepts/common_reference_with.h" }
+      module common_with                { private header "__concepts/common_with.h" }
+      module constructible              { private header "__concepts/constructible.h" }
+      module convertible_to             { private header "__concepts/convertible_to.h" }
+      module copyable                   { private header "__concepts/copyable.h" }
+      module derived_from               { private header "__concepts/derived_from.h" }
+      module destructible               { private header "__concepts/destructible.h" }
+      module different_from             { private header "__concepts/different_from.h" }
+      module equality_comparable        { private header "__concepts/equality_comparable.h" }
+      module invocable                  { private header "__concepts/invocable.h" }
+      module movable                    { private header "__concepts/movable.h" }
+      module predicate                  { private header "__concepts/predicate.h" }
+      module regular                    { private header "__concepts/regular.h" }
+      module relation                   { private header "__concepts/relation.h" }
+      module same_as                    { private header "__concepts/same_as.h" }
+      module semiregular                { private header "__concepts/semiregular.h" }
+      module swappable                  { private header "__concepts/swappable.h" }
+      module totally_ordered            { private header "__concepts/totally_ordered.h" }
+    }
+  }
+  module condition_variable {
+    header "condition_variable"
+    export *
+  }
+  module coroutine {
+    requires coroutines
+    header "coroutine"
+    export compare
+    export *
+
+    module __coroutine {
+      module coroutine_handle           { private header "__coroutine/coroutine_handle.h" }
+      module coroutine_traits           { private header "__coroutine/coroutine_traits.h" }
+      module noop_coroutine_handle      { private header "__coroutine/noop_coroutine_handle.h" }
+      module trivial_awaitables         { private header "__coroutine/trivial_awaitables.h" }
+    }
+  }
+  module deque {
+    header "deque"
+    export initializer_list
+    export *
+  }
+  module exception {
+    header "exception"
+    export *
+  }
+  module execution {
+    header "execution"
+    export *
+  }
+  module filesystem {
+    header "filesystem"
+    export *
+
+    module __filesystem {
+      module copy_options                 { private header "__filesystem/copy_options.h" }
+      module directory_entry              { private header "__filesystem/directory_entry.h" }
+      module directory_iterator           { private header "__filesystem/directory_iterator.h" }
+      module directory_options            { private header "__filesystem/directory_options.h" }
+      module file_status                  { private header "__filesystem/file_status.h" }
+      module file_time_type               { private header "__filesystem/file_time_type.h" }
+      module file_type                    { private header "__filesystem/file_type.h" }
+      module filesystem_error             { private header "__filesystem/filesystem_error.h" }
+      module operations                   { private header "__filesystem/operations.h" }
+      module path                         { private header "__filesystem/path.h" }
+      module path_iterator                { private header "__filesystem/path_iterator.h" }
+      module perm_options                 { private header "__filesystem/perm_options.h" }
+      module perms                        { private header "__filesystem/perms.h" }
+      module recursive_directory_iterator { private header "__filesystem/recursive_directory_iterator.h" }
+      module space_info                   { private header "__filesystem/space_info.h" }
+      module u8path                       { private header "__filesystem/u8path.h" }
+    }
+  }
+  module format {
+    header "format"
+    export *
+
+    module __format {
+      module format_arg               { private header "__format/format_arg.h" }
+      module format_args              { private header "__format/format_args.h" }
+      module format_context {
+        private header "__format/format_context.h"
+        export optional
+        export locale
+      }
+      module format_error             { private header "__format/format_error.h" }
+      module format_fwd               { private header "__format/format_fwd.h" }
+      module format_parse_context     { private header "__format/format_parse_context.h" }
+      module format_string            { private header "__format/format_string.h" }
+      module format_to_n_result       { private header "__format/format_to_n_result.h" }
+      module formatter                { private header "__format/formatter.h" }
+      module formatter_bool           { private header "__format/formatter_bool.h" }
+      module formatter_char           { private header "__format/formatter_char.h" }
+      module formatter_floating_point { private header "__format/formatter_floating_point.h" }
+      module formatter_integer        { private header "__format/formatter_integer.h" }
+      module formatter_integral       { private header "__format/formatter_integral.h" }
+      module formatter_pointer        { private header "__format/formatter_pointer.h" }
+      module formatter_string         { private header "__format/formatter_string.h" }
+      module parser_std_format_spec   { private header "__format/parser_std_format_spec.h" }
+    }
+  }
+  module forward_list {
+    header "forward_list"
+    export initializer_list
+    export *
+  }
+  module fstream {
+    header "fstream"
+    export *
+  }
+  module functional {
+    header "functional"
+    export *
+
+    module __functional {
+      module binary_function            { private header "__functional/binary_function.h" }
+      module binary_negate              { private header "__functional/binary_negate.h" }
+      module bind                       { private header "__functional/bind.h" }
+      module bind_back                  { private header "__functional/bind_back.h" }
+      module bind_front                 { private header "__functional/bind_front.h" }
+      module binder1st                  { private header "__functional/binder1st.h" }
+      module binder2nd                  { private header "__functional/binder2nd.h" }
+      module compose                    { private header "__functional/compose.h" }
+      module default_searcher           { private header "__functional/default_searcher.h" }
+      module function                   { private header "__functional/function.h" }
+      module hash                       { private header "__functional/hash.h" }
+      module identity                   { private header "__functional/identity.h" }
+      module invoke                     { private header "__functional/invoke.h" }
+      module is_transparent             { private header "__functional/is_transparent.h" }
+      module mem_fn                     { private header "__functional/mem_fn.h" }
+      module mem_fun_ref                { private header "__functional/mem_fun_ref.h" }
+      module not_fn                     { private header "__functional/not_fn.h" }
+      module operations                 { private header "__functional/operations.h" }
+      module perfect_forward            { private header "__functional/perfect_forward.h" }
+      module pointer_to_binary_function { private header "__functional/pointer_to_binary_function.h" }
+      module pointer_to_unary_function  { private header "__functional/pointer_to_unary_function.h" }
+      module ranges_operations          { private header "__functional/ranges_operations.h" }
+      module reference_wrapper          { private header "__functional/reference_wrapper.h" }
+      module unary_function             { private header "__functional/unary_function.h" }
+      module unary_negate               { private header "__functional/unary_negate.h" }
+      module unwrap_ref                 { private header "__functional/unwrap_ref.h" }
+      module weak_result_type           { private header "__functional/weak_result_type.h" }
+    }
+  }
+  module future {
+    header "future"
+    export *
+  }
+  module initializer_list {
+    header "initializer_list"
+    export *
+  }
+  module iomanip {
+    header "iomanip"
+    export *
+  }
+  module ios {
+    header "ios"
+    export iosfwd
+    export *
+  }
+  module iosfwd {
+    header "iosfwd"
+    export *
+  }
+  module iostream {
+    header "iostream"
+    export ios
+    export streambuf
+    export istream
+    export ostream
+    export *
+  }
+  module istream {
+    header "istream"
+    // FIXME: should re-export ios, streambuf?
+    export *
+  }
+  module iterator {
+    header "iterator"
+    export *
+
+    module __iterator {
+      module access                { private header "__iterator/access.h" }
+      module advance               { private header "__iterator/advance.h" }
+      module back_insert_iterator  { private header "__iterator/back_insert_iterator.h" }
+      module common_iterator       { private header "__iterator/common_iterator.h" }
+      module concepts              { private header "__iterator/concepts.h" }
+      module counted_iterator      { private header "__iterator/counted_iterator.h" }
+      module data                  { private header "__iterator/data.h" }
+      module default_sentinel      { private header "__iterator/default_sentinel.h" }
+      module distance              { private header "__iterator/distance.h" }
+      module empty                 { private header "__iterator/empty.h" }
+      module erase_if_container    { private header "__iterator/erase_if_container.h" }
+      module front_insert_iterator { private header "__iterator/front_insert_iterator.h" }
+      module incrementable_traits  { private header "__iterator/incrementable_traits.h" }
+      module indirectly_comparable { private header "__iterator/indirectly_comparable.h" }
+      module insert_iterator       { private header "__iterator/insert_iterator.h" }
+      module istream_iterator      { private header "__iterator/istream_iterator.h" }
+      module istreambuf_iterator   { private header "__iterator/istreambuf_iterator.h" }
+      module iter_move             { private header "__iterator/iter_move.h" }
+      module iter_swap             { private header "__iterator/iter_swap.h" }
+      module iterator              { private header "__iterator/iterator.h" }
+      module iterator_traits       { private header "__iterator/iterator_traits.h" }
+      module move_iterator         { private header "__iterator/move_iterator.h" }
+      module next                  { private header "__iterator/next.h" }
+      module ostream_iterator      { private header "__iterator/ostream_iterator.h" }
+      module ostreambuf_iterator   { private header "__iterator/ostreambuf_iterator.h" }
+      module prev                  { private header "__iterator/prev.h" }
+      module projected             { private header "__iterator/projected.h" }
+      module readable_traits       { private header "__iterator/readable_traits.h" }
+      module reverse_access        { private header "__iterator/reverse_access.h" }
+      module reverse_iterator      { private header "__iterator/reverse_iterator.h" }
+      module size                  { private header "__iterator/size.h" }
+      module unreachable_sentinel  { private header "__iterator/unreachable_sentinel.h" }
+      module wrap_iter             { private header "__iterator/wrap_iter.h" }
+    }
+  }
+  module latch {
+    requires cplusplus14
+    header "latch"
+    export *
+  }
+  module limits {
+    header "limits"
+    export *
+  }
+  module list {
+    header "list"
+    export initializer_list
+    export *
+  }
+  module locale {
+    header "locale"
+    export *
+  }
+  module map {
+    header "map"
+    export initializer_list
+    export *
+  }
+  module memory {
+    header "memory"
+    export *
+
+    module __memory {
+      module addressof                       { private header "__memory/addressof.h" }
+      module allocation_guard                { private header "__memory/allocation_guard.h" }
+      module allocator                       { private header "__memory/allocator.h" }
+      module allocator_arg_t                 { private header "__memory/allocator_arg_t.h" }
+      module allocator_traits                { private header "__memory/allocator_traits.h" }
+      module auto_ptr                        { private header "__memory/auto_ptr.h" }
+      module compressed_pair                 { private header "__memory/compressed_pair.h" }
+      module concepts                        { private header "__memory/concepts.h" }
+      module construct_at                    { private header "__memory/construct_at.h" }
+      module pointer_traits                  { private header "__memory/pointer_traits.h" }
+      module ranges_construct_at             { private header "__memory/ranges_construct_at.h" }
+      module ranges_uninitialized_algorithms { private header "__memory/ranges_uninitialized_algorithms.h" }
+      module raw_storage_iterator            { private header "__memory/raw_storage_iterator.h" }
+      module shared_ptr                      { private header "__memory/shared_ptr.h" }
+      module temporary_buffer                { private header "__memory/temporary_buffer.h" }
+      module uninitialized_algorithms        { private header "__memory/uninitialized_algorithms.h" }
+      module unique_ptr                      { private header "__memory/unique_ptr.h" }
+      module uses_allocator                  { private header "__memory/uses_allocator.h" }
+      module voidify                         { private header "__memory/voidify.h" }
+    }
+  }
+  module mutex {
+    header "mutex"
+    export *
+  }
+  module new {
+    header "new"
+    export *
+  }
+  module numbers {
+    header "numbers"
+    export *
+  }
+  module numeric {
+    header "numeric"
+    export *
+
+    module __numeric {
+      module accumulate               { private header "__numeric/accumulate.h" }
+      module adjacent_difference      { private header "__numeric/adjacent_difference.h" }
+      module exclusive_scan           { private header "__numeric/exclusive_scan.h" }
+      module gcd_lcm                  { private header "__numeric/gcd_lcm.h" }
+      module inclusive_scan           { private header "__numeric/inclusive_scan.h" }
+      module inner_product            { private header "__numeric/inner_product.h" }
+      module iota                     { private header "__numeric/iota.h" }
+      module midpoint                 { private header "__numeric/midpoint.h" }
+      module partial_sum              { private header "__numeric/partial_sum.h" }
+      module reduce                   { private header "__numeric/reduce.h" }
+      module transform_exclusive_scan { private header "__numeric/transform_exclusive_scan.h" }
+      module transform_inclusive_scan { private header "__numeric/transform_inclusive_scan.h" }
+      module transform_reduce         { private header "__numeric/transform_reduce.h" }
+    }
+  }
+  module optional {
+    header "optional"
+    export *
+  }
+  module ostream {
+    header "ostream"
+    // FIXME: should re-export ios, streambuf?
+    export *
+  }
+  module queue {
+    header "queue"
+    export initializer_list
+    export *
+  }
+  module random {
+    header "random"
+    export initializer_list
+    export *
+
+    module __random {
+      module bernoulli_distribution          { private header "__random/bernoulli_distribution.h" }
+      module binomial_distribution           { private header "__random/binomial_distribution.h" }
+      module cauchy_distribution             { private header "__random/cauchy_distribution.h" }
+      module chi_squared_distribution        { private header "__random/chi_squared_distribution.h" }
+      module clamp_to_integral               { private header "__random/clamp_to_integral.h" }
+      module default_random_engine           { private header "__random/default_random_engine.h" }
+      module discard_block_engine            { private header "__random/discard_block_engine.h" }
+      module discrete_distribution           { private header "__random/discrete_distribution.h" }
+      module exponential_distribution        { private header "__random/exponential_distribution.h" }
+      module extreme_value_distribution      { private header "__random/extreme_value_distribution.h" }
+      module fisher_f_distribution           { private header "__random/fisher_f_distribution.h" }
+      module gamma_distribution              { private header "__random/gamma_distribution.h" }
+      module generate_canonical              { private header "__random/generate_canonical.h" }
+      module geometric_distribution          { private header "__random/geometric_distribution.h" }
+      module independent_bits_engine         { private header "__random/independent_bits_engine.h" }
+      module is_seed_sequence                { private header "__random/is_seed_sequence.h" }
+      module knuth_b                         { private header "__random/knuth_b.h" }
+      module linear_congruential_engine      { private header "__random/linear_congruential_engine.h" }
+      module log2                            { private header "__random/log2.h" }
+      module lognormal_distribution          { private header "__random/lognormal_distribution.h" }
+      module mersenne_twister_engine         { private header "__random/mersenne_twister_engine.h" }
+      module negative_binomial_distribution  { private header "__random/negative_binomial_distribution.h" }
+      module normal_distribution             { private header "__random/normal_distribution.h" }
+      module piecewise_constant_distribution { private header "__random/piecewise_constant_distribution.h" }
+      module piecewise_linear_distribution   { private header "__random/piecewise_linear_distribution.h" }
+      module poisson_distribution            { private header "__random/poisson_distribution.h" }
+      module random_device                   { private header "__random/random_device.h" }
+      module ranlux                          { private header "__random/ranlux.h" }
+      module seed_seq                        { private header "__random/seed_seq.h" }
+      module shuffle_order_engine            { private header "__random/shuffle_order_engine.h" }
+      module student_t_distribution          { private header "__random/student_t_distribution.h" }
+      module subtract_with_carry_engine      { private header "__random/subtract_with_carry_engine.h" }
+      module uniform_int_distribution        { private header "__random/uniform_int_distribution.h" }
+      module uniform_random_bit_generator    { private header "__random/uniform_random_bit_generator.h" }
+      module uniform_real_distribution       { private header "__random/uniform_real_distribution.h" }
+      module weibull_distribution            { private header "__random/weibull_distribution.h" }
+    }
+  }
+  module ranges {
+    header "ranges"
+    export compare
+    export initializer_list
+    export iterator
+    export *
+
+    module __ranges {
+      module access                 { private header "__ranges/access.h" }
+      module all                    {
+        private header "__ranges/all.h"
+        export functional.__functional.compose
+        export functional.__functional.perfect_forward
+      }
+      module common_view            { private header "__ranges/common_view.h" }
+      module concepts               { private header "__ranges/concepts.h" }
+      module copyable_box           { private header "__ranges/copyable_box.h" }
+      module counted                {
+        private header "__ranges/counted.h"
+        export span
+      }
+      module dangling               { private header "__ranges/dangling.h" }
+      module data                   { private header "__ranges/data.h" }
+      module drop_view              { private header "__ranges/drop_view.h" }
+      module empty                  { private header "__ranges/empty.h" }
+      module empty_view             { private header "__ranges/empty_view.h" }
+      module enable_borrowed_range  { private header "__ranges/enable_borrowed_range.h" }
+      module enable_view            { private header "__ranges/enable_view.h" }
+      module iota_view              { private header "__ranges/iota_view.h" }
+      module join_view              { private header "__ranges/join_view.h" }
+      module non_propagating_cache  { private header "__ranges/non_propagating_cache.h" }
+      module owning_view            { private header "__ranges/owning_view.h" }
+      module range_adaptor          { private header "__ranges/range_adaptor.h" }
+      module ref_view               { private header "__ranges/ref_view.h" }
+      module reverse_view           { private header "__ranges/reverse_view.h" }
+      module single_view            { private header "__ranges/single_view.h" }
+      module size                   { private header "__ranges/size.h" }
+      module subrange               { private header "__ranges/subrange.h" }
+      module take_view              { private header "__ranges/take_view.h" }
+      module transform_view         {
+        private header "__ranges/transform_view.h"
+        export functional.__functional.bind_back
+        export functional.__functional.perfect_forward
+      }
+      module view_interface         { private header "__ranges/view_interface.h" }
+      module views                  { private header "__ranges/views.h" }
+    }
+  }
+  module ratio {
+    header "ratio"
+    export *
+  }
+  module regex {
+    header "regex"
+    export initializer_list
+    export *
+  }
+  module scoped_allocator {
+    header "scoped_allocator"
+    export *
+  }
+  module semaphore {
+    requires cplusplus14
+    header "semaphore"
+    export *
+  }
+  module set {
+    header "set"
+    export initializer_list
+    export *
+  }
+  module shared_mutex {
+    header "shared_mutex"
+    export version
+  }
+  module span {
+    header "span"
+    export ranges.__ranges.enable_borrowed_range
+    export version
+  }
+  module sstream {
+    header "sstream"
+    // FIXME: should re-export istream, ostream, ios, streambuf, string?
+    export *
+  }
+  module stack {
+    header "stack"
+    export initializer_list
+    export *
+  }
+  module stdexcept {
+    header "stdexcept"
+    export *
+  }
+  module streambuf {
+    header "streambuf"
+    export *
+  }
+  module string {
+    header "string"
+    export initializer_list
+    export string_view
+    export __string
+    export *
+  }
+  module string_view {
+    header "string_view"
+    export initializer_list
+    export __string
+    export *
+  }
+  module strstream {
+    header "strstream"
+    export *
+  }
+  module system_error {
+    header "system_error"
+    export *
+  }
+  module thread {
+    header "thread"
+    export *
+
+    module __thread {
+      module poll_with_backoff    { private header "__thread/poll_with_backoff.h" }
+      module timed_backoff_policy { private header "__thread/timed_backoff_policy.h" }
+    }
+  }
+  module tuple {
+    header "tuple"
+    export *
+  }
+  module type_traits {
+    header "type_traits"
+    export functional.__functional.unwrap_ref
+    export *
+  }
+  module typeindex {
+    header "typeindex"
+    export *
+  }
+  module typeinfo {
+    header "typeinfo"
+    export *
+  }
+  module unordered_map {
+    header "unordered_map"
+    export initializer_list
+    export *
+  }
+  module unordered_set {
+    header "unordered_set"
+    export initializer_list
+    export *
+  }
+  module utility {
+    header "utility"
+    export initializer_list
+    export *
+
+    module __utility {
+      module as_const            { private header "__utility/as_const.h" }
+      module auto_cast           { private header "__utility/auto_cast.h" }
+      module cmp                 { private header "__utility/cmp.h" }
+      module declval             { private header "__utility/declval.h" }
+      module exchange            { private header "__utility/exchange.h" }
+      module forward             { private header "__utility/forward.h" }
+      module in_place            { private header "__utility/in_place.h" }
+      module integer_sequence    { private header "__utility/integer_sequence.h" }
+      module move                { private header "__utility/move.h" }
+      module pair                { private header "__utility/pair.h" }
+      module piecewise_construct { private header "__utility/piecewise_construct.h" }
+      module priority_tag        { private header "__utility/priority_tag.h" }
+      module rel_ops             { private header "__utility/rel_ops.h" }
+      module swap                { private header "__utility/swap.h" }
+      module to_underlying       { private header "__utility/to_underlying.h" }
+      module transaction         { private header "__utility/transaction.h" }
+    }
+  }
+  module valarray {
+    header "valarray"
+    export initializer_list
+    export *
+  }
+  module variant {
+    header "variant"
+    export *
+
+    module __variant {
+      module monostate { private header "__variant/monostate.h" }
+    }
+  }
+  module vector {
+    header "vector"
+    export initializer_list
+    export *
+  }
+  module version {
+    header "version"
+    export *
+  }
+
+  // __config not modularised due to a bug in Clang
+  // FIXME: These should be private.
+  module __availability      { private header "__availability"      export * }
+  module __bit_reference     { private header "__bit_reference"     export * }
+  module __bits              { private header "__bits"              export * }
+  module __debug             {         header "__debug"             export * }
+  module __errc              { private header "__errc"              export * }
+  module __hash_table        {         header "__hash_table"        export * }
+  module __locale            { private header "__locale"            export * }
+  module __mbstate_t         { private header "__mbstate_t.h"       export * }
+  module __mutex_base        { private header "__mutex_base"        export * }
+  module __node_handle       { private header "__node_handle"       export * }
+  module __nullptr           {         header "__nullptr"           export * }
+  module __split_buffer      { private header "__split_buffer"      export * }
+  module __std_stream        { private header "__std_stream"        export * }
+  module __string            { private header "__string"            export * }
+  module __threading_support {         header "__threading_support" export * }
+  module __tree              {         header "__tree"              export * }
+  module __tuple             { private header "__tuple"             export * }
+  module __undef_macros      {         header "__undef_macros"      export * }
+
+  module experimental {
+    requires cplusplus11
+
+    module algorithm {
+      header "experimental/algorithm"
+      export *
+    }
+     module coroutine {
+      requires coroutines
+      header "experimental/coroutine"
+      export *
+    }
+    module deque {
+      header "experimental/deque"
+      export *
+    }
+    module filesystem {
+      header "experimental/filesystem"
+      export *
+    }
+    module forward_list {
+      header "experimental/forward_list"
+      export *
+    }
+    module functional {
+      header "experimental/functional"
+      export *
+    }
+    module iterator {
+      header "experimental/iterator"
+      export *
+    }
+    module list {
+      header "experimental/list"
+      export *
+    }
+    module map {
+      header "experimental/map"
+      export *
+    }
+    module memory_resource {
+      header "experimental/memory_resource"
+      export *
+    }
+    module propagate_const {
+      header "experimental/propagate_const"
+      export *
+    }
+    module regex {
+      header "experimental/regex"
+      export *
+    }
+    module simd {
+      header "experimental/simd"
+      export *
+    }
+    module set {
+      header "experimental/set"
+      export *
+    }
+    module span {
+      header "span"
+      export *
+    }
+    module string {
+      header "experimental/string"
+      export *
+    }
+    module type_traits {
+      header "experimental/type_traits"
+      export *
+    }
+    module unordered_map {
+      header "experimental/unordered_map"
+      export *
+    }
+    module unordered_set {
+      header "experimental/unordered_set"
+      export *
+    }
+    module utility {
+      header "experimental/utility"
+      export *
+    }
+    module vector {
+      header "experimental/vector"
+      export *
+    }
+    // FIXME these should be private
+    module __memory {
+      header "experimental/__memory"
+      export *
+    }
+  } // end experimental
+}
diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd13.3.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd13.3.modulemap
new file mode 100644
index 000000000000..38fc15d823de
--- /dev/null
+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd13.3.modulemap
@@ -0,0 +1,2072 @@
+// FreeBSD port maintainer note:
+// Taken from
+// https://github.com/freebsd/freebsd-src/blob/release/13.3.0/lib/libc%2B%2B/module.modulemap
+// on 2024-05-15.
+// Outer "module std [system] { }" block has been added.
+// Lines 611-614 of this file have been commented out to fix build on FreeBSD 13.3.
+
+// Main C++ standard library interfaces
+module std [system] {
+  export *
+
+  module std_algorithm [system] {
+    header "algorithm"
+    export *
+  }
+  module std_any [system] {
+    header "any"
+    export *
+  }
+  module std_array [system] {
+    header "array"
+    export *
+  }
+  module std_atomic [system] {
+    header "atomic"
+    export *
+  }
+  module std_barrier [system] {
+    header "barrier"
+    export *
+  }
+  module std_bit [system] {
+    header "bit"
+    export *
+  }
+  module std_bitset [system] {
+    header "bitset"
+    export *
+  }
+  module std_charconv [system] {
+    header "charconv"
+    export *
+  }
+  module std_chrono [system] {
+    header "chrono"
+    export *
+  }
+  module std_codecvt [system] {
+    header "codecvt"
+    export *
+  }
+  module std_compare [system] {
+    header "compare"
+    export *
+  }
+  module std_complex [system] {
+    header "complex"
+    export *
+  }
+  module std_concepts [system] {
+    header "concepts"
+    export *
+  }
+  module std_condition_variable [system] {
+    header "condition_variable"
+    export *
+  }
+  module std_coroutine [system] {
+    header "coroutine"
+    export *
+  }
+  module std_deque [system] {
+    header "deque"
+    export *
+  }
+  module std_exception [system] {
+    header "exception"
+    export *
+  }
+  module std_execution [system] {
+    header "execution"
+    export *
+  }
+  module std_expected [system] {
+    header "expected"
+    export *
+  }
+  module std_filesystem [system] {
+    header "filesystem"
+    export *
+  }
+  module std_format [system] {
+    header "format"
+    export *
+  }
+  module std_forward_list [system] {
+    header "forward_list"
+    export *
+  }
+  module std_fstream [system] {
+    header "fstream"
+    export *
+  }
+  module std_functional [system] {
+    header "functional"
+    export *
+  }
+  module std_future [system] {
+    header "future"
+    export *
+  }
+  module std_initializer_list [system] {
+    header "initializer_list"
+    export *
+  }
+  module std_iomanip [system] {
+    header "iomanip"
+    export *
+  }
+  module std_ios [system] {
+    header "ios"
+    export *
+  }
+  module std_iosfwd [system] {
+    header "iosfwd"
+    export *
+  }
+  module std_iostream [system] {
+    header "iostream"
+    export *
+  }
+  module std_istream [system] {
+    header "istream"
+    export *
+  }
+  module std_iterator [system] {
+    header "iterator"
+    export *
+  }
+  module std_latch [system] {
+    header "latch"
+    export *
+  }
+  module std_limits [system] {
+    header "limits"
+    export *
+  }
+  module std_list [system] {
+    header "list"
+    export *
+  }
+  module std_locale [system] {
+    header "locale"
+    export *
+  }
+  module std_map [system] {
+    header "map"
+    export *
+  }
+  module std_mdspan [system] {
+    header "mdspan"
+    export *
+  }
+  module std_memory [system] {
+    header "memory"
+    export *
+  }
+  module std_memory_resource [system] {
+    header "memory_resource"
+    export *
+  }
+  module std_mutex [system] {
+    header "mutex"
+    export *
+  }
+  module std_new [system] {
+    header "new"
+    export *
+  }
+  module std_numbers [system] {
+    header "numbers"
+    export *
+  }
+  module std_numeric [system] {
+    header "numeric"
+    export *
+  }
+  module std_optional [system] {
+    header "optional"
+    export *
+  }
+  module std_ostream [system] {
+    header "ostream"
+    export *
+  }
+  module std_print [system] {
+    header "print"
+    export *
+  }
+  module std_queue [system] {
+    header "queue"
+    export *
+  }
+  module std_random [system] {
+    header "random"
+    export *
+  }
+  module std_ranges [system] {
+    header "ranges"
+    export *
+  }
+  module std_ratio [system] {
+    header "ratio"
+    export *
+  }
+  module std_regex [system] {
+    header "regex"
+    export *
+  }
+  module std_scoped_allocator [system] {
+    header "scoped_allocator"
+    export *
+  }
+  module std_semaphore [system] {
+    header "semaphore"
+    export *
+  }
+  module std_set [system] {
+    header "set"
+    export *
+  }
+  module std_shared_mutex [system] {
+    header "shared_mutex"
+    export std_version
+  }
+  module std_source_location [system] {
+    header "source_location"
+    export *
+  }
+  module std_span [system] {
+    header "span"
+    export std_private_ranges_enable_borrowed_range
+    export std_version
+    export std_private_span_span_fwd
+  }
+  module std_sstream [system] {
+    header "sstream"
+    export *
+  }
+  module std_stack [system] {
+    header "stack"
+    export *
+  }
+  module std_stdexcept [system] {
+    header "stdexcept"
+    export *
+  }
+  module std_stop_token {
+    header "stop_token"
+    export *
+  }
+  module std_streambuf [system] {
+    header "streambuf"
+    export *
+  }
+  module std_string [system] {
+    header "string"
+    export *
+  }
+  module std_string_view [system] {
+    header "string_view"
+    export *
+  }
+  module std_strstream [system] {
+    header "strstream"
+    export *
+  }
+  module std_system_error [system] {
+    header "system_error"
+    export *
+  }
+  module std_thread [system] {
+    header "thread"
+    export *
+  }
+  module std_tuple [system] {
+    header "tuple"
+    export *
+  }
+  module std_type_traits [system] {
+    header "type_traits"
+    export *
+  }
+  module std_typeindex [system] {
+    header "typeindex"
+    export *
+  }
+  module std_typeinfo [system] {
+    header "typeinfo"
+    export *
+  }
+  module std_unordered_map [system] {
+    header "unordered_map"
+    export *
+  }
+  module std_unordered_set [system] {
+    header "unordered_set"
+    export *
+  }
+  module std_utility [system] {
+    header "utility"
+    export *
+  }
+  module std_valarray [system] {
+    header "valarray"
+    export *
+  }
+  module std_variant [system] {
+    header "variant"
+    export *
+  }
+  module std_vector [system] {
+    header "vector"
+    export *
+  }
+  module std_version [system] {
+    header "version"
+    export *
+  }
+
+  // C standard library interface wrappers
+  module std_cassert [system] {
+    // <cassert>'s use of NDEBUG requires textual inclusion.
+    textual header "cassert"
+  }
+  module std_ccomplex [system] {
+    header "ccomplex"
+    export *
+  }
+  module std_cctype [system] {
+    header "cctype"
+    export *
+  }
+  module std_cerrno [system] {
+    header "cerrno"
+    export *
+  }
+  module std_cfenv [system] {
+    header "cfenv"
+    export *
+  }
+  module std_cfloat [system] {
+    header "cfloat"
+    export *
+  }
+  module std_cinttypes [system] {
+    header "cinttypes"
+    export *
+  }
+  module std_ciso646 [system] {
+    header "ciso646"
+    export *
+  }
+  module std_climits [system] {
+    header "climits"
+    export *
+  }
+  module std_clocale [system] {
+    header "clocale"
+    export *
+  }
+  module std_cmath [system] {
+    header "cmath"
+    export *
+  }
+  module std_csetjmp [system] {
+    header "csetjmp"
+    export *
+  }
+  module std_csignal [system] {
+    header "csignal"
+    export *
+  }
+  // FIXME: <cstdalign> is missing.
+  module std_cstdarg [system] {
+    header "cstdarg"
+    export *
+  }
+  module std_cstdbool [system] {
+    header "cstdbool"
+    export *
+  }
+  module std_cstddef [system] {
+    header "cstddef"
+    export *
+  }
+  module std_cstdint [system] {
+    header "cstdint"
+    export *
+  }
+  module std_cstdio [system] {
+    header "cstdio"
+    export *
+  }
+  module std_cstdlib [system] {
+    header "cstdlib"
+    export *
+  }
+  module std_cstring [system] {
+    header "cstring"
+    export *
+  }
+  module std_ctgmath [system] {
+    header "ctgmath"
+    export *
+  }
+  module std_ctime [system] {
+    header "ctime"
+    export *
+  }
+  module std_cuchar [system] {
+    header "cuchar"
+    export *
+  }
+  module std_cwchar [system] {
+    header "cwchar"
+    export *
+  }
+  module std_cwctype [system] {
+    header "cwctype"
+    export *
+  }
+
+  // C standard library interfaces augmented/replaced in C++
+  // <assert.h> provided by C library.
+  module std_complex_h [system] {
+    header "complex.h"
+    export *
+  }
+  module std_ctype_h [system] {
+    header "ctype.h"
+    export *
+  }
+  module std_errno_h [system] {
+    header "errno.h"
+    export *
+  }
+  module std_fenv_h [system] {
+    header "fenv.h"
+    export *
+  }
+  module std_float_h [system] {
+    header "float.h"
+    export *
+  }
+  module std_inttypes_h [system] {
+    header "inttypes.h"
+    export *
+  }
+  // <iso646.h> provided by compiler.
+  module std_limits_h [system] {
+    header "limits.h"
+    export *
+  }
+  module std_locale_h [system] {
+    header "locale.h"
+    export *
+  }
+  module std_math_h [system] {
+    header "math.h"
+    export *
+  }
+  module std_setjmp_h [system] {
+    header "setjmp.h"
+    export *
+  }
+  // <signal.h> provided by C library.
+  // FIXME: <stdalign.h> is missing.
+  // <stdarg.h> provided by compiler.
+  module std_stdatomic_h [system] {
+    header "stdatomic.h"
+    export *
+  }
+  module std_stdbool_h [system] {
+    // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
+    textual header "stdbool.h"
+    export *
+  }
+  module std_stddef_h [system] {
+    // <stddef.h>'s __need_* macros require textual inclusion.
+    textual header "stddef.h"
+    export *
+  }
+  module std_stdint_h [system] {
+    header "stdint.h"
+    export *
+  }
+  module std_stdio_h [system] {
+    // <stdio.h>'s __need_* macros require textual inclusion.
+    textual header "stdio.h"
+    export *
+  }
+  module std_stdlib_h [system] {
+    // <stdlib.h>'s __need_* macros require textual inclusion.
+    textual header "stdlib.h"
+    export *
+  }
+  module std_string_h [system] {
+    header "string.h"
+    export *
+  }
+  module std_tgmath_h [system] {
+    header "tgmath.h"
+    export *
+  }
+  module std_uchar_h [system] {
+    header "uchar.h"
+    export *
+  }
+  // <time.h> provided by C library.
+  module std_wchar_h [system] {
+    // <wchar.h>'s __need_* macros require textual inclusion.
+    textual header "wchar.h"
+    export *
+  }
+  module std_wctype_h [system] {
+    header "wctype.h"
+    export *
+  }
+
+  // Experimental C++ standard library interfaces
+  module std_experimental [system] {
+    module deque {
+      header "experimental/deque"
+      export *
+    }
+    module forward_list {
+      header "experimental/forward_list"
+      export *
+    }
+    module iterator {
+      header "experimental/iterator"
+      export *
+    }
+    module list {
+      header "experimental/list"
+      export *
+    }
+    module map {
+      header "experimental/map"
+      export *
+    }
+    module memory_resource {
+      header "experimental/memory_resource"
+      export *
+    }
+    module propagate_const {
+      header "experimental/propagate_const"
+      export *
+    }
+    module regex {
+      
+      header "experimental/regex"
+      export *
+    }
+    module simd {
+      header "experimental/simd"
+      export *
+    }
+    module set {
+      header "experimental/set"
+      export *
+    }
+    module string {
+      header "experimental/string"
+      export *
+    }
+    module type_traits {
+      header "experimental/type_traits"
+      export *
+    }
+    module unordered_map {
+      header "experimental/unordered_map"
+      export *
+    }
+    module unordered_set {
+      header "experimental/unordered_set"
+      export *
+    }
+    module utility {
+      header "experimental/utility"
+      export *
+    }
+    module vector {
+      header "experimental/vector"
+      export *
+    }
+    module __config {
+      private textual header "experimental/__config"
+      export *
+    }
+    // FIXME these should be private
+    module __memory {
+      header "experimental/__memory"
+      export *
+    }
+  }
+
+  // Convenience method to get all of the above modules in a single import statement.
+  // Importing only the needed modules is likely to be more performant.
+  // module std [system] {
+  //   header "__std_clang_module"
+  //   export *
+  // }
+
+  // Implementation detail headers that are private to libc++. These modules
+  // must not be directly imported.
+  module std_private_assert            [system] {
+    header "__assert"
+    export *
+  }
+  module std_private_availability      [system] {
+    header "__availability"
+    export *
+  }
+  module std_private_bit_reference     [system] {
+    header "__bit_reference"
+    export *
+  }
+  module std_private_config            [system] {
+    textual header "__config"
+    export *
+  }
+  module std_private_hash_table        [system] {
+    header "__hash_table"
+    export *
+  }
+  module std_private_locale            [system] {
+    header "__locale"
+    export *
+  }
+  module std_private_mbstate_t         [system] {
+    header "__mbstate_t.h"
+    export *
+  }
+  module std_private_node_handle       [system] {
+    header "__node_handle"
+    export *
+  }
+  module std_private_split_buffer      [system] {
+    header "__split_buffer"
+    export *
+  }
+  module std_private_std_mbstate_t     [system] {
+    header "__std_mbstate_t.h"
+    export *
+  }
+  module std_private_threading_support [system] {
+    header "__threading_support"
+    export *
+  }
+  module std_private_tree              [system] {
+    header "__tree"
+    export *
+  }
+  module std_private_undef_macros      [system] {
+    textual header "__undef_macros"
+    export *
+  }
+  module std_private_verbose_abort     [system] {
+    header "__verbose_abort"
+    export *
+  }
+
+  module std_private_algorithm_adjacent_find                               [system] { header "__algorithm/adjacent_find.h" }
+  module std_private_algorithm_all_of                                      [system] { header "__algorithm/all_of.h" }
+  module std_private_algorithm_any_of                                      [system] { header "__algorithm/any_of.h" }
+  module std_private_algorithm_binary_search                               [system] { header "__algorithm/binary_search.h" }
+  module std_private_algorithm_clamp                                       [system] { header "__algorithm/clamp.h" }
+  module std_private_algorithm_comp                                        [system] { header "__algorithm/comp.h" }
+  module std_private_algorithm_comp_ref_type                               [system] { header "__algorithm/comp_ref_type.h" }
+  module std_private_algorithm_copy                                        [system] {
+    header "__algorithm/copy.h"
+    export std_private_algorithm_copy_move_common
+  }
+  module std_private_algorithm_copy_backward                               [system] { header "__algorithm/copy_backward.h" }
+  module std_private_algorithm_copy_if                                     [system] { header "__algorithm/copy_if.h" }
+  module std_private_algorithm_copy_move_common                            [system] {
+    header "__algorithm/copy_move_common.h"
+    export std_private_type_traits_is_trivially_copyable
+  }
+  module std_private_algorithm_copy_n                                      [system] { header "__algorithm/copy_n.h" }
+  module std_private_algorithm_count                                       [system] { header "__algorithm/count.h" }
+  module std_private_algorithm_count_if                                    [system] { header "__algorithm/count_if.h" }
+  module std_private_algorithm_equal                                       [system] { header "__algorithm/equal.h" }
+  module std_private_algorithm_equal_range                                 [system] { header "__algorithm/equal_range.h" }
+  module std_private_algorithm_fill                                        [system] { header "__algorithm/fill.h" }
+  module std_private_algorithm_fill_n                                      [system] { header "__algorithm/fill_n.h" }
+  module std_private_algorithm_find                                        [system] {
+    header "__algorithm/find.h"
+    export std_private_algorithm_unwrap_iter
+  }
+  module std_private_algorithm_find_end                                    [system] { header "__algorithm/find_end.h" }
+  module std_private_algorithm_find_first_of                               [system] { header "__algorithm/find_first_of.h" }
+  module std_private_algorithm_find_if                                     [system] { header "__algorithm/find_if.h" }
+  module std_private_algorithm_find_if_not                                 [system] { header "__algorithm/find_if_not.h" }
+  module std_private_algorithm_for_each                                    [system] { header "__algorithm/for_each.h" }
+  module std_private_algorithm_for_each_n                                  [system] { header "__algorithm/for_each_n.h" }
+  module std_private_algorithm_for_each_segment                            [system] { header "__algorithm/for_each_segment.h" }
+  module std_private_algorithm_generate                                    [system] { header "__algorithm/generate.h" }
+  module std_private_algorithm_generate_n                                  [system] { header "__algorithm/generate_n.h" }
+  module std_private_algorithm_half_positive                               [system] { header "__algorithm/half_positive.h" }
+  module std_private_algorithm_in_found_result                             [system] { header "__algorithm/in_found_result.h" }
+  module std_private_algorithm_in_fun_result                               [system] { header "__algorithm/in_fun_result.h" }
+  module std_private_algorithm_in_in_out_result                            [system] { header "__algorithm/in_in_out_result.h" }
+  module std_private_algorithm_in_in_result                                [system] { header "__algorithm/in_in_result.h" }
+  module std_private_algorithm_in_out_out_result                           [system] { header "__algorithm/in_out_out_result.h" }
+  module std_private_algorithm_in_out_result                               [system] { header "__algorithm/in_out_result.h" }
+  module std_private_algorithm_includes                                    [system] { header "__algorithm/includes.h" }
+  module std_private_algorithm_inplace_merge                               [system] { header "__algorithm/inplace_merge.h" }
+  module std_private_algorithm_is_heap                                     [system] { header "__algorithm/is_heap.h" }
+  module std_private_algorithm_is_heap_until                               [system] { header "__algorithm/is_heap_until.h" }
+  module std_private_algorithm_is_partitioned                              [system] { header "__algorithm/is_partitioned.h" }
+  module std_private_algorithm_is_permutation                              [system] { header "__algorithm/is_permutation.h" }
+  module std_private_algorithm_is_sorted                                   [system] { header "__algorithm/is_sorted.h" }
+  module std_private_algorithm_is_sorted_until                             [system] { header "__algorithm/is_sorted_until.h" }
+  module std_private_algorithm_iter_swap                                   [system] { header "__algorithm/iter_swap.h" }
+  module std_private_algorithm_iterator_operations                         [system] {
+    header "__algorithm/iterator_operations.h"
+    export *
+  }
+  module std_private_algorithm_lexicographical_compare                     [system] { header "__algorithm/lexicographical_compare.h" }
+  module std_private_algorithm_lexicographical_compare_three_way           [system] { header "__algorithm/lexicographical_compare_three_way.h" }
+  module std_private_algorithm_lower_bound                                 [system] { header "__algorithm/lower_bound.h" }
+  module std_private_algorithm_make_heap                                   [system] { header "__algorithm/make_heap.h" }
+  module std_private_algorithm_make_projected                              [system] { header "__algorithm/make_projected.h" }
+  module std_private_algorithm_max                                         [system] { header "__algorithm/max.h" }
+  module std_private_algorithm_max_element                                 [system] { header "__algorithm/max_element.h" }
+  module std_private_algorithm_merge                                       [system] { header "__algorithm/merge.h" }
+  module std_private_algorithm_min                                         [system] { header "__algorithm/min.h" }
+  module std_private_algorithm_min_element                                 [system] { header "__algorithm/min_element.h" }
+  module std_private_algorithm_min_max_result                              [system] { header "__algorithm/min_max_result.h" }
+  module std_private_algorithm_minmax                                      [system] {
+    header "__algorithm/minmax.h"
+    export *
+  }
+  module std_private_algorithm_minmax_element                              [system] { header "__algorithm/minmax_element.h" }
+  module std_private_algorithm_mismatch                                    [system] { header "__algorithm/mismatch.h" }
+  module std_private_algorithm_move                                        [system] { header "__algorithm/move.h" }
+  module std_private_algorithm_move_backward                               [system] { header "__algorithm/move_backward.h" }
+  module std_private_algorithm_next_permutation                            [system] { header "__algorithm/next_permutation.h" }
+  module std_private_algorithm_none_of                                     [system] { header "__algorithm/none_of.h" }
+  module std_private_algorithm_nth_element                                 [system] { header "__algorithm/nth_element.h" }
+  module std_private_algorithm_partial_sort                                [system] { header "__algorithm/partial_sort.h" }
+  module std_private_algorithm_partial_sort_copy                           [system] { header "__algorithm/partial_sort_copy.h" }
+  module std_private_algorithm_partition                                   [system] { header "__algorithm/partition.h" }
+  module std_private_algorithm_partition_copy                              [system] { header "__algorithm/partition_copy.h" }
+  module std_private_algorithm_partition_point                             [system] { header "__algorithm/partition_point.h" }
+  module std_private_algorithm_pop_heap                                    [system] { header "__algorithm/pop_heap.h" }
+  module std_private_algorithm_prev_permutation                            [system] { header "__algorithm/prev_permutation.h" }
+  module std_private_algorithm_pstl_any_all_none_of                        [system] { header "__algorithm/pstl_any_all_none_of.h" }
+  module std_private_algorithm_pstl_backend                                [system] {
+    header "__algorithm/pstl_backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backend                   [system] {
+    header "__algorithm/pstl_backends/cpu_backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_any_of           [system] { header "__algorithm/pstl_backends/cpu_backends/any_of.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_backend          [system] {
+    header "__algorithm/pstl_backends/cpu_backends/backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_fill             [system] { header "__algorithm/pstl_backends/cpu_backends/fill.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_find_if          [system] { header "__algorithm/pstl_backends/cpu_backends/find_if.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_for_each         [system] { header "__algorithm/pstl_backends/cpu_backends/for_each.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_libdispatch      [system] { header "__algorithm/pstl_backends/cpu_backends/libdispatch.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_merge            [system] { header "__algorithm/pstl_backends/cpu_backends/merge.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_serial           [system] { textual header "__algorithm/pstl_backends/cpu_backends/serial.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_stable_sort      [system] { header "__algorithm/pstl_backends/cpu_backends/stable_sort.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_thread           [system] { textual header "__algorithm/pstl_backends/cpu_backends/thread.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_transform        [system] {
+    header "__algorithm/pstl_backends/cpu_backends/transform.h"
+    export std_private_algorithm_transform
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_transform_reduce [system] { header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h" }
+  module std_private_algorithm_pstl_copy                                   [system] { header "__algorithm/pstl_copy.h" }
+  module std_private_algorithm_pstl_count                                  [system] { header "__algorithm/pstl_count.h" }
+  module std_private_algorithm_pstl_fill                                   [system] { header "__algorithm/pstl_fill.h" }
+  module std_private_algorithm_pstl_find                                   [system] {
+    header "__algorithm/pstl_find.h"
+    export *
+  }
+  module std_private_algorithm_pstl_for_each                               [system] {
+    header "__algorithm/pstl_for_each.h"
+    export *
+  }
+  module std_private_algorithm_pstl_frontend_dispatch                      [system] {
+    header "__algorithm/pstl_frontend_dispatch.h"
+    export std_private_utility_forward
+  }
+  module std_private_algorithm_pstl_generate                               [system] { header "__algorithm/pstl_generate.h" }
+  module std_private_algorithm_pstl_is_partitioned                         [system] { header "__algorithm/pstl_is_partitioned.h" }
+  module std_private_algorithm_pstl_merge                                  [system] { header "__algorithm/pstl_merge.h" }
+  module std_private_algorithm_pstl_replace                                [system] { header "__algorithm/pstl_replace.h" }
+  module std_private_algorithm_pstl_sort                                   [system] { header "__algorithm/pstl_sort.h" }
+  module std_private_algorithm_pstl_stable_sort                            [system] {
+    header "__algorithm/pstl_stable_sort.h"
+    export std_private_functional_operations
+  }
+  module std_private_algorithm_pstl_transform                              [system] { header "__algorithm/pstl_transform.h" }
+  module std_private_algorithm_push_heap                                   [system] { header "__algorithm/push_heap.h" }
+  module std_private_algorithm_ranges_adjacent_find                        [system] { header "__algorithm/ranges_adjacent_find.h" }
+  module std_private_algorithm_ranges_all_of                               [system] { header "__algorithm/ranges_all_of.h" }
+  module std_private_algorithm_ranges_any_of                               [system] { header "__algorithm/ranges_any_of.h" }
+  module std_private_algorithm_ranges_binary_search                        [system] {
+    header "__algorithm/ranges_binary_search.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_clamp                                [system] {
+    header "__algorithm/ranges_clamp.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_copy                                 [system] {
+    header "__algorithm/ranges_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_backward                        [system] {
+    header "__algorithm/ranges_copy_backward.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_if                              [system] {
+    header "__algorithm/ranges_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_n                               [system] {
+    header "__algorithm/ranges_copy_n.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_count                                [system] { header "__algorithm/ranges_count.h" }
+  module std_private_algorithm_ranges_count_if                             [system] { header "__algorithm/ranges_count_if.h" }
+  module std_private_algorithm_ranges_equal                                [system] { header "__algorithm/ranges_equal.h" }
+  module std_private_algorithm_ranges_equal_range                          [system] {
+    header "__algorithm/ranges_equal_range.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_fill                                 [system] { header "__algorithm/ranges_fill.h" }
+  module std_private_algorithm_ranges_fill_n                               [system] { header "__algorithm/ranges_fill_n.h" }
+  module std_private_algorithm_ranges_find                                 [system] { header "__algorithm/ranges_find.h" }
+  module std_private_algorithm_ranges_find_end                             [system] { header "__algorithm/ranges_find_end.h" }
+  module std_private_algorithm_ranges_find_first_of                        [system] { header "__algorithm/ranges_find_first_of.h" }
+  module std_private_algorithm_ranges_find_if                              [system] { header "__algorithm/ranges_find_if.h" }
+  module std_private_algorithm_ranges_find_if_not                          [system] { header "__algorithm/ranges_find_if_not.h" }
+  module std_private_algorithm_ranges_for_each                             [system] {
+    header "__algorithm/ranges_for_each.h"
+    export std_private_algorithm_in_fun_result
+  }
+  module std_private_algorithm_ranges_for_each_n                           [system] {
+    header "__algorithm/ranges_for_each_n.h"
+    export std_private_algorithm_in_fun_result
+  }
+  module std_private_algorithm_ranges_generate                             [system] { header "__algorithm/ranges_generate.h" }
+  module std_private_algorithm_ranges_generate_n                           [system] { header "__algorithm/ranges_generate_n.h" }
+  module std_private_algorithm_ranges_includes                             [system] {
+    header "__algorithm/ranges_includes.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_inplace_merge                        [system] {
+    header "__algorithm/ranges_inplace_merge.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_heap                              [system] {
+    header "__algorithm/ranges_is_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_heap_until                        [system] {
+    header "__algorithm/ranges_is_heap_until.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_partitioned                       [system] { header "__algorithm/ranges_is_partitioned.h" }
+  module std_private_algorithm_ranges_is_permutation                       [system] { header "__algorithm/ranges_is_permutation.h" }
+  module std_private_algorithm_ranges_is_sorted                            [system] {
+    header "__algorithm/ranges_is_sorted.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_sorted_until                      [system] {
+    header "__algorithm/ranges_is_sorted_until.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_iterator_concept                     [system] { header "__algorithm/ranges_iterator_concept.h" }
+  module std_private_algorithm_ranges_lexicographical_compare              [system] {
+    header "__algorithm/ranges_lexicographical_compare.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_lower_bound                          [system] {
+    header "__algorithm/ranges_lower_bound.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_make_heap                            [system] {
+    header "__algorithm/ranges_make_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_max                                  [system] {
+    header "__algorithm/ranges_max.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_max_element                          [system] {
+    header "__algorithm/ranges_max_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_merge                                [system] {
+    header "__algorithm/ranges_merge.h"
+    export std_private_algorithm_in_in_out_result
+  }
+  module std_private_algorithm_ranges_min                                  [system] {
+    header "__algorithm/ranges_min.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_min_element                          [system] {
+    header "__algorithm/ranges_min_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_minmax                               [system] {
+    header "__algorithm/ranges_minmax.h"
+    export std_private_functional_ranges_operations
+    export std_private_algorithm_min_max_result
+  }
+  module std_private_algorithm_ranges_minmax_element                       [system] {
+    header "__algorithm/ranges_minmax_element.h"
+    export std_private_functional_ranges_operations
+    export std_private_algorithm_min_max_result
+  }
+  module std_private_algorithm_ranges_mismatch                             [system] {
+    header "__algorithm/ranges_mismatch.h"
+    export std_private_algorithm_in_in_result
+  }
+  module std_private_algorithm_ranges_move                                 [system] {
+    header "__algorithm/ranges_move.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_move_backward                        [system] {
+    header "__algorithm/ranges_move_backward.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_next_permutation                     [system] {
+    header "__algorithm/ranges_next_permutation.h"
+    export std_private_algorithm_in_found_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_none_of                              [system] { header "__algorithm/ranges_none_of.h" }
+  module std_private_algorithm_ranges_nth_element                          [system] {
+    header "__algorithm/ranges_nth_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partial_sort                         [system] {
+    header "__algorithm/ranges_partial_sort.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partial_sort_copy                    [system] {
+    header "__algorithm/ranges_partial_sort_copy.h"
+    export std_private_algorithm_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partition                            [system] { header "__algorithm/ranges_partition.h" }
+  module std_private_algorithm_ranges_partition_copy                       [system] { header "__algorithm/ranges_partition_copy.h" }
+  module std_private_algorithm_ranges_partition_point                      [system] { header "__algorithm/ranges_partition_point.h" }
+  module std_private_algorithm_ranges_pop_heap                             [system] {
+    header "__algorithm/ranges_pop_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_prev_permutation                     [system] {
+    header "__algorithm/ranges_prev_permutation.h"
+    export std_private_algorithm_in_found_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_push_heap                            [system] {
+    header "__algorithm/ranges_push_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_remove                               [system] { header "__algorithm/ranges_remove.h" }
+  module std_private_algorithm_ranges_remove_copy                          [system] {
+    header "__algorithm/ranges_remove_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_remove_copy_if                       [system] {
+    header "__algorithm/ranges_remove_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_remove_if                            [system] { header "__algorithm/ranges_remove_if.h" }
+  module std_private_algorithm_ranges_replace                              [system] { header "__algorithm/ranges_replace.h" }
+  module std_private_algorithm_ranges_replace_copy                         [system] {
+    header "__algorithm/ranges_replace_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_replace_copy_if                      [system] {
+    header "__algorithm/ranges_replace_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_replace_if                           [system] { header "__algorithm/ranges_replace_if.h" }
+  module std_private_algorithm_ranges_reverse                              [system] { header "__algorithm/ranges_reverse.h" }
+  module std_private_algorithm_ranges_reverse_copy                         [system] {
+    header "__algorithm/ranges_reverse_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_rotate                               [system] { header "__algorithm/ranges_rotate.h" }
+  module std_private_algorithm_ranges_rotate_copy                          [system] {
+    header "__algorithm/ranges_rotate_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_sample                               [system] { header "__algorithm/ranges_sample.h" }
+  module std_private_algorithm_ranges_search                               [system] { header "__algorithm/ranges_search.h" }
+  module std_private_algorithm_ranges_search_n                             [system] { header "__algorithm/ranges_search_n.h" }
+  module std_private_algorithm_ranges_set_difference                       [system] {
+    header "__algorithm/ranges_set_difference.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_set_intersection                     [system] {
+    header "__algorithm/ranges_set_intersection.h"
+    export std_private_algorithm_in_in_out_result
+  }
+  module std_private_algorithm_ranges_set_symmetric_difference             [system] {
+    header "__algorithm/ranges_set_symmetric_difference.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_set_union                            [system] {
+    header "__algorithm/ranges_set_union.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_shuffle                              [system] { header "__algorithm/ranges_shuffle.h" }
+  module std_private_algorithm_ranges_sort                                 [system] {
+    header "__algorithm/ranges_sort.h"
+    export std_private_algorithm_make_projected
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_sort_heap                            [system] {
+    header "__algorithm/ranges_sort_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_stable_partition                     [system] { header "__algorithm/ranges_stable_partition.h" }
+  module std_private_algorithm_ranges_stable_sort                          [system] {
+    header "__algorithm/ranges_stable_sort.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_starts_with                          [system] { header "__algorithm/ranges_starts_with.h" }
+  module std_private_algorithm_ranges_swap_ranges                          [system] {
+    header "__algorithm/ranges_swap_ranges.h"
+    export std_private_algorithm_in_in_result
+  }
+  module std_private_algorithm_ranges_transform                            [system] {
+    header "__algorithm/ranges_transform.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_unique                               [system] { header "__algorithm/ranges_unique.h" }
+  module std_private_algorithm_ranges_unique_copy                          [system] {
+    header "__algorithm/ranges_unique_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_upper_bound                          [system] {
+    header "__algorithm/ranges_upper_bound.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_remove                                      [system] { header "__algorithm/remove.h" }
+  module std_private_algorithm_remove_copy                                 [system] { header "__algorithm/remove_copy.h" }
+  module std_private_algorithm_remove_copy_if                              [system] { header "__algorithm/remove_copy_if.h" }
+  module std_private_algorithm_remove_if                                   [system] { header "__algorithm/remove_if.h" }
+  module std_private_algorithm_replace                                     [system] { header "__algorithm/replace.h" }
+  module std_private_algorithm_replace_copy                                [system] { header "__algorithm/replace_copy.h" }
+  module std_private_algorithm_replace_copy_if                             [system] { header "__algorithm/replace_copy_if.h" }
+  module std_private_algorithm_replace_if                                  [system] { header "__algorithm/replace_if.h" }
+  module std_private_algorithm_reverse                                     [system] { header "__algorithm/reverse.h" }
+  module std_private_algorithm_reverse_copy                                [system] { header "__algorithm/reverse_copy.h" }
+  module std_private_algorithm_rotate                                      [system] { header "__algorithm/rotate.h" }
+  module std_private_algorithm_rotate_copy                                 [system] { header "__algorithm/rotate_copy.h" }
+  module std_private_algorithm_sample                                      [system] { header "__algorithm/sample.h" }
+  module std_private_algorithm_search                                      [system] { header "__algorithm/search.h" }
+  module std_private_algorithm_search_n                                    [system] { header "__algorithm/search_n.h" }
+  module std_private_algorithm_set_difference                              [system] { header "__algorithm/set_difference.h" }
+  module std_private_algorithm_set_intersection                            [system] { header "__algorithm/set_intersection.h" }
+  module std_private_algorithm_set_symmetric_difference                    [system] { header "__algorithm/set_symmetric_difference.h" }
+  module std_private_algorithm_set_union                                   [system] { header "__algorithm/set_union.h" }
+  module std_private_algorithm_shift_left                                  [system] { header "__algorithm/shift_left.h" }
+  module std_private_algorithm_shift_right                                 [system] { header "__algorithm/shift_right.h" }
+  module std_private_algorithm_shuffle                                     [system] { header "__algorithm/shuffle.h" }
+  module std_private_algorithm_sift_down                                   [system] { header "__algorithm/sift_down.h" }
+  module std_private_algorithm_sort                                        [system] {
+    header "__algorithm/sort.h"
+    export std_private_debug_utils_strict_weak_ordering_check
+  }
+  module std_private_algorithm_sort_heap                                   [system] { header "__algorithm/sort_heap.h" }
+  module std_private_algorithm_stable_partition                            [system] { header "__algorithm/stable_partition.h" }
+  module std_private_algorithm_stable_sort                                 [system] { header "__algorithm/stable_sort.h" }
+  module std_private_algorithm_swap_ranges                                 [system] {
+    header "__algorithm/swap_ranges.h"
+    export std_private_algorithm_iterator_operations
+  }
+  module std_private_algorithm_three_way_comp_ref_type                     [system] { header "__algorithm/three_way_comp_ref_type.h" }
+  module std_private_algorithm_transform                                   [system] { header "__algorithm/transform.h" }
+  module std_private_algorithm_uniform_random_bit_generator_adaptor        [system] { header "__algorithm/uniform_random_bit_generator_adaptor.h" }
+  module std_private_algorithm_unique                                      [system] { header "__algorithm/unique.h" }
+  module std_private_algorithm_unique_copy                                 [system] { header "__algorithm/unique_copy.h" }
+  module std_private_algorithm_unwrap_iter                                 [system] {
+    header "__algorithm/unwrap_iter.h"
+    export std_private_iterator_iterator_traits
+  }
+  module std_private_algorithm_unwrap_range                                [system] {
+    header "__algorithm/unwrap_range.h"
+    export std_private_utility_pair
+  }
+  module std_private_algorithm_upper_bound                                 [system] { header "__algorithm/upper_bound.h" }
+
+  module std_private_array_array_fwd [system] { header "__fwd/array.h" }
+
+  module std_private_atomic_aliases             [system] {
+    header "__atomic/aliases.h"
+    export std_private_atomic_atomic
+  }
+  module std_private_atomic_atomic              [system] {
+    header "__atomic/atomic.h"
+    export std_private_atomic_atomic_base
+  }
+  module std_private_atomic_atomic_base         [system] { header "__atomic/atomic_base.h" }
+  module std_private_atomic_atomic_flag         [system] {
+    header "__atomic/atomic_flag.h"
+    export *
+  }
+  module std_private_atomic_atomic_init         [system] { header "__atomic/atomic_init.h" }
+  module std_private_atomic_atomic_lock_free    [system] { header "__atomic/atomic_lock_free.h" }
+  module std_private_atomic_atomic_sync         [system] { header "__atomic/atomic_sync.h" }
+  module std_private_atomic_check_memory_order  [system] { header "__atomic/check_memory_order.h" }
+  module std_private_atomic_contention_t        [system] { header "__atomic/contention_t.h" }
+  module std_private_atomic_cxx_atomic_impl     [system] { header "__atomic/cxx_atomic_impl.h" }
+  module std_private_atomic_fence               [system] { header "__atomic/fence.h" }
+  module std_private_atomic_is_always_lock_free [system] { header "__atomic/is_always_lock_free.h" }
+  module std_private_atomic_kill_dependency     [system] { header "__atomic/kill_dependency.h" }
+  module std_private_atomic_memory_order        [system] { header "__atomic/memory_order.h" }
+
+  module std_private_bit_bit_cast       [system] { header "__bit/bit_cast.h" }
+  module std_private_bit_bit_ceil       [system] { header "__bit/bit_ceil.h" }
+  module std_private_bit_bit_floor      [system] { header "__bit/bit_floor.h" }
+  module std_private_bit_bit_log2       [system] { header "__bit/bit_log2.h" }
+  module std_private_bit_bit_width      [system] { header "__bit/bit_width.h" }
+  module std_private_bit_blsr           [system] { header "__bit/blsr.h" }
+  module std_private_bit_byteswap       [system] { header "__bit/byteswap.h" }
+  module std_private_bit_countl         [system] { header "__bit/countl.h" }
+  module std_private_bit_countr         [system] { header "__bit/countr.h" }
+  module std_private_bit_endian         [system] { header "__bit/endian.h" }
+  module std_private_bit_has_single_bit [system] { header "__bit/has_single_bit.h" }
+  module std_private_bit_popcount       [system] { header "__bit/popcount.h" }
+  module std_private_bit_rotate         [system] { header "__bit/rotate.h" }
+
+  module std_private_charconv_chars_format            [system] { header "__charconv/chars_format.h" }
+  module std_private_charconv_from_chars_integral     [system] { header "__charconv/from_chars_integral.h" }
+  module std_private_charconv_from_chars_result       [system] { header "__charconv/from_chars_result.h" }
+  module std_private_charconv_tables                  [system] { header "__charconv/tables.h" }
+  module std_private_charconv_to_chars                [system] { header "__charconv/to_chars.h" }
+  module std_private_charconv_to_chars_base_10        [system] { header "__charconv/to_chars_base_10.h" }
+  module std_private_charconv_to_chars_floating_point [system] { header "__charconv/to_chars_floating_point.h" }
+  module std_private_charconv_to_chars_integral       [system] { header "__charconv/to_chars_integral.h" }
+  module std_private_charconv_to_chars_result         [system] { header "__charconv/to_chars_result.h" }
+  module std_private_charconv_traits                  [system] { header "__charconv/traits.h" }
+
+  module std_private_chrono_calendar               [system] { header "__chrono/calendar.h" }
+  module std_private_chrono_concepts               [system] { header "__chrono/concepts.h" }
+  module std_private_chrono_convert_to_timespec    [system] { header "__chrono/convert_to_timespec.h" }
+  module std_private_chrono_convert_to_tm          [system] { header "__chrono/convert_to_tm.h" }
+  module std_private_chrono_day                    [system] { header "__chrono/day.h" }
+  module std_private_chrono_duration               [system] {
+    header "__chrono/duration.h"
+    export std_private_type_traits_is_convertible
+  }
+  module std_private_chrono_file_clock             [system] { header "__chrono/file_clock.h" }
+  module std_private_chrono_formatter              [system] {
+    header "__chrono/formatter.h"
+  }
+  module std_private_chrono_hh_mm_ss               [system] { header "__chrono/hh_mm_ss.h" }
+  module std_private_chrono_high_resolution_clock  [system] {
+    header "__chrono/high_resolution_clock.h"
+    export std_private_chrono_steady_clock
+    export std_private_chrono_system_clock
+  }
+  module std_private_chrono_literals               [system] { header "__chrono/literals.h" }
+  module std_private_chrono_month                  [system] { header "__chrono/month.h" }
+  module std_private_chrono_month_weekday          [system] { header "__chrono/month_weekday.h" }
+  module std_private_chrono_monthday               [system] { header "__chrono/monthday.h" }
+  module std_private_chrono_ostream                [system] {
+    header "__chrono/ostream.h"
+  }
+  module std_private_chrono_parser_std_format_spec [system] {
+    header "__chrono/parser_std_format_spec.h"
+  }
+  module std_private_chrono_statically_widen       [system] { header "__chrono/statically_widen.h" }
+  module std_private_chrono_steady_clock           [system] {
+    header "__chrono/steady_clock.h"
+    export std_private_chrono_time_point
+  }
+  module std_private_chrono_system_clock           [system] {
+    header "__chrono/system_clock.h"
+    export std_private_chrono_time_point
+  }
+  module std_private_chrono_time_point             [system] { header "__chrono/time_point.h" }
+  module std_private_chrono_weekday                [system] { header "__chrono/weekday.h" }
+  module std_private_chrono_year                   [system] { header "__chrono/year.h" }
+  module std_private_chrono_year_month             [system] { header "__chrono/year_month.h" }
+  module std_private_chrono_year_month_day         [system] { header "__chrono/year_month_day.h" }
+  module std_private_chrono_year_month_weekday     [system] { header "__chrono/year_month_weekday.h" }
+
+  module std_private_compare_common_comparison_category     [system] { header "__compare/common_comparison_category.h" }
+  module std_private_compare_compare_partial_order_fallback [system] { header "__compare/compare_partial_order_fallback.h" }
+  module std_private_compare_compare_strong_order_fallback  [system] { header "__compare/compare_strong_order_fallback.h" }
+  module std_private_compare_compare_three_way              [system] { header "__compare/compare_three_way.h" }
+  module std_private_compare_compare_three_way_result       [system] { header "__compare/compare_three_way_result.h" }
+  module std_private_compare_compare_weak_order_fallback    [system] { header "__compare/compare_weak_order_fallback.h" }
+  module std_private_compare_is_eq                          [system] { header "__compare/is_eq.h" }
+  module std_private_compare_ordering                       [system] { header "__compare/ordering.h" }
+  module std_private_compare_partial_order                  [system] { header "__compare/partial_order.h" }
+  module std_private_compare_strong_order                   [system] { header "__compare/strong_order.h" }
+  module std_private_compare_synth_three_way                [system] { header "__compare/synth_three_way.h" }
+  module std_private_compare_three_way_comparable           [system] { header "__compare/three_way_comparable.h" }
+  module std_private_compare_weak_order                     [system] { header "__compare/weak_order.h" }
+
+  module std_private_concepts_arithmetic            [system] { header "__concepts/arithmetic.h" }
+  module std_private_concepts_assignable            [system] { header "__concepts/assignable.h" }
+  module std_private_concepts_boolean_testable      [system] { header "__concepts/boolean_testable.h" }
+  module std_private_concepts_class_or_enum         [system] { header "__concepts/class_or_enum.h" }
+  module std_private_concepts_common_reference_with [system] { header "__concepts/common_reference_with.h" }
+  module std_private_concepts_common_with           [system] { header "__concepts/common_with.h" }
+  module std_private_concepts_constructible         [system] {
+    header "__concepts/constructible.h"
+    export std_private_concepts_destructible
+  }
+  module std_private_concepts_convertible_to        [system] { header "__concepts/convertible_to.h" }
+  module std_private_concepts_copyable              [system] { header "__concepts/copyable.h" }
+  module std_private_concepts_derived_from          [system] { header "__concepts/derived_from.h" }
+  module std_private_concepts_destructible          [system] {
+    header "__concepts/destructible.h"
+    export std_private_type_traits_is_nothrow_destructible
+  }
+  module std_private_concepts_different_from        [system] { header "__concepts/different_from.h" }
+  module std_private_concepts_equality_comparable   [system] {
+    header "__concepts/equality_comparable.h"
+    export std_private_type_traits_common_reference
+  }
+  module std_private_concepts_invocable             [system] { header "__concepts/invocable.h" }
+  module std_private_concepts_movable               [system] {
+    header "__concepts/movable.h"
+    export std_private_type_traits_is_object
+  }
+  module std_private_concepts_predicate             [system] { header "__concepts/predicate.h" }
+  module std_private_concepts_regular               [system] { header "__concepts/regular.h" }
+  module std_private_concepts_relation              [system] { header "__concepts/relation.h" }
+  module std_private_concepts_same_as               [system] {
+    header "__concepts/same_as.h"
+    export std_private_type_traits_is_same
+  }
+  module std_private_concepts_semiregular           [system] { header "__concepts/semiregular.h" }
+  module std_private_concepts_swappable             [system] { header "__concepts/swappable.h" }
+  module std_private_concepts_totally_ordered       [system] { header "__concepts/totally_ordered.h" }
+
+  module std_private_condition_variable_condition_variable [system] {
+    header "__condition_variable/condition_variable.h"
+    export *
+  }
+
+  module std_private_coroutine_coroutine_handle      [system] { header "__coroutine/coroutine_handle.h" }
+  module std_private_coroutine_coroutine_traits      [system] { header "__coroutine/coroutine_traits.h" }
+  module std_private_coroutine_noop_coroutine_handle [system] { header "__coroutine/noop_coroutine_handle.h" }
+  module std_private_coroutine_trivial_awaitables    [system] { header "__coroutine/trivial_awaitables.h" }
+
+  module std_private_debug_utils_randomize_range            [system] { header "__debug_utils/randomize_range.h" }
+  module std_private_debug_utils_strict_weak_ordering_check [system] {
+    header "__debug_utils/strict_weak_ordering_check.h"
+    export std_private_type_traits_is_constant_evaluated
+  }
+
+  module std_private_exception_exception        [system] { header "__exception/exception.h" }
+  module std_private_exception_exception_ptr    [system] {
+    header "__exception/exception_ptr.h"
+    export std_private_exception_operations
+  }
+  module std_private_exception_nested_exception [system] { header "__exception/nested_exception.h" }
+  module std_private_exception_operations       [system] { header "__exception/operations.h" }
+  module std_private_exception_terminate        [system] { header "__exception/terminate.h" }
+
+  module std_private_expected_bad_expected_access [system] { header "__expected/bad_expected_access.h" }
+  module std_private_expected_expected            [system] { header "__expected/expected.h" }
+  module std_private_expected_unexpect            [system] { header "__expected/unexpect.h" }
+  module std_private_expected_unexpected          [system] { header "__expected/unexpected.h" }
+
+  module std_private_filesystem_copy_options                 [system] { header "__filesystem/copy_options.h" }
+  module std_private_filesystem_directory_entry              [system] {
+    header "__filesystem/directory_entry.h"
+    export *
+  }
+  module std_private_filesystem_directory_iterator           [system] {
+    header "__filesystem/directory_iterator.h"
+    export *
+  }
+  module std_private_filesystem_directory_options            [system] { header "__filesystem/directory_options.h" }
+  module std_private_filesystem_file_status                  [system] { header "__filesystem/file_status.h" }
+  module std_private_filesystem_file_time_type               [system] { header "__filesystem/file_time_type.h" }
+  module std_private_filesystem_file_type                    [system] { header "__filesystem/file_type.h" }
+  module std_private_filesystem_filesystem_error             [system] {
+    header "__filesystem/filesystem_error.h"
+    export *
+  }
+  module std_private_filesystem_operations                   [system] { header "__filesystem/operations.h" }
+  module std_private_filesystem_path                         [system] {
+    header "__filesystem/path.h"
+    export *
+  }
+  module std_private_filesystem_path_iterator                [system] { header "__filesystem/path_iterator.h" }
+  module std_private_filesystem_perm_options                 [system] { header "__filesystem/perm_options.h" }
+  module std_private_filesystem_perms                        [system] { header "__filesystem/perms.h" }
+  module std_private_filesystem_recursive_directory_iterator [system] {
+    header "__filesystem/recursive_directory_iterator.h"
+    export *
+  }
+  module std_private_filesystem_space_info                   [system] { header "__filesystem/space_info.h" }
+  module std_private_filesystem_u8path                       [system] { header "__filesystem/u8path.h" }
+
+  module std_private_format_buffer                          [system] { header "__format/buffer.h" }
+  module std_private_format_concepts                        [system] { header "__format/concepts.h" }
+  module std_private_format_container_adaptor               [system] { header "__format/container_adaptor.h" }
+  module std_private_format_enable_insertable               [system] { header "__format/enable_insertable.h" }
+  module std_private_format_escaped_output_table            [system] { header "__format/escaped_output_table.h" }
+  module std_private_format_extended_grapheme_cluster_table [system] { header "__format/extended_grapheme_cluster_table.h" }
+  module std_private_format_format_arg                      [system] { header "__format/format_arg.h" }
+  module std_private_format_format_arg_store                [system] { header "__format/format_arg_store.h" }
+  module std_private_format_format_args                     [system] { header "__format/format_args.h" }
+  module std_private_format_format_context                  [system] {
+    header "__format/format_context.h"
+    export *
+  }
+  module std_private_format_format_error                    [system] { header "__format/format_error.h" }
+  module std_private_format_format_functions                [system] {
+    header "__format/format_functions.h"
+    export std_string
+  }
+  module std_private_format_format_fwd                      [system] { header "__format/format_fwd.h" }
+  module std_private_format_format_parse_context            [system] { header "__format/format_parse_context.h" }
+  module std_private_format_format_string                   [system] { header "__format/format_string.h" }
+  module std_private_format_format_to_n_result              [system] {
+    header "__format/format_to_n_result.h"
+    export std_private_iterator_incrementable_traits
+  }
+  module std_private_format_formatter                       [system] { header "__format/formatter.h" }
+  module std_private_format_formatter_bool                  [system] { header "__format/formatter_bool.h" }
+  module std_private_format_formatter_char                  [system] { header "__format/formatter_char.h" }
+  module std_private_format_formatter_floating_point        [system] { header "__format/formatter_floating_point.h" }
+  module std_private_format_formatter_integer               [system] { header "__format/formatter_integer.h" }
+  module std_private_format_formatter_integral              [system] { header "__format/formatter_integral.h" }
+  module std_private_format_formatter_output                [system] { header "__format/formatter_output.h" }
+  module std_private_format_formatter_pointer               [system] { header "__format/formatter_pointer.h" }
+  module std_private_format_formatter_string                [system] { header "__format/formatter_string.h" }
+  module std_private_format_formatter_tuple                 [system] { header "__format/formatter_tuple.h" }
+  module std_private_format_parser_std_format_spec          [system] { header "__format/parser_std_format_spec.h" }
+  module std_private_format_range_default_formatter         [system] { header "__format/range_default_formatter.h" }
+  module std_private_format_range_formatter                 [system] { header "__format/range_formatter.h" }
+  module std_private_format_unicode                         [system] {
+    header "__format/unicode.h"
+    export std_private_format_extended_grapheme_cluster_table
+  }
+  module std_private_format_width_estimation_table          [system] { header "__format/width_estimation_table.h" }
+  module std_private_format_write_escaped                   [system] { header "__format/write_escaped.h" }
+
+  module std_private_functional_binary_function            [system] { header "__functional/binary_function.h" }
+  module std_private_functional_binary_negate              [system] { header "__functional/binary_negate.h" }
+  module std_private_functional_bind                       [system] { header "__functional/bind.h" }
+  module std_private_functional_bind_back                  [system] { header "__functional/bind_back.h" }
+  module std_private_functional_bind_front                 [system] { header "__functional/bind_front.h" }
+  module std_private_functional_binder1st                  [system] { header "__functional/binder1st.h" }
+  module std_private_functional_binder2nd                  [system] { header "__functional/binder2nd.h" }
+  module std_private_functional_boyer_moore_searcher       [system] {
+    header "__functional/boyer_moore_searcher.h"
+    export std_private_memory_shared_ptr
+  }
+  module std_private_functional_compose                    [system] {
+    header "__functional/compose.h"
+    export std_private_functional_perfect_forward
+  }
+  module std_private_functional_default_searcher           [system] { header "__functional/default_searcher.h" }
+  module std_private_functional_function                   [system] { header "__functional/function.h" }
+  module std_private_functional_hash                       [system] {
+    header "__functional/hash.h"
+    export std_cstdint
+    export std_private_type_traits_underlying_type
+    export std_private_utility_pair
+  }
+  module std_private_functional_hash_fwd                   [system] { header "__fwd/hash.h" }
+  module std_private_functional_identity                   [system] { header "__functional/identity.h" }
+  module std_private_functional_invoke                     [system] {
+    header "__functional/invoke.h"
+    export *
+  }
+  module std_private_functional_is_transparent             [system] { header "__functional/is_transparent.h" }
+  module std_private_functional_mem_fn                     [system] { header "__functional/mem_fn.h" }
+  module std_private_functional_mem_fun_ref                [system] { header "__functional/mem_fun_ref.h" }
+  module std_private_functional_not_fn                     [system] { header "__functional/not_fn.h" }
+  module std_private_functional_operations                 [system] { header "__functional/operations.h" }
+  module std_private_functional_perfect_forward            [system] {
+    header "__functional/perfect_forward.h"
+    export *
+  }
+  module std_private_functional_pointer_to_binary_function [system] { header "__functional/pointer_to_binary_function.h" }
+  module std_private_functional_pointer_to_unary_function  [system] { header "__functional/pointer_to_unary_function.h" }
+  module std_private_functional_ranges_operations          [system] { header "__functional/ranges_operations.h" }
+  module std_private_functional_reference_wrapper          [system] { header "__functional/reference_wrapper.h" }
+  module std_private_functional_unary_function             [system] { header "__functional/unary_function.h" }
+  module std_private_functional_unary_negate               [system] { header "__functional/unary_negate.h" }
+  module std_private_functional_weak_result_type           [system] { header "__functional/weak_result_type.h" }
+
+  module std_private_ios_fpos [system] { header "__ios/fpos.h" }
+
+  module std_private_iosfwd_fstream_fwd   [system] { header "__fwd/fstream.h" }
+  module std_private_iosfwd_ios_fwd       [system] { header "__fwd/ios.h" }
+  module std_private_iosfwd_istream_fwd   [system] { header "__fwd/istream.h" }
+  module std_private_iosfwd_ostream_fwd   [system] { header "__fwd/ostream.h" }
+  module std_private_iosfwd_sstream_fwd   [system] { header "__fwd/sstream.h" }
+  module std_private_iosfwd_streambuf_fwd [system] { header "__fwd/streambuf.h" }
+
+  module std_private_iterator_access                  [system] { header "__iterator/access.h" }
+  module std_private_iterator_advance                 [system] { header "__iterator/advance.h" }
+  module std_private_iterator_back_insert_iterator    [system] { header "__iterator/back_insert_iterator.h" }
+  module std_private_iterator_bounded_iter            [system] { header "__iterator/bounded_iter.h" }
+  module std_private_iterator_common_iterator         [system] { header "__iterator/common_iterator.h" }
+  module std_private_iterator_concepts                [system] {
+    header "__iterator/concepts.h"
+    export std_private_concepts_constructible
+    export std_private_concepts_equality_comparable
+    export std_private_concepts_movable
+    export std_private_type_traits_common_reference
+    export std_private_type_traits_is_reference
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_iterator_counted_iterator        [system] { header "__iterator/counted_iterator.h" }
+  module std_private_iterator_cpp17_iterator_concepts [system] { header "__iterator/cpp17_iterator_concepts.h" }
+  module std_private_iterator_data                    [system] { header "__iterator/data.h" }
+  module std_private_iterator_default_sentinel        [system] { header "__iterator/default_sentinel.h" }
+  module std_private_iterator_distance                [system] {
+    header "__iterator/distance.h"
+    export std_private_ranges_size
+  }
+  module std_private_iterator_empty                   [system] { header "__iterator/empty.h" }
+  module std_private_iterator_erase_if_container      [system] { header "__iterator/erase_if_container.h" }
+  module std_private_iterator_front_insert_iterator   [system] { header "__iterator/front_insert_iterator.h" }
+  module std_private_iterator_incrementable_traits    [system] { header "__iterator/incrementable_traits.h" }
+  module std_private_iterator_indirectly_comparable   [system] { header "__iterator/indirectly_comparable.h" }
+  module std_private_iterator_insert_iterator         [system] { header "__iterator/insert_iterator.h" }
+  module std_private_iterator_istream_iterator        [system] { header "__iterator/istream_iterator.h" }
+  module std_private_iterator_istreambuf_iterator     [system] { header "__iterator/istreambuf_iterator.h" }
+  module std_private_iterator_iter_move               [system] { header "__iterator/iter_move.h" }
+  module std_private_iterator_iter_swap               [system] { header "__iterator/iter_swap.h" }
+  module std_private_iterator_iterator                [system] { header "__iterator/iterator.h" }
+  module std_private_iterator_iterator_traits         [system] {
+    header "__iterator/iterator_traits.h"
+    export std_private_type_traits_is_primary_template
+  }
+  module std_private_iterator_iterator_with_data      [system] { header "__iterator/iterator_with_data.h" }
+  module std_private_iterator_mergeable               [system] {
+    header "__iterator/mergeable.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_iterator_move_iterator           [system] { header "__iterator/move_iterator.h" }
+  module std_private_iterator_move_sentinel           [system] { header "__iterator/move_sentinel.h" }
+  module std_private_iterator_next                    [system] { header "__iterator/next.h" }
+  module std_private_iterator_ostream_iterator        [system] { header "__iterator/ostream_iterator.h" }
+  module std_private_iterator_ostreambuf_iterator     [system] {
+    header "__iterator/ostreambuf_iterator.h"
+    export *
+  }
+  module std_private_iterator_permutable              [system] { header "__iterator/permutable.h" }
+  module std_private_iterator_prev                    [system] { header "__iterator/prev.h" }
+  module std_private_iterator_projected               [system] { header "__iterator/projected.h" }
+  module std_private_iterator_ranges_iterator_traits  [system] { header "__iterator/ranges_iterator_traits.h" }
+  module std_private_iterator_readable_traits         [system] { header "__iterator/readable_traits.h" }
+  module std_private_iterator_reverse_access          [system] { header "__iterator/reverse_access.h" }
+  module std_private_iterator_reverse_iterator        [system] { header "__iterator/reverse_iterator.h" }
+  module std_private_iterator_segmented_iterator      [system] { header "__iterator/segmented_iterator.h" }
+  module std_private_iterator_size                    [system] { header "__iterator/size.h" }
+  module std_private_iterator_sortable                [system] {
+    header "__iterator/sortable.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_iterator_unreachable_sentinel    [system] { header "__iterator/unreachable_sentinel.h" }
+  module std_private_iterator_wrap_iter               [system] { header "__iterator/wrap_iter.h" }
+
+  module std_private_locale_locale_base_api_bsd_locale_defaults  [system] { textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h" }
+  module std_private_locale_locale_base_api_bsd_locale_fallbacks [system] { textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
+  module std_private_locale_locale_base_api_locale_guard         [system] { header "__locale_dir/locale_base_api/locale_guard.h" }
+
+  module std_private_mdspan_default_accessor [system] { header "__mdspan/default_accessor.h" }
+  module std_private_mdspan_extents          [system] {
+    header "__mdspan/extents.h"
+    export *
+  }
+  module std_private_mdspan_layout_left      [system] { header "__mdspan/layout_left.h" }
+  module std_private_mdspan_layout_right     [system] { header "__mdspan/layout_right.h" }
+  module std_private_mdspan_mdspan           [system] { header "__mdspan/mdspan.h" }
+  module std_private_mdspan_mdspan_fwd       [system] { header "__fwd/mdspan.h" }
+
+  module std_private_memory_addressof                       [system] { header "__memory/addressof.h" }
+  module std_private_memory_align                           [system] { header "__memory/align.h" }
+  module std_private_memory_aligned_alloc                   [system] { header "__memory/aligned_alloc.h" }
+  module std_private_memory_allocate_at_least               [system] { header "__memory/allocate_at_least.h" }
+  module std_private_memory_allocation_guard                [system] { header "__memory/allocation_guard.h" }
+  module std_private_memory_allocator                       [system] { header "__memory/allocator.h" }
+  module std_private_memory_allocator_arg_t                 [system] { header "__memory/allocator_arg_t.h" }
+  module std_private_memory_allocator_destructor            [system] { header "__memory/allocator_destructor.h" }
+  module std_private_memory_allocator_traits                [system] { header "__memory/allocator_traits.h" }
+  module std_private_memory_assume_aligned                  [system] { header "__memory/assume_aligned.h" }
+  module std_private_memory_auto_ptr                        [system] { header "__memory/auto_ptr.h" }
+  module std_private_memory_builtin_new_allocator           [system] {
+    header "__memory/builtin_new_allocator.h"
+    export *
+  }
+  module std_private_memory_compressed_pair                 [system] { header "__memory/compressed_pair.h" }
+  module std_private_memory_concepts                        [system] {
+    header "__memory/concepts.h"
+    export std_private_type_traits_remove_reference
+  }
+  module std_private_memory_construct_at                    [system] { header "__memory/construct_at.h" }
+  module std_private_memory_destruct_n                      [system] { header "__memory/destruct_n.h" }
+  module std_private_memory_pointer_traits                  [system] { header "__memory/pointer_traits.h" }
+  module std_private_memory_ranges_construct_at             [system] { header "__memory/ranges_construct_at.h" }
+  module std_private_memory_ranges_uninitialized_algorithms [system] {
+    header "__memory/ranges_uninitialized_algorithms.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_memory_raw_storage_iterator            [system] { header "__memory/raw_storage_iterator.h" }
+  module std_private_memory_shared_ptr                      [system] {
+    header "__memory/shared_ptr.h"
+    export std_private_memory_uninitialized_algorithms
+  }
+  module std_private_memory_swap_allocator                  [system] { header "__memory/swap_allocator.h" }
+  module std_private_memory_temp_value                      [system] { header "__memory/temp_value.h" }
+  module std_private_memory_temporary_buffer                [system] { header "__memory/temporary_buffer.h" }
+  module std_private_memory_uninitialized_algorithms        [system] {
+    header "__memory/uninitialized_algorithms.h"
+    export std_private_algorithm_copy
+  }
+  module std_private_memory_unique_ptr                      [system] {
+    header "__memory/unique_ptr.h"
+    export std_private_type_traits_add_lvalue_reference
+    export std_private_type_traits_is_pointer
+    export std_private_type_traits_type_identity
+  }
+  module std_private_memory_uses_allocator                  [system] { header "__memory/uses_allocator.h" }
+  module std_private_memory_uses_allocator_construction     [system] { header "__memory/uses_allocator_construction.h" }
+  module std_private_memory_voidify                         [system] { header "__memory/voidify.h" }
+
+  module std_private_memory_resource_memory_resource              [system] { header "__memory_resource/memory_resource.h" }
+  module std_private_memory_resource_memory_resource_fwd          [system] { header "__fwd/memory_resource.h" }
+  module std_private_memory_resource_monotonic_buffer_resource    [system] { header "__memory_resource/monotonic_buffer_resource.h" }
+  module std_private_memory_resource_polymorphic_allocator        [system] { header "__memory_resource/polymorphic_allocator.h" }
+  module std_private_memory_resource_pool_options                 [system] { header "__memory_resource/pool_options.h" }
+  module std_private_memory_resource_synchronized_pool_resource   [system] {
+    header "__memory_resource/synchronized_pool_resource.h"
+    export *
+  }
+  module std_private_memory_resource_unsynchronized_pool_resource [system] { header "__memory_resource/unsynchronized_pool_resource.h" }
+
+  module std_private_mutex_lock_guard  [system] { header "__mutex/lock_guard.h" }
+  module std_private_mutex_mutex       [system] { header "__mutex/mutex.h" }
+  module std_private_mutex_tag_types   [system] { header "__mutex/tag_types.h" }
+  module std_private_mutex_unique_lock [system] { header "__mutex/unique_lock.h" }
+
+  module std_private_numeric_accumulate               [system] { header "__numeric/accumulate.h" }
+  module std_private_numeric_adjacent_difference      [system] { header "__numeric/adjacent_difference.h" }
+  module std_private_numeric_exclusive_scan           [system] { header "__numeric/exclusive_scan.h" }
+  module std_private_numeric_gcd_lcm                  [system] { header "__numeric/gcd_lcm.h" }
+  module std_private_numeric_inclusive_scan           [system] { header "__numeric/inclusive_scan.h" }
+  module std_private_numeric_inner_product            [system] { header "__numeric/inner_product.h" }
+  module std_private_numeric_iota                     [system] { header "__numeric/iota.h" }
+  module std_private_numeric_midpoint                 [system] { header "__numeric/midpoint.h" }
+  module std_private_numeric_partial_sum              [system] { header "__numeric/partial_sum.h" }
+  module std_private_numeric_pstl_reduce              [system] { header "__numeric/pstl_reduce.h" }
+  module std_private_numeric_pstl_transform_reduce    [system] {
+    header "__numeric/pstl_transform_reduce.h"
+    export *
+  }
+  module std_private_numeric_reduce                   [system] { header "__numeric/reduce.h" }
+  module std_private_numeric_transform_exclusive_scan [system] { header "__numeric/transform_exclusive_scan.h" }
+  module std_private_numeric_transform_inclusive_scan [system] { header "__numeric/transform_inclusive_scan.h" }
+  module std_private_numeric_transform_reduce         [system] { header "__numeric/transform_reduce.h" }
+
+  module std_private_random_bernoulli_distribution          [system] { header "__random/bernoulli_distribution.h" }
+  module std_private_random_binomial_distribution           [system] { header "__random/binomial_distribution.h" }
+  module std_private_random_cauchy_distribution             [system] { header "__random/cauchy_distribution.h" }
+  module std_private_random_chi_squared_distribution        [system] { header "__random/chi_squared_distribution.h" }
+  module std_private_random_clamp_to_integral               [system] { header "__random/clamp_to_integral.h" }
+  module std_private_random_default_random_engine           [system] { header "__random/default_random_engine.h" }
+  module std_private_random_discard_block_engine            [system] { header "__random/discard_block_engine.h" }
+  module std_private_random_discrete_distribution           [system] {
+    header "__random/discrete_distribution.h"
+    export *
+  }
+  module std_private_random_exponential_distribution        [system] { header "__random/exponential_distribution.h" }
+  module std_private_random_extreme_value_distribution      [system] { header "__random/extreme_value_distribution.h" }
+  module std_private_random_fisher_f_distribution           [system] { header "__random/fisher_f_distribution.h" }
+  module std_private_random_gamma_distribution              [system] { header "__random/gamma_distribution.h" }
+  module std_private_random_generate_canonical              [system] { header "__random/generate_canonical.h" }
+  module std_private_random_geometric_distribution          [system] { header "__random/geometric_distribution.h" }
+  module std_private_random_independent_bits_engine         [system] { header "__random/independent_bits_engine.h" }
+  module std_private_random_is_seed_sequence                [system] { header "__random/is_seed_sequence.h" }
+  module std_private_random_is_valid                        [system] { header "__random/is_valid.h" }
+  module std_private_random_knuth_b                         [system] { header "__random/knuth_b.h" }
+  module std_private_random_linear_congruential_engine      [system] { header "__random/linear_congruential_engine.h" }
+  module std_private_random_log2                            [system] { header "__random/log2.h" }
+  module std_private_random_lognormal_distribution          [system] { header "__random/lognormal_distribution.h" }
+  module std_private_random_mersenne_twister_engine         [system] { header "__random/mersenne_twister_engine.h" }
+  module std_private_random_negative_binomial_distribution  [system] { header "__random/negative_binomial_distribution.h" }
+  module std_private_random_normal_distribution             [system] { header "__random/normal_distribution.h" }
+  module std_private_random_piecewise_constant_distribution [system] {
+    header "__random/piecewise_constant_distribution.h"
+    export *
+  }
+  module std_private_random_piecewise_linear_distribution   [system] {
+    header "__random/piecewise_linear_distribution.h"
+    export *
+  }
+  module std_private_random_poisson_distribution            [system] { header "__random/poisson_distribution.h" }
+  module std_private_random_random_device                   [system] {
+    header "__random/random_device.h"
+    export *
+  }
+  module std_private_random_ranlux                          [system] { header "__random/ranlux.h" }
+  module std_private_random_seed_seq                        [system] {
+    header "__random/seed_seq.h"
+    export *
+  }
+  module std_private_random_shuffle_order_engine            [system] { header "__random/shuffle_order_engine.h" }
+  module std_private_random_student_t_distribution          [system] { header "__random/student_t_distribution.h" }
+  module std_private_random_subtract_with_carry_engine      [system] { header "__random/subtract_with_carry_engine.h" }
+  module std_private_random_uniform_int_distribution        [system] { header "__random/uniform_int_distribution.h" }
+  module std_private_random_uniform_random_bit_generator    [system] { header "__random/uniform_random_bit_generator.h" }
+  module std_private_random_uniform_real_distribution       [system] { header "__random/uniform_real_distribution.h" }
+  module std_private_random_weibull_distribution            [system] { header "__random/weibull_distribution.h" }
+
+  module std_private_ranges_access                     [system] { header "__ranges/access.h" }
+  module std_private_ranges_all                        [system] {
+    header "__ranges/all.h"
+    export std_private_functional_compose
+    export std_private_functional_perfect_forward
+    export std_private_ranges_owning_view
+  }
+  module std_private_ranges_as_rvalue_view             [system] { header "__ranges/as_rvalue_view.h" }
+  module std_private_ranges_common_view                [system] { header "__ranges/common_view.h" }
+  module std_private_ranges_concepts                   [system] {
+    header "__ranges/concepts.h"
+    export std_private_iterator_concepts
+  }
+  module std_private_ranges_container_compatible_range [system] { header "__ranges/container_compatible_range.h" }
+  module std_private_ranges_counted                    [system] {
+    header "__ranges/counted.h"
+    export std_span
+  }
+  module std_private_ranges_dangling                   [system] { header "__ranges/dangling.h" }
+  module std_private_ranges_data                       [system] { header "__ranges/data.h" }
+  module std_private_ranges_drop_view                  [system] { header "__ranges/drop_view.h" }
+  module std_private_ranges_drop_while_view            [system] { header "__ranges/drop_while_view.h" }
+  module std_private_ranges_elements_view              [system] { header "__ranges/elements_view.h" }
+  module std_private_ranges_empty                      [system] { header "__ranges/empty.h" }
+  module std_private_ranges_empty_view                 [system] { header "__ranges/empty_view.h" }
+  module std_private_ranges_enable_borrowed_range      [system] { header "__ranges/enable_borrowed_range.h" }
+  module std_private_ranges_enable_view                [system] { header "__ranges/enable_view.h" }
+  module std_private_ranges_filter_view                [system] {
+    header "__ranges/filter_view.h"
+    export std_private_ranges_range_adaptor
+  }
+  module std_private_ranges_from_range                 [system] { header "__ranges/from_range.h" }
+  module std_private_ranges_iota_view                  [system] { header "__ranges/iota_view.h" }
+  module std_private_ranges_istream_view               [system] {
+    header "__ranges/istream_view.h"
+  }
+  module std_private_ranges_join_view                  [system] {
+    header "__ranges/join_view.h"
+    export std_private_iterator_iterator_with_data
+    export std_private_iterator_segmented_iterator
+  }
+  module std_private_ranges_lazy_split_view            [system] {
+    header "__ranges/lazy_split_view.h"
+    export std_private_ranges_non_propagating_cache
+  }
+  module std_private_ranges_movable_box                [system] { header "__ranges/movable_box.h" }
+  module std_private_ranges_non_propagating_cache      [system] { header "__ranges/non_propagating_cache.h" }
+  module std_private_ranges_owning_view                [system] { header "__ranges/owning_view.h" }
+  module std_private_ranges_range_adaptor              [system] { header "__ranges/range_adaptor.h" }
+  module std_private_ranges_rbegin                     [system] { header "__ranges/rbegin.h" }
+  module std_private_ranges_ref_view                   [system] { header "__ranges/ref_view.h" }
+  module std_private_ranges_rend                       [system] { header "__ranges/rend.h" }
+  module std_private_ranges_repeat_view                [system] { header "__ranges/repeat_view.h" }
+  module std_private_ranges_reverse_view               [system] { header "__ranges/reverse_view.h" }
+  module std_private_ranges_single_view                [system] { header "__ranges/single_view.h" }
+  module std_private_ranges_size                       [system] {
+    header "__ranges/size.h"
+    export std_private_type_traits_make_unsigned
+  }
+  module std_private_ranges_split_view                 [system] { header "__ranges/split_view.h" }
+  module std_private_ranges_subrange                   [system] {
+    header "__ranges/subrange.h"
+    export std_private_ranges_subrange_fwd
+  }
+  module std_private_ranges_subrange_fwd               [system] {
+    header "__fwd/subrange.h"
+    export std_private_iterator_concepts
+  }
+  module std_private_ranges_take_view                  [system] { header "__ranges/take_view.h" }
+  module std_private_ranges_take_while_view            [system] { header "__ranges/take_while_view.h" }
+  module std_private_ranges_to                         [system] { header "__ranges/to.h" }
+  module std_private_ranges_transform_view             [system] {
+    header "__ranges/transform_view.h"
+    export std_private_functional_bind_back
+    export std_private_functional_perfect_forward
+    export std_private_ranges_movable_box
+  }
+  module std_private_ranges_view_interface             [system] { header "__ranges/view_interface.h" }
+  module std_private_ranges_views                      [system] { header "__ranges/views.h" }
+  module std_private_ranges_zip_view                   [system] { header "__ranges/zip_view.h" }
+
+  module std_private_span_span_fwd [system] { header "__fwd/span.h" }
+
+  module std_private_stop_token_atomic_unique_lock   [system] { header "__stop_token/atomic_unique_lock.h" }
+  module std_private_stop_token_intrusive_list_view  [system] { header "__stop_token/intrusive_list_view.h" }
+  module std_private_stop_token_intrusive_shared_ptr [system] { header "__stop_token/intrusive_shared_ptr.h" }
+  module std_private_stop_token_stop_callback        [system] { header "__stop_token/stop_callback.h" }
+  module std_private_stop_token_stop_source          [system] {
+    header "__stop_token/stop_source.h"
+    export *
+  }
+  module std_private_stop_token_stop_state           [system] {
+    header "__stop_token/stop_state.h"
+    export *
+  }
+  module std_private_stop_token_stop_token           [system] {
+    header "__stop_token/stop_token.h"
+    export *
+  }
+
+  module std_private_string_char_traits           [system] {
+    header "__string/char_traits.h"
+    export *
+  }
+  module std_private_string_constexpr_c_functions [system] {
+    header "__string/constexpr_c_functions.h"
+    export std_private_type_traits_is_equality_comparable
+  }
+  module std_private_string_extern_template_lists [system] { header "__string/extern_template_lists.h" }
+  module std_private_string_string_fwd            [system] { header "__fwd/string.h" }
+
+  module std_private_string_view_string_view_fwd [system] { header "__fwd/string_view.h" }
+
+  module std_private_system_error_errc            [system] { header "__system_error/errc.h" }
+  module std_private_system_error_error_category  [system] { header "__system_error/error_category.h" }
+  module std_private_system_error_error_code      [system] {
+    header "__system_error/error_code.h"
+    export std_private_functional_hash
+    export std_private_functional_unary_function
+  }
+  module std_private_system_error_error_condition [system] {
+    header "__system_error/error_condition.h"
+    export std_private_functional_hash
+    export std_private_functional_unary_function
+  }
+  module std_private_system_error_system_error    [system] { header "__system_error/system_error.h" }
+
+  module std_private_thread_formatter            [system] { header "__thread/formatter.h" }
+  module std_private_thread_id                   [system] { header "__thread/id.h" }
+  module std_private_thread_poll_with_backoff    [system] { header "__thread/poll_with_backoff.h" }
+  module std_private_thread_this_thread          [system] { header "__thread/this_thread.h" }
+  module std_private_thread_thread               [system] {
+    header "__thread/thread.h"
+    export *
+  }
+  module std_private_thread_timed_backoff_policy [system] { header "__thread/timed_backoff_policy.h" }
+
+  module std_private_tuple_get_fwd          [system] { header "__fwd/get.h" }
+  module std_private_tuple_make_tuple_types [system] { header "__tuple/make_tuple_types.h" }
+  module std_private_tuple_pair_like        [system] {
+    header "__tuple/pair_like.h"
+    export std_private_tuple_tuple_like
+  }
+  module std_private_tuple_sfinae_helpers   [system] { header "__tuple/sfinae_helpers.h" }
+  module std_private_tuple_tuple_element    [system] { header "__tuple/tuple_element.h" }
+  module std_private_tuple_tuple_fwd        [system] { header "__fwd/tuple.h" }
+  module std_private_tuple_tuple_indices    [system] { header "__tuple/tuple_indices.h" }
+  module std_private_tuple_tuple_like       [system] { header "__tuple/tuple_like.h" }
+  module std_private_tuple_tuple_like_ext   [system] { header "__tuple/tuple_like_ext.h" }
+  module std_private_tuple_tuple_size       [system] { header "__tuple/tuple_size.h" }
+  module std_private_tuple_tuple_types      [system] { header "__tuple/tuple_types.h" }
+
+  module std_private_type_traits_add_const                                 [system] { header "__type_traits/add_const.h" }
+  module std_private_type_traits_add_cv                                    [system] { header "__type_traits/add_cv.h" }
+  module std_private_type_traits_add_lvalue_reference                      [system] {
+    header "__type_traits/add_lvalue_reference.h"
+    export std_private_type_traits_is_referenceable
+  }
+  module std_private_type_traits_add_pointer                               [system] { header "__type_traits/add_pointer.h" }
+  module std_private_type_traits_add_rvalue_reference                      [system] { header "__type_traits/add_rvalue_reference.h" }
+  module std_private_type_traits_add_volatile                              [system] { header "__type_traits/add_volatile.h" }
+  module std_private_type_traits_aligned_storage                           [system] { header "__type_traits/aligned_storage.h" }
+  module std_private_type_traits_aligned_union                             [system] { header "__type_traits/aligned_union.h" }
+  module std_private_type_traits_alignment_of                              [system] { header "__type_traits/alignment_of.h" }
+  module std_private_type_traits_apply_cv                                  [system] {
+    header "__type_traits/apply_cv.h"
+    export std_private_type_traits_is_const
+    export std_private_type_traits_is_volatile
+  }
+  module std_private_type_traits_can_extract_key                           [system] { header "__type_traits/can_extract_key.h" }
+  module std_private_type_traits_common_reference                          [system] {
+    header "__type_traits/common_reference.h"
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_type_traits_common_type                               [system] {
+    header "__type_traits/common_type.h"
+    export std_private_utility_declval
+  }
+  module std_private_type_traits_conditional                               [system] { header "__type_traits/conditional.h" }
+  module std_private_type_traits_conjunction                               [system] { header "__type_traits/conjunction.h" }
+  module std_private_type_traits_copy_cv                                   [system] { header "__type_traits/copy_cv.h" }
+  module std_private_type_traits_copy_cvref                                [system] { header "__type_traits/copy_cvref.h" }
+  module std_private_type_traits_datasizeof                                [system] { header "__type_traits/datasizeof.h" }
+  module std_private_type_traits_decay                                     [system] {
+    header "__type_traits/decay.h"
+    export std_private_type_traits_add_pointer
+  }
+  module std_private_type_traits_dependent_type                            [system] { header "__type_traits/dependent_type.h" }
+  module std_private_type_traits_disjunction                               [system] { header "__type_traits/disjunction.h" }
+  module std_private_type_traits_enable_if                                 [system] { header "__type_traits/enable_if.h" }
+  module std_private_type_traits_extent                                    [system] { header "__type_traits/extent.h" }
+  module std_private_type_traits_has_unique_object_representation          [system] { header "__type_traits/has_unique_object_representation.h" }
+  module std_private_type_traits_has_virtual_destructor                    [system] { header "__type_traits/has_virtual_destructor.h" }
+  module std_private_type_traits_integral_constant                         [system] { header "__type_traits/integral_constant.h" }
+  module std_private_type_traits_invoke                                    [system] {
+    header "__type_traits/invoke.h"
+    export std_private_type_traits_conditional
+    export std_private_type_traits_decay
+    export std_private_type_traits_decay
+    export std_private_type_traits_enable_if
+    export std_private_type_traits_is_base_of
+    export std_private_type_traits_is_core_convertible
+    export std_private_type_traits_is_reference_wrapper
+    export std_private_type_traits_is_same
+    export std_private_type_traits_is_void
+    export std_private_type_traits_nat
+    export std_private_type_traits_remove_cv
+  }
+  module std_private_type_traits_is_abstract                               [system] { header "__type_traits/is_abstract.h" }
+  module std_private_type_traits_is_aggregate                              [system] { header "__type_traits/is_aggregate.h" }
+  module std_private_type_traits_is_allocator                              [system] { header "__type_traits/is_allocator.h" }
+  module std_private_type_traits_is_always_bitcastable                     [system] { header "__type_traits/is_always_bitcastable.h" }
+  module std_private_type_traits_is_arithmetic                             [system] {
+    header "__type_traits/is_arithmetic.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_array                                  [system] {
+    header "__type_traits/is_array.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_assignable                             [system] { header "__type_traits/is_assignable.h" }
+  module std_private_type_traits_is_base_of                                [system] { header "__type_traits/is_base_of.h" }
+  module std_private_type_traits_is_bounded_array                          [system] { header "__type_traits/is_bounded_array.h" }
+  module std_private_type_traits_is_callable                               [system] { header "__type_traits/is_callable.h" }
+  module std_private_type_traits_is_char_like_type                         [system] { header "__type_traits/is_char_like_type.h" }
+  module std_private_type_traits_is_class                                  [system] { header "__type_traits/is_class.h" }
+  module std_private_type_traits_is_compound                               [system] { header "__type_traits/is_compound.h" }
+  module std_private_type_traits_is_const                                  [system] { header "__type_traits/is_const.h" }
+  module std_private_type_traits_is_constant_evaluated                     [system] { header "__type_traits/is_constant_evaluated.h" }
+  module std_private_type_traits_is_constructible                          [system] { header "__type_traits/is_constructible.h" }
+  module std_private_type_traits_is_convertible                            [system] {
+    header "__type_traits/is_convertible.h"
+    export std_private_type_traits_is_array
+  }
+  module std_private_type_traits_is_copy_assignable                        [system] { header "__type_traits/is_copy_assignable.h" }
+  module std_private_type_traits_is_copy_constructible                     [system] { header "__type_traits/is_copy_constructible.h" }
+  module std_private_type_traits_is_core_convertible                       [system] {
+    header "__type_traits/is_core_convertible.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_default_constructible                  [system] { header "__type_traits/is_default_constructible.h" }
+  module std_private_type_traits_is_destructible                           [system] { header "__type_traits/is_destructible.h" }
+  module std_private_type_traits_is_empty                                  [system] { header "__type_traits/is_empty.h" }
+  module std_private_type_traits_is_enum                                   [system] {
+    header "__type_traits/is_enum.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_equality_comparable                    [system] {
+    header "__type_traits/is_equality_comparable.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_execution_policy                       [system] {
+    header "__type_traits/is_execution_policy.h"
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_type_traits_is_final                                  [system] { header "__type_traits/is_final.h" }
+  module std_private_type_traits_is_floating_point                         [system] { header "__type_traits/is_floating_point.h" }
+  module std_private_type_traits_is_function                               [system] { header "__type_traits/is_function.h" }
+  module std_private_type_traits_is_fundamental                            [system] { header "__type_traits/is_fundamental.h" }
+  module std_private_type_traits_is_implicitly_default_constructible       [system] { header "__type_traits/is_implicitly_default_constructible.h" }
+  module std_private_type_traits_is_integral                               [system] { header "__type_traits/is_integral.h" }
+  module std_private_type_traits_is_literal_type                           [system] { header "__type_traits/is_literal_type.h" }
+  module std_private_type_traits_is_member_function_pointer                [system] { header "__type_traits/is_member_function_pointer.h" }
+  module std_private_type_traits_is_member_object_pointer                  [system] { header "__type_traits/is_member_object_pointer.h" }
+  module std_private_type_traits_is_member_pointer                         [system] { header "__type_traits/is_member_pointer.h" }
+  module std_private_type_traits_is_move_assignable                        [system] { header "__type_traits/is_move_assignable.h" }
+  module std_private_type_traits_is_move_constructible                     [system] { header "__type_traits/is_move_constructible.h" }
+  module std_private_type_traits_is_nothrow_assignable                     [system] { header "__type_traits/is_nothrow_assignable.h" }
+  module std_private_type_traits_is_nothrow_constructible                  [system] { header "__type_traits/is_nothrow_constructible.h" }
+  module std_private_type_traits_is_nothrow_convertible                    [system] { header "__type_traits/is_nothrow_convertible.h" }
+  module std_private_type_traits_is_nothrow_copy_assignable                [system] { header "__type_traits/is_nothrow_copy_assignable.h" }
+  module std_private_type_traits_is_nothrow_copy_constructible             [system] { header "__type_traits/is_nothrow_copy_constructible.h" }
+  module std_private_type_traits_is_nothrow_default_constructible          [system] { header "__type_traits/is_nothrow_default_constructible.h" }
+  module std_private_type_traits_is_nothrow_destructible                   [system] {
+    header "__type_traits/is_nothrow_destructible.h"
+    export std_private_type_traits_is_destructible
+  }
+  module std_private_type_traits_is_nothrow_move_assignable                [system] { header "__type_traits/is_nothrow_move_assignable.h" }
+  module std_private_type_traits_is_nothrow_move_constructible             [system] {
+    header "__type_traits/is_nothrow_move_constructible.h"
+    export std_private_type_traits_is_nothrow_constructible
+  }
+  module std_private_type_traits_is_null_pointer                           [system] {
+    header "__type_traits/is_null_pointer.h"
+    export std_cstddef
+  }
+  module std_private_type_traits_is_object                                 [system] {
+    header "__type_traits/is_object.h"
+    export std_private_type_traits_is_scalar
+  }
+  module std_private_type_traits_is_pod                                    [system] { header "__type_traits/is_pod.h" }
+  module std_private_type_traits_is_pointer                                [system] { header "__type_traits/is_pointer.h" }
+  module std_private_type_traits_is_polymorphic                            [system] { header "__type_traits/is_polymorphic.h" }
+  module std_private_type_traits_is_primary_template                       [system] {
+    header "__type_traits/is_primary_template.h"
+    export std_private_type_traits_enable_if
+  }
+  module std_private_type_traits_is_reference                              [system] { header "__type_traits/is_reference.h" }
+  module std_private_type_traits_is_reference_wrapper                      [system] { header "__type_traits/is_reference_wrapper.h" }
+  module std_private_type_traits_is_referenceable                          [system] { header "__type_traits/is_referenceable.h" }
+  module std_private_type_traits_is_same                                   [system] {
+    header "__type_traits/is_same.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_scalar                                 [system] {
+    header "__type_traits/is_scalar.h"
+    export std_private_type_traits_is_null_pointer
+  }
+  module std_private_type_traits_is_scoped_enum                            [system] { header "__type_traits/is_scoped_enum.h" }
+  module std_private_type_traits_is_signed                                 [system] { header "__type_traits/is_signed.h" }
+  module std_private_type_traits_is_signed_integer                         [system] { header "__type_traits/is_signed_integer.h" }
+  module std_private_type_traits_is_specialization                         [system] { header "__type_traits/is_specialization.h" }
+  module std_private_type_traits_is_standard_layout                        [system] { header "__type_traits/is_standard_layout.h" }
+  module std_private_type_traits_is_swappable                              [system] {
+    header "__type_traits/is_swappable.h"
+    export std_private_type_traits_is_move_constructible
+  }
+  module std_private_type_traits_is_trivial                                [system] { header "__type_traits/is_trivial.h" }
+  module std_private_type_traits_is_trivially_assignable                   [system] { header "__type_traits/is_trivially_assignable.h" }
+  module std_private_type_traits_is_trivially_constructible                [system] { header "__type_traits/is_trivially_constructible.h" }
+  module std_private_type_traits_is_trivially_copy_assignable              [system] { header "__type_traits/is_trivially_copy_assignable.h" }
+  module std_private_type_traits_is_trivially_copy_constructible           [system] { header "__type_traits/is_trivially_copy_constructible.h" }
+  module std_private_type_traits_is_trivially_copyable                     [system] { header "__type_traits/is_trivially_copyable.h" }
+  module std_private_type_traits_is_trivially_default_constructible        [system] { header "__type_traits/is_trivially_default_constructible.h" }
+  module std_private_type_traits_is_trivially_destructible                 [system] { header "__type_traits/is_trivially_destructible.h" }
+  module std_private_type_traits_is_trivially_lexicographically_comparable [system] { header "__type_traits/is_trivially_lexicographically_comparable.h" }
+  module std_private_type_traits_is_trivially_move_assignable              [system] { header "__type_traits/is_trivially_move_assignable.h" }
+  module std_private_type_traits_is_trivially_move_constructible           [system] { header "__type_traits/is_trivially_move_constructible.h" }
+  module std_private_type_traits_is_unbounded_array                        [system] { header "__type_traits/is_unbounded_array.h" }
+  module std_private_type_traits_is_union                                  [system] { header "__type_traits/is_union.h" }
+  module std_private_type_traits_is_unsigned                               [system] { header "__type_traits/is_unsigned.h" }
+  module std_private_type_traits_is_unsigned_integer                       [system] { header "__type_traits/is_unsigned_integer.h" }
+  module std_private_type_traits_is_valid_expansion                        [system] { header "__type_traits/is_valid_expansion.h" }
+  module std_private_type_traits_is_void                                   [system] {
+    header "__type_traits/is_void.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_volatile                               [system] { header "__type_traits/is_volatile.h" }
+  module std_private_type_traits_lazy                                      [system] { header "__type_traits/lazy.h" }
+  module std_private_type_traits_make_32_64_or_128_bit                     [system] { header "__type_traits/make_32_64_or_128_bit.h" }
+  module std_private_type_traits_make_const_lvalue_ref                     [system] { header "__type_traits/make_const_lvalue_ref.h" }
+  module std_private_type_traits_make_signed                               [system] { header "__type_traits/make_signed.h" }
+  module std_private_type_traits_make_unsigned                             [system] {
+    header "__type_traits/make_unsigned.h"
+    export std_private_type_traits_is_unsigned
+  }
+  module std_private_type_traits_maybe_const                               [system] { header "__type_traits/maybe_const.h" }
+  module std_private_type_traits_nat                                       [system] { header "__type_traits/nat.h" }
+  module std_private_type_traits_negation                                  [system] { header "__type_traits/negation.h" }
+  module std_private_type_traits_noexcept_move_assign_container            [system] { header "__type_traits/noexcept_move_assign_container.h" }
+  module std_private_type_traits_operation_traits                          [system] { header "__type_traits/operation_traits.h" }
+  module std_private_type_traits_predicate_traits                          [system] { header "__type_traits/predicate_traits.h" }
+  module std_private_type_traits_promote                                   [system] { header "__type_traits/promote.h" }
+  module std_private_type_traits_rank                                      [system] { header "__type_traits/rank.h" }
+  module std_private_type_traits_remove_all_extents                        [system] { header "__type_traits/remove_all_extents.h" }
+  module std_private_type_traits_remove_const                              [system] { header "__type_traits/remove_const.h" }
+  module std_private_type_traits_remove_const_ref                          [system] { header "__type_traits/remove_const_ref.h" }
+  module std_private_type_traits_remove_cv                                 [system] {
+    header "__type_traits/remove_cv.h"
+    export std_private_type_traits_remove_const
+    export std_private_type_traits_remove_volatile
+  }
+  module std_private_type_traits_remove_cvref                              [system] { header "__type_traits/remove_cvref.h" }
+  module std_private_type_traits_remove_extent                             [system] { header "__type_traits/remove_extent.h" }
+  module std_private_type_traits_remove_pointer                            [system] { header "__type_traits/remove_pointer.h" }
+  module std_private_type_traits_remove_reference                          [system] { header "__type_traits/remove_reference.h" }
+  module std_private_type_traits_remove_volatile                           [system] { header "__type_traits/remove_volatile.h" }
+  module std_private_type_traits_result_of                                 [system] { header "__type_traits/result_of.h" }
+  module std_private_type_traits_strip_signature                           [system] { header "__type_traits/strip_signature.h" }
+  module std_private_type_traits_type_identity                             [system] { header "__type_traits/type_identity.h" }
+  module std_private_type_traits_type_list                                 [system] { header "__type_traits/type_list.h" }
+  module std_private_type_traits_underlying_type                           [system] {
+    header "__type_traits/underlying_type.h"
+    export std_private_type_traits_is_enum
+  }
+  module std_private_type_traits_unwrap_ref                                [system] { header "__type_traits/unwrap_ref.h" }
+  module std_private_type_traits_void_t                                    [system] { header "__type_traits/void_t.h" }
+
+  module std_private_utility_as_const               [system] { header "__utility/as_const.h" }
+  module std_private_utility_auto_cast              [system] {
+    header "__utility/auto_cast.h"
+    export std_private_type_traits_decay
+  }
+  module std_private_utility_cmp                    [system] {
+    header "__utility/cmp.h"
+    export std_private_type_traits_make_unsigned
+  }
+  module std_private_utility_convert_to_integral    [system] { header "__utility/convert_to_integral.h" }
+  module std_private_utility_declval                [system] { header "__utility/declval.h" }
+  module std_private_utility_exception_guard        [system] { header "__utility/exception_guard.h" }
+  module std_private_utility_exchange               [system] { header "__utility/exchange.h" }
+  module std_private_utility_forward                [system] { header "__utility/forward.h" }
+  module std_private_utility_forward_like           [system] { header "__utility/forward_like.h" }
+  module std_private_utility_in_place               [system] { header "__utility/in_place.h" }
+  module std_private_utility_integer_sequence       [system] { header "__utility/integer_sequence.h" }
+  module std_private_utility_is_pointer_in_range    [system] { header "__utility/is_pointer_in_range.h" }
+  module std_private_utility_move                   [system] {
+    header "__utility/move.h"
+    export std_private_type_traits_is_copy_constructible
+    export std_private_type_traits_is_nothrow_move_constructible
+    export std_private_type_traits_remove_reference
+  }
+  module std_private_utility_pair                   [system] {
+    header "__utility/pair.h"
+    export std_private_ranges_subrange_fwd
+    export std_private_tuple_pair_like
+    export std_private_type_traits_is_assignable
+    export std_private_type_traits_is_constructible
+    export std_private_type_traits_is_convertible
+    export std_private_type_traits_is_copy_assignable
+    export std_private_type_traits_is_move_assignable
+    export std_private_type_traits_is_nothrow_copy_constructible
+    export std_private_type_traits_is_nothrow_default_constructible
+    export std_private_type_traits_is_nothrow_move_assignable
+    export std_private_utility_pair_fwd
+  }
+  module std_private_utility_pair_fwd               [system] { header "__fwd/pair.h" }
+  module std_private_utility_piecewise_construct    [system] { header "__utility/piecewise_construct.h" }
+  module std_private_utility_priority_tag           [system] { header "__utility/priority_tag.h" }
+  module std_private_utility_rel_ops                [system] { header "__utility/rel_ops.h" }
+  module std_private_utility_swap                   [system] {
+    header "__utility/swap.h"
+    export std_private_type_traits_is_swappable
+  }
+  module std_private_utility_terminate_on_exception [system] { header "__utility/terminate_on_exception.h" }
+  module std_private_utility_to_underlying          [system] { header "__utility/to_underlying.h" }
+  module std_private_utility_unreachable            [system] { header "__utility/unreachable.h" }
+
+  module std_private_variant_monostate [system] { header "__variant/monostate.h" }
+}
diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap
new file mode 100644
index 000000000000..c8510f954f0e
--- /dev/null
+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.0.modulemap
@@ -0,0 +1,1729 @@
+// FreeBSD port maintainer note:
+// Taken from
+// https://github.com/freebsd/freebsd-src/blob/release/14.0.0/lib/libc%2B%2B/module.modulemap
+// on 2024-05-15.
+
+// define the module for __config outside of the top level 'std' module
+// since __config may be included from C headers which may create an
+// include cycle.
+module std_config [system] [extern_c] {
+  header "__config"
+  export *
+}
+
+module std [system] {
+  export std_config
+  // FIXME: The standard does not require that each of these submodules
+  // re-exports its imported modules. We should provide an alternative form of
+  // export that issues a warning if a name from the submodule is used, and
+  // use that to provide a 'strict mode' for libc++.
+
+  // Deprecated C-compatibility headers. These can all be included from within
+  // an 'extern "C"' context.
+  module depr [extern_c] {
+    // <assert.h> provided by C library.
+    module ctype_h {
+      header "ctype.h"
+      export *
+    }
+    module errno_h {
+      header "errno.h"
+      export *
+    }
+    module fenv_h {
+      header "fenv.h"
+      export *
+    }
+    // <float.h> provided by compiler or C library.
+    module inttypes_h {
+      header "inttypes.h"
+      export stdint_h
+      export *
+    }
+    // <iso646.h> provided by compiler.
+    // <limits.h> provided by compiler or C library.
+    module locale_h {
+      
+      header "locale.h"
+      export *
+    }
+    module math_h {
+      header "math.h"
+      export *
+    }
+    module setjmp_h {
+      header "setjmp.h"
+      export *
+    }
+    module stdatomic_h {
+      
+      requires cplusplus23
+      header "stdatomic.h"
+      export *
+    }
+    // FIXME: <stdalign.h> is missing.
+    // <signal.h> provided by C library.
+    // <stdarg.h> provided by compiler.
+    module stdbool_h {
+      // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
+      textual header "stdbool.h"
+    }
+    module stddef_h {
+      // <stddef.h>'s __need_* macros require textual inclusion.
+      textual header "stddef.h"
+    }
+    module stdint_h {
+      header "stdint.h"
+      export *
+      // FIXME: This module only exists on OS X and for some reason the
+      // wildcard above doesn't export it.
+      export Darwin.C.stdint
+    }
+    module stdio_h {
+      // <stdio.h>'s __need_* macros require textual inclusion.
+      textual header "stdio.h"
+      export *
+      export Darwin.C.stdio
+    }
+    module stdlib_h {
+      // <stdlib.h>'s __need_* macros require textual inclusion.
+      textual header "stdlib.h"
+      export *
+    }
+    module string_h {
+      header "string.h"
+      export *
+    }
+    module uchar_h {
+      header "uchar.h"
+      export *
+    }
+    // <time.h> provided by C library.
+    module wchar_h {
+      
+      // <wchar.h>'s __need_* macros require textual inclusion.
+      textual header "wchar.h"
+      export *
+    }
+    module wctype_h {
+      
+      header "wctype.h"
+      export *
+    }
+  }
+
+  // <complex.h> and <tgmath.h> are not C headers in any real sense, do not
+  // allow their use in extern "C" contexts.
+  module complex_h {
+    header "complex.h"
+    export ccomplex
+    export *
+  }
+  module tgmath_h {
+    header "tgmath.h"
+    export ccomplex
+    export cmath
+    export *
+  }
+
+  // C compatibility headers.
+  module compat {
+    module cassert {
+      // <cassert>'s use of NDEBUG requires textual inclusion.
+      textual header "cassert"
+    }
+    module ccomplex {
+      header "ccomplex"
+      export complex
+      export *
+    }
+    module cctype {
+      header "cctype"
+      export *
+    }
+    module cerrno {
+      header "cerrno"
+      export *
+    }
+    module cfenv {
+      header "cfenv"
+      export *
+    }
+    module cfloat {
+      header "cfloat"
+      export *
+    }
+    module cinttypes {
+      header "cinttypes"
+      export cstdint
+      export *
+    }
+    module ciso646 {
+      header "ciso646"
+      export *
+    }
+    module climits {
+      header "climits"
+      export *
+    }
+    module clocale {
+      
+      header "clocale"
+      export *
+    }
+    module cmath {
+      header "cmath"
+      export *
+    }
+    module csetjmp {
+      header "csetjmp"
+      export *
+    }
+    module csignal {
+      header "csignal"
+      export *
+    }
+    // FIXME: <cstdalign> is missing.
+    module cstdarg {
+      header "cstdarg"
+      export *
+    }
+    module cstdbool {
+      header "cstdbool"
+      export *
+    }
+    module cstddef {
+      header "cstddef"
+      export *
+    }
+    module cstdint {
+      header "cstdint"
+      export depr.stdint_h
+      export *
+    }
+    module cstdio {
+      header "cstdio"
+      export *
+    }
+    module cstdlib {
+      header "cstdlib"
+      export *
+    }
+    module cstring {
+      header "cstring"
+      export *
+    }
+    module ctgmath {
+      header "ctgmath"
+      export ccomplex
+      export cmath
+      export *
+    }
+    module ctime {
+      header "ctime"
+      export *
+    }
+    module cuchar {
+      header "cuchar"
+      export *
+    }
+    module cwchar {
+      
+      header "cwchar"
+      export depr.stdio_h
+      export *
+    }
+    module cwctype {
+      
+      header "cwctype"
+      export *
+    }
+  }
+
+  module algorithm {
+    header "algorithm"
+    export initializer_list
+    export *
+
+    module __algorithm {
+      module adjacent_find                   { private header "__algorithm/adjacent_find.h" }
+      module all_of                          { private header "__algorithm/all_of.h" }
+      module any_of                          { private header "__algorithm/any_of.h" }
+      module binary_search                   { private header "__algorithm/binary_search.h" }
+      module clamp                           { private header "__algorithm/clamp.h" }
+      module comp                            { private header "__algorithm/comp.h" }
+      module comp_ref_type                   { private header "__algorithm/comp_ref_type.h" }
+      module copy                            { private header "__algorithm/copy.h" }
+      module copy_backward                   { private header "__algorithm/copy_backward.h" }
+      module copy_if                         { private header "__algorithm/copy_if.h" }
+      module copy_move_common                { private header "__algorithm/copy_move_common.h" }
+      module copy_n                          { private header "__algorithm/copy_n.h" }
+      module count                           { private header "__algorithm/count.h" }
+      module count_if                        { private header "__algorithm/count_if.h" }
+      module equal                           { private header "__algorithm/equal.h" }
+      module equal_range                     { private header "__algorithm/equal_range.h" }
+      module fill                            { private header "__algorithm/fill.h" }
+      module fill_n                          { private header "__algorithm/fill_n.h" }
+      module find                            { private header "__algorithm/find.h" }
+      module find_end                        { private header "__algorithm/find_end.h" }
+      module find_first_of                   { private header "__algorithm/find_first_of.h" }
+      module find_if                         { private header "__algorithm/find_if.h" }
+      module find_if_not                     { private header "__algorithm/find_if_not.h" }
+      module for_each                        { private header "__algorithm/for_each.h" }
+      module for_each_n                      { private header "__algorithm/for_each_n.h" }
+      module generate                        { private header "__algorithm/generate.h" }
+      module generate_n                      { private header "__algorithm/generate_n.h" }
+      module half_positive                   { private header "__algorithm/half_positive.h" }
+      module in_found_result                 { private header "__algorithm/in_found_result.h" }
+      module in_fun_result                   { private header "__algorithm/in_fun_result.h" }
+      module in_in_out_result                { private header "__algorithm/in_in_out_result.h" }
+      module in_in_result                    { private header "__algorithm/in_in_result.h" }
+      module in_out_out_result               { private header "__algorithm/in_out_out_result.h" }
+      module in_out_result                   { private header "__algorithm/in_out_result.h" }
+      module includes                        { private header "__algorithm/includes.h" }
+      module inplace_merge                   { private header "__algorithm/inplace_merge.h" }
+      module is_heap                         { private header "__algorithm/is_heap.h" }
+      module is_heap_until                   { private header "__algorithm/is_heap_until.h" }
+      module is_partitioned                  { private header "__algorithm/is_partitioned.h" }
+      module is_permutation                  { private header "__algorithm/is_permutation.h" }
+      module is_sorted                       { private header "__algorithm/is_sorted.h" }
+      module is_sorted_until                 { private header "__algorithm/is_sorted_until.h" }
+      module iter_swap                       { private header "__algorithm/iter_swap.h" }
+      module iterator_operations             {
+        private header "__algorithm/iterator_operations.h"
+        export *
+      }
+      module lexicographical_compare         { private header "__algorithm/lexicographical_compare.h" }
+      module lower_bound                     { private header "__algorithm/lower_bound.h" }
+      module make_heap                       { private header "__algorithm/make_heap.h" }
+      module make_projected                  { private header "__algorithm/make_projected.h" }
+      module max                             { private header "__algorithm/max.h" }
+      module max_element                     { private header "__algorithm/max_element.h" }
+      module merge                           { private header "__algorithm/merge.h" }
+      module min                             { private header "__algorithm/min.h" }
+      module min_element                     { private header "__algorithm/min_element.h" }
+      module min_max_result                  { private header "__algorithm/min_max_result.h" }
+      module minmax                          { private header "__algorithm/minmax.h" }
+      module minmax_element                  { private header "__algorithm/minmax_element.h" }
+      module mismatch                        { private header "__algorithm/mismatch.h" }
+      module move                            { private header "__algorithm/move.h" }
+      module move_backward                   { private header "__algorithm/move_backward.h" }
+      module next_permutation                { private header "__algorithm/next_permutation.h" }
+      module none_of                         { private header "__algorithm/none_of.h" }
+      module nth_element                     { private header "__algorithm/nth_element.h" }
+      module partial_sort                    { private header "__algorithm/partial_sort.h" }
+      module partial_sort_copy               { private header "__algorithm/partial_sort_copy.h" }
+      module partition                       { private header "__algorithm/partition.h" }
+      module partition_copy                  { private header "__algorithm/partition_copy.h" }
+      module partition_point                 { private header "__algorithm/partition_point.h" }
+      module pop_heap                        { private header "__algorithm/pop_heap.h" }
+      module prev_permutation                { private header "__algorithm/prev_permutation.h" }
+      module push_heap                       { private header "__algorithm/push_heap.h" }
+      module ranges_adjacent_find            { private header "__algorithm/ranges_adjacent_find.h" }
+      module ranges_all_of                   { private header "__algorithm/ranges_all_of.h" }
+      module ranges_any_of                   { private header "__algorithm/ranges_any_of.h" }
+      module ranges_binary_search {
+        private header "__algorithm/ranges_binary_search.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_clamp {
+        private header "__algorithm/ranges_clamp.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_copy {
+        private header "__algorithm/ranges_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_backward {
+        private header "__algorithm/ranges_copy_backward.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_if {
+        private header "__algorithm/ranges_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_copy_n {
+        private header "__algorithm/ranges_copy_n.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_count                    { private header "__algorithm/ranges_count.h" }
+      module ranges_count_if                 { private header "__algorithm/ranges_count_if.h" }
+      module ranges_equal                    { private header "__algorithm/ranges_equal.h" }
+      module ranges_equal_range {
+        private header "__algorithm/ranges_equal_range.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_fill                     { private header "__algorithm/ranges_fill.h" }
+      module ranges_fill_n                   { private header "__algorithm/ranges_fill_n.h" }
+      module ranges_find                     { private header "__algorithm/ranges_find.h" }
+      module ranges_find_end                 { private header "__algorithm/ranges_find_end.h" }
+      module ranges_find_first_of            { private header "__algorithm/ranges_find_first_of.h" }
+      module ranges_find_if                  { private header "__algorithm/ranges_find_if.h" }
+      module ranges_find_if_not              { private header "__algorithm/ranges_find_if_not.h" }
+      module ranges_for_each {
+        private header "__algorithm/ranges_for_each.h"
+        export algorithm.__algorithm.in_fun_result
+      }
+      module ranges_for_each_n {
+        private header "__algorithm/ranges_for_each_n.h"
+        export algorithm.__algorithm.in_fun_result
+      }
+      module ranges_generate                 { private header "__algorithm/ranges_generate.h" }
+      module ranges_generate_n               { private header "__algorithm/ranges_generate_n.h" }
+      module ranges_includes {
+        private header "__algorithm/ranges_includes.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_inplace_merge {
+        private header "__algorithm/ranges_inplace_merge.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_is_heap {
+        private header "__algorithm/ranges_is_heap.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_is_heap_until {
+        private header "__algorithm/ranges_is_heap_until.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_is_partitioned           { private header "__algorithm/ranges_is_partitioned.h" }
+      module ranges_is_permutation           { private header "__algorithm/ranges_is_permutation.h" }
+      module ranges_is_sorted {
+        private header "__algorithm/ranges_is_sorted.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_is_sorted_until {
+        private header "__algorithm/ranges_is_sorted_until.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_iterator_concept         { private header "__algorithm/ranges_iterator_concept.h" }
+      module ranges_lexicographical_compare {
+        private header "__algorithm/ranges_lexicographical_compare.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_lower_bound {
+        private header "__algorithm/ranges_lower_bound.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_make_heap {
+        private header "__algorithm/ranges_make_heap.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_max {
+        private header "__algorithm/ranges_max.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_max_element {
+        private header "__algorithm/ranges_max_element.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_merge {
+        private header "__algorithm/ranges_merge.h"
+        export algorithm.__algorithm.in_in_out_result
+      }
+      module ranges_min {
+        private header "__algorithm/ranges_min.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_min_element {
+        private header "__algorithm/ranges_min_element.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_minmax {
+        private header "__algorithm/ranges_minmax.h"
+        export functional.__functional.ranges_operations
+        export algorithm.__algorithm.min_max_result
+      }
+      module ranges_minmax_element {
+        private header "__algorithm/ranges_minmax_element.h"
+        export functional.__functional.ranges_operations
+        export algorithm.__algorithm.min_max_result
+      }
+      module ranges_mismatch {
+        private header "__algorithm/ranges_mismatch.h"
+        export algorithm.__algorithm.in_in_result
+      }
+      module ranges_move {
+        private header "__algorithm/ranges_move.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_move_backward {
+        private header "__algorithm/ranges_move_backward.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_next_permutation {
+        private header "__algorithm/ranges_next_permutation.h"
+        export algorithm.__algorithm.in_found_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_none_of                  { private header "__algorithm/ranges_none_of.h" }
+      module ranges_nth_element {
+        private header "__algorithm/ranges_nth_element.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_partial_sort {
+        private header "__algorithm/ranges_partial_sort.h"
+        export algorithm.__algorithm.in_out_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_partial_sort_copy {
+        private header "__algorithm/ranges_partial_sort_copy.h"
+        export algorithm.__algorithm.in_out_out_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_partition                { private header "__algorithm/ranges_partition.h" }
+      module ranges_partition_copy           { private header "__algorithm/ranges_partition_copy.h" }
+      module ranges_partition_point          { private header "__algorithm/ranges_partition_point.h" }
+      module ranges_pop_heap {
+        private header "__algorithm/ranges_pop_heap.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_prev_permutation {
+        private header "__algorithm/ranges_prev_permutation.h"
+        export algorithm.__algorithm.in_found_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_push_heap {
+        private header "__algorithm/ranges_push_heap.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_remove                   { private header "__algorithm/ranges_remove.h" }
+      module ranges_remove_copy {
+        private header "__algorithm/ranges_remove_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_remove_copy_if {
+        private header "__algorithm/ranges_remove_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_remove_if                { private header "__algorithm/ranges_remove_if.h" }
+      module ranges_replace                  { private header "__algorithm/ranges_replace.h" }
+      module ranges_replace_copy {
+        private header "__algorithm/ranges_replace_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_replace_copy_if {
+        private header "__algorithm/ranges_replace_copy_if.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_replace_if               { private header "__algorithm/ranges_replace_if.h" }
+      module ranges_reverse                  { private header "__algorithm/ranges_reverse.h" }
+      module ranges_reverse_copy {
+        private header "__algorithm/ranges_reverse_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_rotate                   { private header "__algorithm/ranges_rotate.h" }
+      module ranges_rotate_copy {
+        private header "__algorithm/ranges_rotate_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_sample                   { private header "__algorithm/ranges_sample.h" }
+      module ranges_search                   { private header "__algorithm/ranges_search.h" }
+      module ranges_search_n                 { private header "__algorithm/ranges_search_n.h" }
+      module ranges_set_difference {
+        private header "__algorithm/ranges_set_difference.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_set_intersection {
+        private header "__algorithm/ranges_set_intersection.h"
+        export algorithm.__algorithm.in_in_out_result
+      }
+      module ranges_set_symmetric_difference {
+        private header "__algorithm/ranges_set_symmetric_difference.h"
+        export algorithm.__algorithm.in_in_out_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_set_union {
+        private header "__algorithm/ranges_set_union.h"
+        export algorithm.__algorithm.in_in_out_result
+        export functional.__functional.ranges_operations
+      }
+      module ranges_shuffle                  { private header "__algorithm/ranges_shuffle.h" }
+      module ranges_sort {
+        private header "__algorithm/ranges_sort.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_sort_heap {
+        private header "__algorithm/ranges_sort_heap.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_stable_partition         { private header "__algorithm/ranges_stable_partition.h" }
+      module ranges_stable_sort {
+        private header "__algorithm/ranges_stable_sort.h"
+        export functional.__functional.ranges_operations
+      }
+      module ranges_swap_ranges {
+        private header "__algorithm/ranges_swap_ranges.h"
+        export algorithm.__algorithm.in_in_result
+      }
+      module ranges_transform {
+        private header "__algorithm/ranges_transform.h"
+        export algorithm.__algorithm.in_in_out_result
+        export algorithm.__algorithm.in_out_result
+      }
+      module uniform_random_bit_generator_adaptor {
+        private header "__algorithm/uniform_random_bit_generator_adaptor.h"
+      }
+      module ranges_unique                   { private header "__algorithm/ranges_unique.h" }
+      module ranges_unique_copy {
+        private header "__algorithm/ranges_unique_copy.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module ranges_upper_bound {
+        private header "__algorithm/ranges_upper_bound.h"
+        export functional.__functional.ranges_operations
+      }
+      module remove                          { private header "__algorithm/remove.h" }
+      module remove_copy                     { private header "__algorithm/remove_copy.h" }
+      module remove_copy_if                  { private header "__algorithm/remove_copy_if.h" }
+      module remove_if                       { private header "__algorithm/remove_if.h" }
+      module replace                         { private header "__algorithm/replace.h" }
+      module replace_copy                    { private header "__algorithm/replace_copy.h" }
+      module replace_copy_if                 { private header "__algorithm/replace_copy_if.h" }
+      module replace_if                      { private header "__algorithm/replace_if.h" }
+      module reverse                         { private header "__algorithm/reverse.h" }
+      module reverse_copy                    { private header "__algorithm/reverse_copy.h" }
+      module rotate                          { private header "__algorithm/rotate.h" }
+      module rotate_copy                     { private header "__algorithm/rotate_copy.h" }
+      module sample                          { private header "__algorithm/sample.h" }
+      module search                          { private header "__algorithm/search.h" }
+      module search_n                        { private header "__algorithm/search_n.h" }
+      module set_difference                  { private header "__algorithm/set_difference.h" }
+      module set_intersection                { private header "__algorithm/set_intersection.h" }
+      module set_symmetric_difference        { private header "__algorithm/set_symmetric_difference.h" }
+      module set_union                       { private header "__algorithm/set_union.h" }
+      module shift_left                      { private header "__algorithm/shift_left.h" }
+      module shift_right                     { private header "__algorithm/shift_right.h" }
+      module shuffle                         { private header "__algorithm/shuffle.h" }
+      module sift_down                       { private header "__algorithm/sift_down.h" }
+      module sort                            { private header "__algorithm/sort.h" }
+      module sort_heap                       { private header "__algorithm/sort_heap.h" }
+      module stable_partition                { private header "__algorithm/stable_partition.h" }
+      module stable_sort                     { private header "__algorithm/stable_sort.h" }
+      module swap_ranges                     { private header "__algorithm/swap_ranges.h" }
+      module transform                       { private header "__algorithm/transform.h" }
+      module unique                          { private header "__algorithm/unique.h" }
+      module unique_copy                     { private header "__algorithm/unique_copy.h" }
+      module unwrap_iter                     { private header "__algorithm/unwrap_iter.h" }
+      module unwrap_range                    { private header "__algorithm/unwrap_range.h" }
+      module upper_bound                     { private header "__algorithm/upper_bound.h" }
+    }
+  }
+  module any {
+    header "any"
+    export *
+  }
+  module array {
+    header "array"
+    export initializer_list
+    export *
+
+    module array_fwd { private header "__fwd/array.h" }
+  }
+  module atomic {
+    header "atomic"
+    export *
+  }
+  module barrier {
+    
+    header "barrier"
+    export *
+  }
+  module bit {
+    header "bit"
+    export *
+
+    module __bit {
+      module bit_cast       { private header "__bit/bit_cast.h" }
+      module bit_ceil       { private header "__bit/bit_ceil.h" }
+      module bit_floor      { private header "__bit/bit_floor.h" }
+      module bit_log2       { private header "__bit/bit_log2.h" }
+      module bit_width      { private header "__bit/bit_width.h" }
+      module blsr           { private header "__bit/blsr.h" }
+      module byteswap       { private header "__bit/byteswap.h" }
+      module countl         { private header "__bit/countl.h" }
+      module countr         { private header "__bit/countr.h" }
+      module endian         { private header "__bit/endian.h" }
+      module has_single_bit { private header "__bit/has_single_bit.h" }
+      module popcount       { private header "__bit/popcount.h" }
+      module rotate         { private header "__bit/rotate.h" }
+    }
+  }
+  module bitset {
+    header "bitset"
+    export string
+    export iosfwd
+    export *
+  }
+  // No submodule for cassert. It fundamentally needs repeated, textual inclusion.
+  module charconv {
+    header "charconv"
+    export *
+
+    module __charconv {
+      module chars_format      { private header "__charconv/chars_format.h" }
+      module from_chars_result { private header "__charconv/from_chars_result.h" }
+      module tables            { private header "__charconv/tables.h" }
+      module to_chars_base_10  { private header "__charconv/to_chars_base_10.h" }
+      module to_chars_result   { private header "__charconv/to_chars_result.h" }
+    }
+
+  }
+  module chrono {
+    header "chrono"
+    export *
+
+    module __chrono {
+      module calendar               { private header "__chrono/calendar.h" }
+      module convert_to_timespec    { private header "__chrono/convert_to_timespec.h" }
+      module convert_to_tm          { private header "__chrono/convert_to_tm.h" }
+      module day                    { private header "__chrono/day.h" }
+      module duration               { private header "__chrono/duration.h" }
+      module file_clock             { private header "__chrono/file_clock.h" }
+      module formatter              {
+        
+        private header "__chrono/formatter.h"
+      }
+      module hh_mm_ss               { private header "__chrono/hh_mm_ss.h" }
+      module high_resolution_clock  {
+        private header "__chrono/high_resolution_clock.h"
+        export steady_clock
+        export system_clock
+        export time_point
+      }
+      module literals               { private header "__chrono/literals.h" }
+      module month                  { private header "__chrono/month.h" }
+      module month_weekday          { private header "__chrono/month_weekday.h" }
+      module monthday               { private header "__chrono/monthday.h" }
+      module ostream                {
+        
+        private header "__chrono/ostream.h"
+      }
+      module parser_std_format_spec {
+        
+        private header "__chrono/parser_std_format_spec.h"
+      }
+      module statically_widen       { private header "__chrono/statically_widen.h" }
+      module steady_clock           { private header "__chrono/steady_clock.h" }
+      module system_clock           { private header "__chrono/system_clock.h" }
+      module time_point             { private header "__chrono/time_point.h" }
+      module weekday                { private header "__chrono/weekday.h" }
+      module year                   { private header "__chrono/year.h" }
+      module year_month             { private header "__chrono/year_month.h" }
+      module year_month_day         { private header "__chrono/year_month_day.h" }
+      module year_month_weekday     { private header "__chrono/year_month_weekday.h" }
+    }
+  }
+  module codecvt {
+    
+    header "codecvt"
+    export *
+  }
+  module compare {
+    header "compare"
+    export *
+
+    module __compare {
+      module common_comparison_category     { private header "__compare/common_comparison_category.h" }
+      module compare_partial_order_fallback { private header "__compare/compare_partial_order_fallback.h" }
+      module compare_strong_order_fallback  { private header "__compare/compare_strong_order_fallback.h" }
+      module compare_three_way              { private header "__compare/compare_three_way.h" }
+      module compare_three_way_result       { private header "__compare/compare_three_way_result.h" }
+      module compare_weak_order_fallback    { private header "__compare/compare_weak_order_fallback.h" }
+      module is_eq                          { private header "__compare/is_eq.h" }
+      module ordering                       { private header "__compare/ordering.h" }
+      module partial_order                  { private header "__compare/partial_order.h" }
+      module strong_order                   { private header "__compare/strong_order.h" }
+      module synth_three_way                { private header "__compare/synth_three_way.h" }
+      module three_way_comparable           { private header "__compare/three_way_comparable.h" }
+      module weak_order                     { private header "__compare/weak_order.h" }
+    }
+  }
+  module complex {
+    header "complex"
+    export *
+  }
+  module concepts {
+    header "concepts"
+    export *
+
+    module __concepts {
+      module arithmetic                 { private header "__concepts/arithmetic.h" }
+      module assignable                 { private header "__concepts/assignable.h" }
+      module boolean_testable           { private header "__concepts/boolean_testable.h" }
+      module class_or_enum              { private header "__concepts/class_or_enum.h" }
+      module common_reference_with      { private header "__concepts/common_reference_with.h" }
+      module common_with                { private header "__concepts/common_with.h" }
+      module constructible              { private header "__concepts/constructible.h" }
+      module convertible_to             { private header "__concepts/convertible_to.h" }
+      module copyable                   { private header "__concepts/copyable.h" }
+      module derived_from               { private header "__concepts/derived_from.h" }
+      module destructible               { private header "__concepts/destructible.h" }
+      module different_from             { private header "__concepts/different_from.h" }
+      module equality_comparable        { private header "__concepts/equality_comparable.h" }
+      module invocable                  { private header "__concepts/invocable.h" }
+      module movable                    { private header "__concepts/movable.h" }
+      module predicate                  { private header "__concepts/predicate.h" }
+      module regular                    { private header "__concepts/regular.h" }
+      module relation                   { private header "__concepts/relation.h" }
+      module same_as                    { private header "__concepts/same_as.h" }
+      module semiregular                { private header "__concepts/semiregular.h" }
+      module swappable                  { private header "__concepts/swappable.h" }
+      module totally_ordered            { private header "__concepts/totally_ordered.h" }
+    }
+  }
+  module condition_variable {
+    header "condition_variable"
+    export *
+  }
+  module coroutine {
+    requires coroutines
+    header "coroutine"
+    export compare
+    export *
+
+    module __coroutine {
+      module coroutine_handle           { private header "__coroutine/coroutine_handle.h" }
+      module coroutine_traits           { private header "__coroutine/coroutine_traits.h" }
+      module noop_coroutine_handle      { private header "__coroutine/noop_coroutine_handle.h" }
+      module trivial_awaitables         { private header "__coroutine/trivial_awaitables.h" }
+    }
+  }
+  module deque {
+    header "deque"
+    export initializer_list
+    export *
+  }
+  module exception {
+    header "exception"
+    export *
+  }
+  module execution {
+    header "execution"
+    export *
+  }
+  module expected {
+    header "expected"
+    export *
+
+    module __expected {
+      module bad_expected_access          { private header "__expected/bad_expected_access.h" }
+      module expected                     { private header "__expected/expected.h" }
+      module unexpect                     { private header "__expected/unexpect.h" }
+      module unexpected                   { private header "__expected/unexpected.h" }
+    }
+  }
+  module filesystem {
+    
+    header "filesystem"
+    export *
+
+    module __filesystem {
+      module copy_options                 { private header "__filesystem/copy_options.h" }
+      module directory_entry              { private header "__filesystem/directory_entry.h" }
+      module directory_iterator           { private header "__filesystem/directory_iterator.h" }
+      module directory_options            { private header "__filesystem/directory_options.h" }
+      module file_status                  { private header "__filesystem/file_status.h" }
+      module file_time_type               { private header "__filesystem/file_time_type.h" }
+      module file_type                    { private header "__filesystem/file_type.h" }
+      module filesystem_error             { private header "__filesystem/filesystem_error.h" }
+      module operations                   { private header "__filesystem/operations.h" }
+      module path                         { private header "__filesystem/path.h" }
+      module path_iterator                { private header "__filesystem/path_iterator.h" }
+      module perm_options                 { private header "__filesystem/perm_options.h" }
+      module perms                        { private header "__filesystem/perms.h" }
+      module recursive_directory_iterator { private header "__filesystem/recursive_directory_iterator.h" }
+      module space_info                   { private header "__filesystem/space_info.h" }
+      module u8path                       { private header "__filesystem/u8path.h" }
+    }
+  }
+  module format {
+    header "format"
+    export *
+
+    module __format {
+      module buffer                          { private header "__format/buffer.h" }
+      module concepts                        { private header "__format/concepts.h" }
+      module container_adaptor               { private header "__format/container_adaptor.h" }
+      module enable_insertable               { private header "__format/enable_insertable.h" }
+      module escaped_output_table            { private header "__format/escaped_output_table.h" }
+      module extended_grapheme_cluster_table { private header "__format/extended_grapheme_cluster_table.h" }
+      module format_arg                      { private header "__format/format_arg.h" }
+      module format_arg_store                { private header "__format/format_arg_store.h" }
+      module format_args                     { private header "__format/format_args.h" }
+      module format_context {
+        private header "__format/format_context.h"
+        export optional
+        export locale
+      }
+      module format_error                    { private header "__format/format_error.h" }
+      module format_functions                { private header "__format/format_functions.h" }
+      module format_fwd                      { private header "__format/format_fwd.h" }
+      module format_parse_context            { private header "__format/format_parse_context.h" }
+      module format_string                   { private header "__format/format_string.h" }
+      module format_to_n_result {
+        private header "__format/format_to_n_result.h"
+        export iterator.__iterator.incrementable_traits
+      }
+      module formatter                       { private header "__format/formatter.h" }
+      module formatter_bool                  { private header "__format/formatter_bool.h" }
+      module formatter_char                  { private header "__format/formatter_char.h" }
+      module formatter_floating_point        { private header "__format/formatter_floating_point.h" }
+      module formatter_integer               { private header "__format/formatter_integer.h" }
+      module formatter_integral              { private header "__format/formatter_integral.h" }
+      module formatter_output                { private header "__format/formatter_output.h" }
+      module formatter_pointer               { private header "__format/formatter_pointer.h" }
+      module formatter_string                { private header "__format/formatter_string.h" }
+      module formatter_tuple                 { private header "__format/formatter_tuple.h" }
+      module parser_std_format_spec          { private header "__format/parser_std_format_spec.h" }
+      module range_default_formatter         { private header "__format/range_default_formatter.h" }
+      module range_formatter                 { private header "__format/range_formatter.h" }
+      module unicode                         { private header "__format/unicode.h" }
+    }
+  }
+  module forward_list {
+    header "forward_list"
+    export initializer_list
+    export *
+  }
+  module fstream {
+    
+    
+    header "fstream"
+    export *
+  }
+  module functional {
+    header "functional"
+    export *
+
+    module __functional {
+      module binary_function            { private header "__functional/binary_function.h" }
+      module binary_negate              { private header "__functional/binary_negate.h" }
+      module bind                       { private header "__functional/bind.h" }
+      module bind_back                  { private header "__functional/bind_back.h" }
+      module bind_front                 { private header "__functional/bind_front.h" }
+      module binder1st                  { private header "__functional/binder1st.h" }
+      module binder2nd                  { private header "__functional/binder2nd.h" }
+      module boyer_moore_searcher       { private header "__functional/boyer_moore_searcher.h" }
+      module compose                    { private header "__functional/compose.h" }
+      module default_searcher           { private header "__functional/default_searcher.h" }
+      module function                   { private header "__functional/function.h" }
+      module hash                       { private header "__functional/hash.h" }
+      module hash_fwd                   { private header "__fwd/hash.h" }
+      module identity                   { private header "__functional/identity.h" }
+      module invoke                     {
+        private header "__functional/invoke.h"
+        export type_traits
+      }
+      module is_transparent             { private header "__functional/is_transparent.h" }
+      module mem_fn                     { private header "__functional/mem_fn.h" }
+      module mem_fun_ref                { private header "__functional/mem_fun_ref.h" }
+      module not_fn                     { private header "__functional/not_fn.h" }
+      module operations                 { private header "__functional/operations.h" }
+      module perfect_forward            { private header "__functional/perfect_forward.h" }
+      module pointer_to_binary_function { private header "__functional/pointer_to_binary_function.h" }
+      module pointer_to_unary_function  { private header "__functional/pointer_to_unary_function.h" }
+      module ranges_operations          { private header "__functional/ranges_operations.h" }
+      module reference_wrapper          { private header "__functional/reference_wrapper.h" }
+      module unary_function             { private header "__functional/unary_function.h" }
+      module unary_negate               { private header "__functional/unary_negate.h" }
+      module unwrap_ref                 { private header "__functional/unwrap_ref.h" }
+      module weak_result_type           { private header "__functional/weak_result_type.h" }
+    }
+  }
+  module future {
+    
+    header "future"
+    export *
+  }
+  module initializer_list {
+    header "initializer_list"
+    export *
+  }
+  module iomanip {
+    
+    header "iomanip"
+    export *
+  }
+  module ios {
+    
+    header "ios"
+    export iosfwd
+    export *
+
+    module __ios {
+      module fpos { private header "__ios/fpos.h" }
+    }
+  }
+  module iosfwd {
+    header "iosfwd"
+    export *
+  }
+  module iostream {
+    
+    header "iostream"
+    export ios
+    export streambuf
+    export istream
+    export ostream
+    export *
+  }
+  module istream {
+    
+    header "istream"
+    // FIXME: should re-export ios, streambuf?
+    export *
+  }
+  module iterator {
+    header "iterator"
+    export *
+
+    module __iterator {
+      module access                { private header "__iterator/access.h" }
+      module advance               { private header "__iterator/advance.h" }
+      module back_insert_iterator  { private header "__iterator/back_insert_iterator.h" }
+      module bounded_iter          { private header "__iterator/bounded_iter.h" }
+      module common_iterator       { private header "__iterator/common_iterator.h" }
+      module concepts              { private header "__iterator/concepts.h" }
+      module counted_iterator      { private header "__iterator/counted_iterator.h" }
+      module data                  { private header "__iterator/data.h" }
+      module default_sentinel      { private header "__iterator/default_sentinel.h" }
+      module distance              { private header "__iterator/distance.h" }
+      module empty                 { private header "__iterator/empty.h" }
+      module erase_if_container    { private header "__iterator/erase_if_container.h" }
+      module front_insert_iterator { private header "__iterator/front_insert_iterator.h" }
+      module incrementable_traits  { private header "__iterator/incrementable_traits.h" }
+      module indirectly_comparable { private header "__iterator/indirectly_comparable.h" }
+      module insert_iterator       { private header "__iterator/insert_iterator.h" }
+      module istream_iterator      { private header "__iterator/istream_iterator.h" }
+      module istreambuf_iterator   { private header "__iterator/istreambuf_iterator.h" }
+      module iter_move             { private header "__iterator/iter_move.h" }
+      module iter_swap             { private header "__iterator/iter_swap.h" }
+      module iterator              { private header "__iterator/iterator.h" }
+      module iterator_traits       { private header "__iterator/iterator_traits.h" }
+      module iterator_with_data    { private header "__iterator/iterator_with_data.h" }
+      module mergeable {
+        private header "__iterator/mergeable.h"
+        export functional.__functional.ranges_operations
+      }
+      module move_iterator         { private header "__iterator/move_iterator.h" }
+      module move_sentinel         { private header "__iterator/move_sentinel.h" }
+      module next                  { private header "__iterator/next.h" }
+      module ostream_iterator      { private header "__iterator/ostream_iterator.h" }
+      module ostreambuf_iterator   {
+        private header "__iterator/ostreambuf_iterator.h"
+        export iosfwd
+      }
+      module permutable            { private header "__iterator/permutable.h" }
+      module prev                  { private header "__iterator/prev.h" }
+      module projected             { private header "__iterator/projected.h" }
+      module readable_traits       { private header "__iterator/readable_traits.h" }
+      module reverse_access        { private header "__iterator/reverse_access.h" }
+      module reverse_iterator      { private header "__iterator/reverse_iterator.h" }
+      module segmented_iterator    { private header "__iterator/segmented_iterator.h" }
+      module size                  { private header "__iterator/size.h" }
+      module sortable {
+        private header "__iterator/sortable.h"
+        export functional.__functional.ranges_operations
+      }
+      module unreachable_sentinel  { private header "__iterator/unreachable_sentinel.h" }
+      module wrap_iter             { private header "__iterator/wrap_iter.h" }
+    }
+  }
+  module latch {
+    
+    header "latch"
+    export *
+  }
+
+  module __debug_utils {
+    module randomize_range { private header "__debug_utils/randomize_range.h" }
+  }
+
+  module limits {
+    header "limits"
+    export *
+  }
+  module list {
+    header "list"
+    export initializer_list
+    export *
+  }
+  module locale {
+    
+    header "locale"
+    export *
+  }
+  module map {
+    header "map"
+    export initializer_list
+    export *
+  }
+  module memory {
+    header "memory"
+    export *
+
+    module __memory {
+      module addressof                       { private header "__memory/addressof.h" }
+      module align                           { private header "__memory/align.h" }
+      module allocate_at_least               { private header "__memory/allocate_at_least.h" }
+      module allocation_guard                { private header "__memory/allocation_guard.h" }
+      module allocator                       { private header "__memory/allocator.h" }
+      module allocator_arg_t                 { private header "__memory/allocator_arg_t.h" }
+      module allocator_destructor            { private header "__memory/allocator_destructor.h" }
+      module allocator_traits                { private header "__memory/allocator_traits.h" }
+      module assume_aligned                  { private header "__memory/assume_aligned.h" }
+      module auto_ptr                        { private header "__memory/auto_ptr.h" }
+      module builtin_new_allocator           { private header "__memory/builtin_new_allocator.h" }
+      module compressed_pair                 { private header "__memory/compressed_pair.h" }
+      module concepts                        { private header "__memory/concepts.h" }
+      module construct_at                    { private header "__memory/construct_at.h" }
+      module destruct_n                      { private header "__memory/destruct_n.h" }
+      module pointer_traits                  { private header "__memory/pointer_traits.h" }
+      module ranges_construct_at             { private header "__memory/ranges_construct_at.h" }
+      module ranges_uninitialized_algorithms {
+        private header "__memory/ranges_uninitialized_algorithms.h"
+        export algorithm.__algorithm.in_out_result
+      }
+      module raw_storage_iterator            { private header "__memory/raw_storage_iterator.h" }
+      module shared_ptr                      { private header "__memory/shared_ptr.h" }
+      module swap_allocator                  { private header "__memory/swap_allocator.h" }
+      module temp_value                      { private header "__memory/temp_value.h" }
+      module temporary_buffer                { private header "__memory/temporary_buffer.h" }
+      module uninitialized_algorithms        { private header "__memory/uninitialized_algorithms.h" }
+      module unique_ptr                      { private header "__memory/unique_ptr.h" }
+      module uses_allocator                  { private header "__memory/uses_allocator.h" }
+      module uses_allocator_construction     { private header "__memory/uses_allocator_construction.h" }
+      module voidify                         { private header "__memory/voidify.h" }
+    }
+  }
+  module memory_resource {
+    header "memory_resource"
+    export *
+
+    module __memory_resource {
+      module memory_resource              { private header "__memory_resource/memory_resource.h" }
+      module memory_resource_fwd          { private header "__fwd/memory_resource.h" }
+      module monotonic_buffer_resource    { private header "__memory_resource/monotonic_buffer_resource.h" }
+      module polymorphic_allocator        { private header "__memory_resource/polymorphic_allocator.h" }
+      module pool_options                 { private header "__memory_resource/pool_options.h" }
+      module synchronized_pool_resource   { private header "__memory_resource/synchronized_pool_resource.h" }
+      module unsynchronized_pool_resource { private header "__memory_resource/unsynchronized_pool_resource.h" }
+    }
+  }
+  module mutex {
+    
+    header "mutex"
+    export *
+  }
+  module new {
+    header "new"
+    export *
+  }
+  module numbers {
+    header "numbers"
+    export *
+  }
+  module numeric {
+    header "numeric"
+    export *
+
+    module __numeric {
+      module accumulate               { private header "__numeric/accumulate.h" }
+      module adjacent_difference      { private header "__numeric/adjacent_difference.h" }
+      module exclusive_scan           { private header "__numeric/exclusive_scan.h" }
+      module gcd_lcm                  { private header "__numeric/gcd_lcm.h" }
+      module inclusive_scan           { private header "__numeric/inclusive_scan.h" }
+      module inner_product            { private header "__numeric/inner_product.h" }
+      module iota                     { private header "__numeric/iota.h" }
+      module midpoint                 { private header "__numeric/midpoint.h" }
+      module partial_sum              { private header "__numeric/partial_sum.h" }
+      module reduce                   { private header "__numeric/reduce.h" }
+      module transform_exclusive_scan { private header "__numeric/transform_exclusive_scan.h" }
+      module transform_inclusive_scan { private header "__numeric/transform_inclusive_scan.h" }
+      module transform_reduce         { private header "__numeric/transform_reduce.h" }
+    }
+  }
+  module optional {
+    header "optional"
+    export *
+  }
+  module ostream {
+    
+    header "ostream"
+    // FIXME: should re-export ios, streambuf?
+    export *
+  }
+  module queue {
+    header "queue"
+    export initializer_list
+    export *
+  }
+  module random {
+    header "random"
+    export initializer_list
+    export *
+
+    module __random {
+      module bernoulli_distribution          { private header "__random/bernoulli_distribution.h" }
+      module binomial_distribution           { private header "__random/binomial_distribution.h" }
+      module cauchy_distribution             { private header "__random/cauchy_distribution.h" }
+      module chi_squared_distribution        { private header "__random/chi_squared_distribution.h" }
+      module clamp_to_integral               { private header "__random/clamp_to_integral.h" }
+      module default_random_engine           { private header "__random/default_random_engine.h" }
+      module discard_block_engine            { private header "__random/discard_block_engine.h" }
+      module discrete_distribution {
+        private header "__random/discrete_distribution.h"
+        export vector
+      }
+      module exponential_distribution        { private header "__random/exponential_distribution.h" }
+      module extreme_value_distribution      { private header "__random/extreme_value_distribution.h" }
+      module fisher_f_distribution           { private header "__random/fisher_f_distribution.h" }
+      module gamma_distribution              { private header "__random/gamma_distribution.h" }
+      module generate_canonical              { private header "__random/generate_canonical.h" }
+      module geometric_distribution          { private header "__random/geometric_distribution.h" }
+      module independent_bits_engine         { private header "__random/independent_bits_engine.h" }
+      module is_seed_sequence                { private header "__random/is_seed_sequence.h" }
+      module is_valid                        { private header "__random/is_valid.h" }
+      module knuth_b                         { private header "__random/knuth_b.h" }
+      module linear_congruential_engine      { private header "__random/linear_congruential_engine.h" }
+      module log2                            { private header "__random/log2.h" }
+      module lognormal_distribution          { private header "__random/lognormal_distribution.h" }
+      module mersenne_twister_engine         { private header "__random/mersenne_twister_engine.h" }
+      module negative_binomial_distribution  { private header "__random/negative_binomial_distribution.h" }
+      module normal_distribution             { private header "__random/normal_distribution.h" }
+      module piecewise_constant_distribution {
+        private header "__random/piecewise_constant_distribution.h"
+        export vector
+      }
+      module piecewise_linear_distribution {
+        private header "__random/piecewise_linear_distribution.h"
+        export vector
+      }
+      module poisson_distribution            { private header "__random/poisson_distribution.h" }
+      module random_device                   { private header "__random/random_device.h" }
+      module ranlux                          { private header "__random/ranlux.h" }
+      module seed_seq                        { private header "__random/seed_seq.h" }
+      module shuffle_order_engine            { private header "__random/shuffle_order_engine.h" }
+      module student_t_distribution          { private header "__random/student_t_distribution.h" }
+      module subtract_with_carry_engine      { private header "__random/subtract_with_carry_engine.h" }
+      module uniform_int_distribution        { private header "__random/uniform_int_distribution.h" }
+      module uniform_random_bit_generator    { private header "__random/uniform_random_bit_generator.h" }
+      module uniform_real_distribution       { private header "__random/uniform_real_distribution.h" }
+      module weibull_distribution            { private header "__random/weibull_distribution.h" }
+    }
+  }
+  module ranges {
+    header "ranges"
+    export compare
+    export initializer_list
+    export iterator
+    export *
+
+    module __ranges {
+      module access                 { private header "__ranges/access.h" }
+      module all                    {
+        private header "__ranges/all.h"
+        export functional.__functional.compose
+        export functional.__functional.perfect_forward
+      }
+      module as_rvalue_view         { private header "__ranges/as_rvalue_view.h" }
+      module common_view            { private header "__ranges/common_view.h" }
+      module concepts               { private header "__ranges/concepts.h" }
+      module copyable_box           { private header "__ranges/copyable_box.h" }
+      module counted                {
+        private header "__ranges/counted.h"
+        export span
+      }
+      module dangling               { private header "__ranges/dangling.h" }
+      module data                   { private header "__ranges/data.h" }
+      module drop_view              { private header "__ranges/drop_view.h" }
+      module drop_while_view        { private header "__ranges/drop_while_view.h" }
+      module elements_view          { private header "__ranges/elements_view.h" }
+      module empty                  { private header "__ranges/empty.h" }
+      module empty_view             { private header "__ranges/empty_view.h" }
+      module enable_borrowed_range  { private header "__ranges/enable_borrowed_range.h" }
+      module enable_view            { private header "__ranges/enable_view.h" }
+      module filter_view            { private header "__ranges/filter_view.h" }
+      module iota_view              { private header "__ranges/iota_view.h" }
+      module istream_view           {
+        
+        private header "__ranges/istream_view.h"
+      }
+      module join_view              { private header "__ranges/join_view.h" }
+      module lazy_split_view        { private header "__ranges/lazy_split_view.h" }
+      module non_propagating_cache  { private header "__ranges/non_propagating_cache.h" }
+      module owning_view            { private header "__ranges/owning_view.h" }
+      module range_adaptor          { private header "__ranges/range_adaptor.h" }
+      module rbegin                 { private header "__ranges/rbegin.h" }
+      module ref_view               { private header "__ranges/ref_view.h" }
+      module rend                   { private header "__ranges/rend.h" }
+      module reverse_view           { private header "__ranges/reverse_view.h" }
+      module single_view            { private header "__ranges/single_view.h" }
+      module size                   { private header "__ranges/size.h" }
+      module split_view             { private header "__ranges/split_view.h" }
+      module subrange               {
+        private header "__ranges/subrange.h"
+
+        module subrange_fwd { private header "__fwd/subrange.h" }
+      }
+      module take_view              { private header "__ranges/take_view.h" }
+      module take_while_view        { private header "__ranges/take_while_view.h" }
+      module transform_view         {
+        private header "__ranges/transform_view.h"
+        export functional.__functional.bind_back
+        export functional.__functional.perfect_forward
+      }
+      module view_interface         { private header "__ranges/view_interface.h" }
+      module views                  { private header "__ranges/views.h" }
+      module zip_view               { private header "__ranges/zip_view.h" }
+    }
+  }
+  module ratio {
+    header "ratio"
+    export *
+  }
+  module regex {
+    
+    header "regex"
+    export initializer_list
+    export *
+  }
+  module scoped_allocator {
+    header "scoped_allocator"
+    export *
+  }
+  module semaphore {
+    
+    header "semaphore"
+    export *
+  }
+  module set {
+    header "set"
+    export initializer_list
+    export *
+  }
+  module shared_mutex {
+    
+    header "shared_mutex"
+    export version
+  }
+  module source_location {
+    header "source_location"
+    export *
+  }
+  module span {
+    header "span"
+    export ranges.__ranges.enable_borrowed_range
+    export version
+    module span_fwd { private header "__fwd/span.h" }
+  }
+  module sstream {
+    
+    header "sstream"
+    // FIXME: should re-export istream, ostream, ios, streambuf, string?
+    export *
+  }
+  module stack {
+    header "stack"
+    export initializer_list
+    export *
+  }
+  module stdexcept {
+    header "stdexcept"
+    export *
+  }
+  module streambuf {
+    
+    header "streambuf"
+    export *
+  }
+  module string {
+    header "string"
+    export initializer_list
+    export string_view
+    module __string {
+      module char_traits           { private header "__string/char_traits.h" }
+      module extern_template_lists { private header "__string/extern_template_lists.h" }
+      module string_fwd            { private header "__fwd/string.h" }
+    }
+    export *
+  }
+  module string_view {
+    header "string_view"
+    export initializer_list
+    export *
+    module string_view_fwd { private header "__fwd/string_view.h" }
+  }
+  module strstream {
+    
+    header "strstream"
+    export *
+  }
+  module system_error {
+    header "system_error"
+    export *
+  }
+  module thread {
+    
+    header "thread"
+    export *
+
+    module __thread {
+      module poll_with_backoff    { private header "__thread/poll_with_backoff.h" }
+      module timed_backoff_policy { private header "__thread/timed_backoff_policy.h" }
+    }
+  }
+  module tuple {
+    header "tuple"
+    export *
+
+    module apply_cv         { private header "__tuple_dir/apply_cv.h" }
+    module get_fwd          { private header "__fwd/get.h" }
+    module make_tuple_types { private header "__tuple_dir/make_tuple_types.h" }
+    module pair_like        { private header "__tuple_dir/pair_like.h" }
+    module sfinae_helpers   { private header "__tuple_dir/sfinae_helpers.h" }
+    module tuple_element    { private header "__tuple_dir/tuple_element.h" }
+    module tuple_fwd        { private header "__fwd/tuple.h" }
+    module tuple_indices    { private header "__tuple_dir/tuple_indices.h" }
+    module tuple_like       { private header "__tuple_dir/tuple_like.h" }
+    module tuple_like_ext   { private header "__tuple_dir/tuple_like_ext.h" }
+    module tuple_size       { private header "__tuple_dir/tuple_size.h" }
+    module tuple_types      { private header "__tuple_dir/tuple_types.h" }
+  }
+  module type_traits {
+    header "type_traits"
+    export functional.__functional.unwrap_ref
+    export *
+
+    module add_const                           { private header "__type_traits/add_const.h" }
+    module add_cv                              { private header "__type_traits/add_cv.h" }
+    module add_lvalue_reference                { private header "__type_traits/add_lvalue_reference.h" }
+    module add_pointer                         { private header "__type_traits/add_pointer.h" }
+    module add_rvalue_reference                { private header "__type_traits/add_rvalue_reference.h" }
+    module add_volatile                        { private header "__type_traits/add_volatile.h" }
+    module aligned_storage                     { private header "__type_traits/aligned_storage.h" }
+    module aligned_union                       { private header "__type_traits/aligned_union.h" }
+    module alignment_of                        { private header "__type_traits/alignment_of.h" }
+    module apply_cv                            { private header "__type_traits/apply_cv.h" }
+    module can_extract_key                     { private header "__type_traits/can_extract_key.h" }
+    module common_reference                    { private header "__type_traits/common_reference.h" }
+    module common_type                         { private header "__type_traits/common_type.h" }
+    module conditional                         { private header "__type_traits/conditional.h" }
+    module conjunction                         { private header "__type_traits/conjunction.h" }
+    module copy_cv                             { private header "__type_traits/copy_cv.h" }
+    module copy_cvref                          { private header "__type_traits/copy_cvref.h" }
+    module decay                               { private header "__type_traits/decay.h" }
+    module dependent_type                      { private header "__type_traits/dependent_type.h" }
+    module disjunction                         { private header "__type_traits/disjunction.h" }
+    module enable_if                           { private header "__type_traits/enable_if.h" }
+    module extent                              { private header "__type_traits/extent.h" }
+    module has_unique_object_representation    { private header "__type_traits/has_unique_object_representation.h" }
+    module has_virtual_destructor              { private header "__type_traits/has_virtual_destructor.h" }
+    module integral_constant                   { private header "__type_traits/integral_constant.h" }
+    module is_abstract                         { private header "__type_traits/is_abstract.h" }
+    module is_aggregate                        { private header "__type_traits/is_aggregate.h" }
+    module is_allocator                        { private header "__type_traits/is_allocator.h" }
+    module is_always_bitcastable               { private header "__type_traits/is_always_bitcastable.h" }
+    module is_arithmetic {
+      private header "__type_traits/is_arithmetic.h"
+      export integral_constant
+    }
+    module is_array                            {
+      private header "__type_traits/is_array.h"
+      export integral_constant
+    }
+    module is_assignable                       { private header "__type_traits/is_assignable.h" }
+    module is_base_of                          { private header "__type_traits/is_base_of.h" }
+    module is_bounded_array                    { private header "__type_traits/is_bounded_array.h" }
+    module is_callable                         { private header "__type_traits/is_callable.h" }
+    module is_char_like_type                   { private header "__type_traits/is_char_like_type.h" }
+    module is_class                            { private header "__type_traits/is_class.h" }
+    module is_compound                         { private header "__type_traits/is_compound.h" }
+    module is_const                            { private header "__type_traits/is_const.h" }
+    module is_constant_evaluated               { private header "__type_traits/is_constant_evaluated.h" }
+    module is_constructible                    { private header "__type_traits/is_constructible.h" }
+    module is_convertible                      { private header "__type_traits/is_convertible.h" }
+    module is_copy_assignable                  { private header "__type_traits/is_copy_assignable.h" }
+    module is_copy_constructible               { private header "__type_traits/is_copy_constructible.h" }
+    module is_core_convertible                 {
+      private header "__type_traits/is_core_convertible.h"
+      export integral_constant
+    }
+    module is_default_constructible            { private header "__type_traits/is_default_constructible.h" }
+    module is_destructible                     { private header "__type_traits/is_destructible.h" }
+    module is_empty                            { private header "__type_traits/is_empty.h" }
+    module is_enum                             { private header "__type_traits/is_enum.h" }
+    module is_final                            { private header "__type_traits/is_final.h" }
+    module is_floating_point                   { private header "__type_traits/is_floating_point.h" }
+    module is_function                         { private header "__type_traits/is_function.h" }
+    module is_fundamental                      { private header "__type_traits/is_fundamental.h" }
+    module is_implicitly_default_constructible { private header "__type_traits/is_implicitly_default_constructible.h" }
+    module is_integral                         { private header "__type_traits/is_integral.h" }
+    module is_literal_type                     { private header "__type_traits/is_literal_type.h" }
+    module is_member_function_pointer          { private header "__type_traits/is_member_function_pointer.h" }
+    module is_member_object_pointer            { private header "__type_traits/is_member_object_pointer.h" }
+    module is_member_pointer                   { private header "__type_traits/is_member_pointer.h" }
+    module is_move_assignable                  { private header "__type_traits/is_move_assignable.h" }
+    module is_move_constructible               { private header "__type_traits/is_move_constructible.h" }
+    module is_nothrow_assignable               { private header "__type_traits/is_nothrow_assignable.h" }
+    module is_nothrow_constructible            { private header "__type_traits/is_nothrow_constructible.h" }
+    module is_nothrow_convertible              { private header "__type_traits/is_nothrow_convertible.h" }
+    module is_nothrow_copy_assignable          { private header "__type_traits/is_nothrow_copy_assignable.h" }
+    module is_nothrow_copy_constructible       { private header "__type_traits/is_nothrow_copy_constructible.h" }
+    module is_nothrow_default_constructible    { private header "__type_traits/is_nothrow_default_constructible.h" }
+    module is_nothrow_destructible             { private header "__type_traits/is_nothrow_destructible.h" }
+    module is_nothrow_move_assignable          { private header "__type_traits/is_nothrow_move_assignable.h" }
+    module is_nothrow_move_constructible       { private header "__type_traits/is_nothrow_move_constructible.h" }
+    module is_null_pointer                     { private header "__type_traits/is_null_pointer.h" }
+    module is_object                           { private header "__type_traits/is_object.h" }
+    module is_pod                              { private header "__type_traits/is_pod.h" }
+    module is_pointer                          { private header "__type_traits/is_pointer.h" }
+    module is_polymorphic                      { private header "__type_traits/is_polymorphic.h" }
+    module is_primary_template                 { private header "__type_traits/is_primary_template.h" }
+    module is_reference                        { private header "__type_traits/is_reference.h" }
+    module is_reference_wrapper                { private header "__type_traits/is_reference_wrapper.h" }
+    module is_referenceable                    { private header "__type_traits/is_referenceable.h" }
+    module is_same                             {
+      private header "__type_traits/is_same.h"
+      export type_traits.integral_constant
+    }
+    module is_scalar                           { private header "__type_traits/is_scalar.h" }
+    module is_scoped_enum                      { private header "__type_traits/is_scoped_enum.h" }
+    module is_signed                           { private header "__type_traits/is_signed.h" }
+    module is_signed_integer                   { private header "__type_traits/is_signed_integer.h" }
+    module is_specialization                   { private header "__type_traits/is_specialization.h" }
+    module is_standard_layout                  { private header "__type_traits/is_standard_layout.h" }
+    module is_swappable                        { private header "__type_traits/is_swappable.h" }
+    module is_trivial                          { private header "__type_traits/is_trivial.h" }
+    module is_trivially_assignable             { private header "__type_traits/is_trivially_assignable.h" }
+    module is_trivially_constructible          { private header "__type_traits/is_trivially_constructible.h" }
+    module is_trivially_copy_assignable        { private header "__type_traits/is_trivially_copy_assignable.h" }
+    module is_trivially_copy_constructible     { private header "__type_traits/is_trivially_copy_constructible.h" }
+    module is_trivially_copyable               { private header "__type_traits/is_trivially_copyable.h" }
+    module is_trivially_default_constructible  { private header "__type_traits/is_trivially_default_constructible.h" }
+    module is_trivially_destructible           { private header "__type_traits/is_trivially_destructible.h" }
+    module is_trivially_move_assignable        { private header "__type_traits/is_trivially_move_assignable.h" }
+    module is_trivially_move_constructible     { private header "__type_traits/is_trivially_move_constructible.h" }
+    module is_unbounded_array                  { private header "__type_traits/is_unbounded_array.h" }
+    module is_union                            { private header "__type_traits/is_union.h" }
+    module is_unsigned                         { private header "__type_traits/is_unsigned.h" }
+    module is_unsigned_integer                 { private header "__type_traits/is_unsigned_integer.h" }
+    module is_valid_expansion                  { private header "__type_traits/is_valid_expansion.h" }
+    module is_void                             {
+      private header "__type_traits/is_void.h"
+      export integral_constant
+    }
+    module is_volatile                         { private header "__type_traits/is_volatile.h" }
+    module lazy                                { private header "__type_traits/lazy.h" }
+    module make_32_64_or_128_bit               { private header "__type_traits/make_32_64_or_128_bit.h" }
+    module make_const_lvalue_ref               { private header "__type_traits/make_const_lvalue_ref.h" }
+    module make_signed                         { private header "__type_traits/make_signed.h" }
+    module make_unsigned                       { private header "__type_traits/make_unsigned.h" }
+    module maybe_const                         { private header "__type_traits/maybe_const.h" }
+    module nat                                 { private header "__type_traits/nat.h" }
+    module negation                            { private header "__type_traits/negation.h" }
+    module noexcept_move_assign_container      { private header "__type_traits/noexcept_move_assign_container.h" }
+    module promote                             { private header "__type_traits/promote.h" }
+    module rank                                { private header "__type_traits/rank.h" }
+    module remove_all_extents                  { private header "__type_traits/remove_all_extents.h" }
+    module remove_const                        { private header "__type_traits/remove_const.h" }
+    module remove_const_ref                    { private header "__type_traits/remove_const_ref.h" }
+    module remove_cv                           { private header "__type_traits/remove_cv.h" }
+    module remove_cvref                        { private header "__type_traits/remove_cvref.h" }
+    module remove_extent                       { private header "__type_traits/remove_extent.h" }
+    module remove_pointer                      { private header "__type_traits/remove_pointer.h" }
+    module remove_reference                    { private header "__type_traits/remove_reference.h" }
+    module remove_volatile                     { private header "__type_traits/remove_volatile.h" }
+    module result_of                           { private header "__type_traits/result_of.h" }
+    module strip_signature                     { private header "__type_traits/strip_signature.h" }
+    module type_identity                       { private header "__type_traits/type_identity.h" }
+    module type_list                           { private header "__type_traits/type_list.h" }
+    module underlying_type                     { private header "__type_traits/underlying_type.h" }
+    module void_t                              { private header "__type_traits/void_t.h" }
+  }
+  module typeindex {
+    header "typeindex"
+    export *
+  }
+  module typeinfo {
+    header "typeinfo"
+    export *
+  }
+  module unordered_map {
+    header "unordered_map"
+    export initializer_list
+    export *
+  }
+  module unordered_set {
+    header "unordered_set"
+    export initializer_list
+    export *
+  }
+  module utility {
+    header "utility"
+    export initializer_list
+    export *
+
+    module __utility {
+      module as_const            { private header "__utility/as_const.h" }
+      module auto_cast           { private header "__utility/auto_cast.h" }
+      module cmp                 { private header "__utility/cmp.h" }
+      module convert_to_integral { private header "__utility/convert_to_integral.h" }
+      module declval             { private header "__utility/declval.h" }
+      module exception_guard     { private header "__utility/exception_guard.h" }
+      module exchange            { private header "__utility/exchange.h" }
+      module forward             { private header "__utility/forward.h" }
+      module forward_like        { private header "__utility/forward_like.h" }
+      module in_place            { private header "__utility/in_place.h" }
+      module integer_sequence    { private header "__utility/integer_sequence.h" }
+      module move                { private header "__utility/move.h" }
+      module pair                { private header "__utility/pair.h" }
+      module pair_fwd            { private header "__fwd/pair.h" }
+      module piecewise_construct { private header "__utility/piecewise_construct.h" }
+      module priority_tag        { private header "__utility/priority_tag.h" }
+      module rel_ops             { private header "__utility/rel_ops.h" }
+      module swap                { private header "__utility/swap.h" }
+      module to_underlying       { private header "__utility/to_underlying.h" }
+      module unreachable         { private header "__utility/unreachable.h" }
+    }
+  }
+  module valarray {
+    header "valarray"
+    export initializer_list
+    export *
+  }
+  module variant {
+    header "variant"
+    export *
+
+    module __variant {
+      module monostate { private header "__variant/monostate.h" }
+    }
+  }
+  module vector {
+    header "vector"
+    export initializer_list
+    export *
+  }
+  module version {
+    header "version"
+    export *
+  }
+
+  // FIXME: These should be private.
+  module __assert            {         header "__assert"            export * }
+  module __availability      { private header "__availability"      export * }
+  module __bit_reference     { private header "__bit_reference"     export * }
+  module __debug             {         header "__debug"             export * }
+  module __errc              { private header "__errc"              export * }
+  module __hash_table        {         header "__hash_table"        export * }
+  module __locale            {
+    
+    private header "__locale" export *
+  }
+  module __mbstate_t         { private header "__mbstate_t.h"       export * }
+  module __mutex_base        { private header "__mutex_base"        export * }
+  module __node_handle       { private header "__node_handle"       export * }
+  module __split_buffer      { private header "__split_buffer"      export * }
+  module __std_stream        {
+    
+    private header "__std_stream" export *
+  }
+  module __threading_support {         header "__threading_support" export * }
+  module __tree              {         header "__tree"              export * }
+  module __undef_macros      {         header "__undef_macros"      export * }
+  module __verbose_abort     {         header "__verbose_abort"     export * }
+
+  module experimental {
+    requires cplusplus11
+
+    module algorithm {
+      header "experimental/algorithm"
+      export *
+    }
+    module coroutine {
+      requires coroutines
+      header "experimental/coroutine"
+      export *
+    }
+    module deque {
+      header "experimental/deque"
+      export *
+    }
+    module forward_list {
+      header "experimental/forward_list"
+      export *
+    }
+    module functional {
+      header "experimental/functional"
+      export *
+    }
+    module iterator {
+      header "experimental/iterator"
+      export *
+    }
+    module list {
+      header "experimental/list"
+      export *
+    }
+    module map {
+      header "experimental/map"
+      export *
+    }
+    module memory_resource {
+      header "experimental/memory_resource"
+      export *
+    }
+    module propagate_const {
+      header "experimental/propagate_const"
+      export *
+    }
+    module regex {
+      
+      header "experimental/regex"
+      export *
+    }
+    module simd {
+      header "experimental/simd"
+      export *
+    }
+    module set {
+      header "experimental/set"
+      export *
+    }
+    module span {
+      header "span"
+      export *
+    }
+    module string {
+      header "experimental/string"
+      export *
+    }
+    module type_traits {
+      header "experimental/type_traits"
+      export *
+    }
+    module unordered_map {
+      header "experimental/unordered_map"
+      export *
+    }
+    module unordered_set {
+      header "experimental/unordered_set"
+      export *
+    }
+    module utility {
+      header "experimental/utility"
+      export *
+    }
+    module vector {
+      header "experimental/vector"
+      export *
+    }
+    // FIXME these should be private
+    module __memory {
+      header "experimental/__memory"
+      export *
+    }
+  } // end experimental
+}
diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd14.1.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.1.modulemap
new file mode 100644
index 000000000000..2ddc12f4da1b
--- /dev/null
+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd14.1.modulemap
@@ -0,0 +1 @@
+interpreter-cling-include-cling-std__fbsd15.0.modulemap
diff --git a/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap b/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap
new file mode 100644
index 000000000000..adfef3b96f94
--- /dev/null
+++ b/devel/root/files/interpreter-cling-include-cling-std__fbsd15.0.modulemap
@@ -0,0 +1,2094 @@
+// FreeBSD port maintainer note:
+// Taken from
+// https://github.com/freebsd/freebsd-src/blob/main/lib/libc%2B%2B/module.modulemap
+// on 2024-05-15.
+// Outer "module std [system] { }" block has been added.
+// Lines 577-580 of this file have been commented out to fix build on FreeBSD 15.0.
+//
+// Addendum 2024-06-03:
+// src/lib/libc++/module.modulemap are identical on 15.0-CURRENT and 14.1-RELEASE;
+// that of 14.1-RELEASE is located at
+// https://github.com/freebsd/freebsd-src/blob/release/14.1.0/lib/libc%2B%2B/module.modulemap.
+// Symlinking interpreter-cling-include-cling-std__fbsd14.1.modulemap to
+// interpreter-cling-include-cling-std__fbsd15.0.modulemap for patching.
+
+// Main C++ standard library interfaces
+module std [system] {
+  export *
+  
+  module std_algorithm [system] {
+    header "algorithm"
+    export *
+  }
+  module std_any [system] {
+    header "any"
+    export *
+  }
+  module std_array [system] {
+    header "array"
+    export *
+  }
+  module std_atomic [system] {
+    header "atomic"
+    export *
+  }
+  module std_barrier [system] {
+    header "barrier"
+    export *
+  }
+  module std_bit [system] {
+    header "bit"
+    export *
+  }
+  module std_bitset [system] {
+    header "bitset"
+    export *
+  }
+  module std_charconv [system] {
+    header "charconv"
+    export *
+  }
+  module std_chrono [system] {
+    header "chrono"
+    export *
+  }
+  module std_codecvt [system] {
+    header "codecvt"
+    export *
+  }
+  module std_compare [system] {
+    header "compare"
+    export *
+  }
+  module std_complex [system] {
+    header "complex"
+    export *
+  }
+  module std_concepts [system] {
+    header "concepts"
+    export *
+  }
+  module std_condition_variable [system] {
+    header "condition_variable"
+    export *
+  }
+  module std_coroutine [system] {
+    header "coroutine"
+    export *
+  }
+  module std_deque [system] {
+    header "deque"
+    export *
+  }
+  module std_exception [system] {
+    header "exception"
+    export *
+  }
+  module std_execution [system] {
+    header "execution"
+    export *
+  }
+  module std_expected [system] {
+    header "expected"
+    export *
+  }
+  module std_filesystem [system] {
+    header "filesystem"
+    export *
+  }
+  module std_format [system] {
+    header "format"
+    export *
+  }
+  module std_forward_list [system] {
+    header "forward_list"
+    export *
+  }
+  module std_fstream [system] {
+    header "fstream"
+    export *
+  }
+  module std_functional [system] {
+    header "functional"
+    export *
+  }
+  module std_future [system] {
+    header "future"
+    export *
+  }
+  module std_initializer_list [system] {
+    header "initializer_list"
+    export *
+  }
+  module std_iomanip [system] {
+    header "iomanip"
+    export *
+  }
+  module std_ios [system] {
+    header "ios"
+    export *
+  }
+  module std_iosfwd [system] {
+    header "iosfwd"
+    export *
+  }
+  module std_iostream [system] {
+    header "iostream"
+    export *
+  }
+  module std_istream [system] {
+    header "istream"
+    export *
+  }
+  module std_iterator [system] {
+    header "iterator"
+    export *
+  }
+  module std_latch [system] {
+    header "latch"
+    export *
+  }
+  module std_limits [system] {
+    header "limits"
+    export *
+  }
+  module std_list [system] {
+    header "list"
+    export *
+  }
+  module std_locale [system] {
+    header "locale"
+    export *
+  }
+  module std_map [system] {
+    header "map"
+    export *
+  }
+  module std_mdspan [system] {
+    header "mdspan"
+    export *
+  }
+  module std_memory [system] {
+    header "memory"
+    export *
+  }
+  module std_memory_resource [system] {
+    header "memory_resource"
+    export *
+  }
+  module std_mutex [system] {
+    header "mutex"
+    export *
+  }
+  module std_new [system] {
+    header "new"
+    export *
+  }
+  module std_numbers [system] {
+    header "numbers"
+    export *
+  }
+  module std_numeric [system] {
+    header "numeric"
+    export *
+  }
+  module std_optional [system] {
+    header "optional"
+    export *
+  }
+  module std_ostream [system] {
+    header "ostream"
+    export *
+  }
+  module std_print [system] {
+    header "print"
+    export *
+  }
+  module std_queue [system] {
+    header "queue"
+    export *
+  }
+  module std_random [system] {
+    header "random"
+    export *
+  }
+  module std_ranges [system] {
+    header "ranges"
+    export *
+  }
+  module std_ratio [system] {
+    header "ratio"
+    export *
+  }
+  module std_regex [system] {
+    header "regex"
+    export *
+  }
+  module std_scoped_allocator [system] {
+    header "scoped_allocator"
+    export *
+  }
+  module std_semaphore [system] {
+    header "semaphore"
+    export *
+  }
+  module std_set [system] {
+    header "set"
+    export *
+  }
+  module std_shared_mutex [system] {
+    header "shared_mutex"
+    export std_version
+  }
+  module std_source_location [system] {
+    header "source_location"
+    export *
+  }
+  module std_span [system] {
+    header "span"
+    export std_private_ranges_enable_borrowed_range
+    export std_version
+    export std_private_span_span_fwd
+  }
+  module std_sstream [system] {
+    header "sstream"
+    export *
+  }
+  module std_stack [system] {
+    header "stack"
+    export *
+  }
+  module std_stdexcept [system] {
+    header "stdexcept"
+    export *
+  }
+  module std_stop_token {
+    header "stop_token"
+    export *
+  }
+  module std_streambuf [system] {
+    header "streambuf"
+    export *
+  }
+  module std_string [system] {
+    header "string"
+    export *
+  }
+  module std_string_view [system] {
+    header "string_view"
+    export *
+  }
+  module std_strstream [system] {
+    header "strstream"
+    export *
+  }
+  module std_syncstream [system] {
+    header "syncstream"
+    export *
+  }
+  module std_system_error [system] {
+    header "system_error"
+    export *
+  }
+  module std_thread [system] {
+    header "thread"
+    export *
+  }
+  module std_tuple [system] {
+    header "tuple"
+    export *
+  }
+  module std_type_traits [system] {
+    header "type_traits"
+    export *
+  }
+  module std_typeindex [system] {
+    header "typeindex"
+    export *
+  }
+  module std_typeinfo [system] {
+    header "typeinfo"
+    export *
+  }
+  module std_unordered_map [system] {
+    header "unordered_map"
+    export *
+  }
+  module std_unordered_set [system] {
+    header "unordered_set"
+    export *
+  }
+  module std_utility [system] {
+    header "utility"
+    export *
+  }
+  module std_valarray [system] {
+    header "valarray"
+    export *
+  }
+  module std_variant [system] {
+    header "variant"
+    export *
+  }
+  module std_vector [system] {
+    header "vector"
+    export *
+  }
+  module std_version [system] {
+    header "version"
+    export *
+  }
+
+  // C standard library interface wrappers
+  module std_cassert [system] {
+    // <cassert>'s use of NDEBUG requires textual inclusion.
+    textual header "cassert"
+  }
+  module std_ccomplex [system] {
+    header "ccomplex"
+    export *
+  }
+  module std_cctype [system] {
+    header "cctype"
+    export *
+  }
+  module std_cerrno [system] {
+    header "cerrno"
+    export *
+  }
+  module std_cfenv [system] {
+    header "cfenv"
+    export *
+  }
+  module std_cfloat [system] {
+    header "cfloat"
+    export *
+  }
+  module std_cinttypes [system] {
+    header "cinttypes"
+    export *
+  }
+  module std_ciso646 [system] {
+    header "ciso646"
+    export *
+  }
+  module std_climits [system] {
+    header "climits"
+    export *
+  }
+  module std_clocale [system] {
+    header "clocale"
+    export *
+  }
+  module std_cmath [system] {
+    header "cmath"
+    export *
+  }
+  module std_csetjmp [system] {
+    header "csetjmp"
+    export *
+  }
+  module std_csignal [system] {
+    header "csignal"
+    export *
+  }
+  // FIXME: <cstdalign> is missing.
+  module std_cstdarg [system] {
+    header "cstdarg"
+    export *
+  }
+  module std_cstdbool [system] {
+    header "cstdbool"
+    export *
+  }
+  module std_cstddef [system] {
+    header "cstddef"
+    export *
+  }
+  module std_cstdint [system] {
+    header "cstdint"
+    export *
+  }
+  module std_cstdio [system] {
+    header "cstdio"
+    export *
+  }
+  module std_cstdlib [system] {
+    header "cstdlib"
+    export *
+  }
+  module std_cstring [system] {
+    header "cstring"
+    export *
+  }
+  module std_ctgmath [system] {
+    header "ctgmath"
+    export *
+  }
+  module std_ctime [system] {
+    header "ctime"
+    export *
+  }
+  module std_cuchar [system] {
+    header "cuchar"
+    export *
+  }
+  module std_cwchar [system] {
+    header "cwchar"
+    export *
+  }
+  module std_cwctype [system] {
+    header "cwctype"
+    export *
+  }
+
+  // C standard library interfaces augmented/replaced in C++
+  // <assert.h> provided by C library.
+  module std_complex_h [system] {
+    header "complex.h"
+    export *
+  }
+  module std_ctype_h [system] {
+    header "ctype.h"
+    export *
+  }
+  module std_errno_h [system] {
+    header "errno.h"
+    export *
+  }
+  module std_fenv_h [system] {
+    header "fenv.h"
+    export *
+  }
+  module std_float_h [system] {
+    header "float.h"
+    export *
+  }
+  module std_inttypes_h [system] {
+    header "inttypes.h"
+    export *
+  }
+  // <iso646.h> provided by compiler.
+  module std_locale_h [system] {
+    header "locale.h"
+    export *
+  }
+  module std_math_h [system] {
+    header "math.h"
+    export *
+  }
+  // <setjmp.h> provided by C library.
+  // <signal.h> provided by C library.
+  // FIXME: <stdalign.h> is missing.
+  // <stdarg.h> provided by compiler.
+  module std_stdatomic_h [system] {
+    header "stdatomic.h"
+    export *
+  }
+  module std_stdbool_h [system] {
+    // <stdbool.h>'s __bool_true_false_are_defined macro requires textual inclusion.
+    textual header "stdbool.h"
+    export *
+  }
+  module std_stddef_h [system] {
+    // <stddef.h>'s __need_* macros require textual inclusion.
+    textual header "stddef.h"
+    export *
+  }
+  module std_stdint_h [system] {
+    header "stdint.h"
+    export *
+  }
+  module std_stdio_h [system] {
+    // <stdio.h>'s __need_* macros require textual inclusion.
+    textual header "stdio.h"
+    export *
+  }
+  module std_stdlib_h [system] {
+    // <stdlib.h>'s __need_* macros require textual inclusion.
+    textual header "stdlib.h"
+    export *
+  }
+  module std_string_h [system] {
+    header "string.h"
+    export *
+  }
+  module std_tgmath_h [system] {
+    header "tgmath.h"
+    export *
+  }
+  module std_uchar_h [system] {
+    header "uchar.h"
+    export *
+  }
+  // <time.h> provided by C library.
+  module std_wchar_h [system] {
+    // <wchar.h>'s __need_* macros require textual inclusion.
+    textual header "wchar.h"
+    export *
+  }
+  module std_wctype_h [system] {
+    header "wctype.h"
+    export *
+  }
+
+  // Experimental C++ standard library interfaces
+  module std_experimental [system] {
+    module iterator {
+      header "experimental/iterator"
+      export *
+    }
+    module memory {
+      header "experimental/memory"
+      export *
+    }
+    module propagate_const {
+      header "experimental/propagate_const"
+      export *
+    }
+    module simd {
+      module aligned_tag          { private header "experimental/__simd/aligned_tag.h" }
+      module declaration          { private header "experimental/__simd/declaration.h" }
+      module reference            { private header "experimental/__simd/reference.h" }
+      module scalar               { private header "experimental/__simd/scalar.h" }
+      module simd                 { private header "experimental/__simd/simd.h" }
+      module simd_mask            { private header "experimental/__simd/simd_mask.h" }
+      module traits               { private header "experimental/__simd/traits.h" }
+      module utility              { private header "experimental/__simd/utility.h" }
+      module vec_ext              { private header "experimental/__simd/vec_ext.h" }
+
+      header "experimental/simd"
+      export *
+    }
+    module type_traits {
+      header "experimental/type_traits"
+      export *
+    }
+    module utility {
+      header "experimental/utility"
+      export *
+    }
+    module __config {
+      textual header "experimental/__config"
+      export *
+    }
+    // FIXME these should be private
+    module __memory {
+      header "experimental/__memory"
+      export *
+    }
+  }
+
+  // Convenience method to get all of the above modules in a single import statement.
+  // Importing only the needed modules is likely to be more performant.
+  // module std [system] {
+  //   header "__std_clang_module"
+  //   export *
+  // }
+
+  // Implementation detail headers that are private to libc++. These modules
+  // must not be directly imported.
+  module std_private_assert            [system] {
+    header "__assert"
+    export *
+  }
+  module std_private_availability      [system] {
+    header "__availability"
+    export *
+  }
+  module std_private_bit_reference     [system] {
+    header "__bit_reference"
+    export *
+  }
+  module std_private_fwd_bit_reference [system] {
+    header "__fwd/bit_reference.h"
+  }
+  module std_private_config            [system] {
+    textual header "__config"
+    export *
+  }
+  module std_private_hash_table        [system] {
+    header "__hash_table"
+    export *
+  }
+  module std_private_locale            [system] {
+    header "__locale"
+    export *
+  }
+  module std_private_mbstate_t         [system] {
+    header "__mbstate_t.h"
+    export *
+  }
+  module std_private_node_handle       [system] {
+    header "__node_handle"
+    export *
+  }
+  module std_private_split_buffer      [system] {
+    header "__split_buffer"
+    export *
+  }
+  module std_private_std_mbstate_t     [system] {
+    header "__std_mbstate_t.h"
+    export *
+  }
+  module std_private_threading_support [system] {
+    header "__threading_support"
+    export *
+  }
+  module std_private_tree              [system] {
+    header "__tree"
+    export *
+  }
+  module std_private_undef_macros      [system] {
+    textual header "__undef_macros"
+    export *
+  }
+  module std_private_verbose_abort     [system] {
+    header "__verbose_abort"
+    export *
+  }
+
+  module std_private_algorithm_adjacent_find                               [system] { header "__algorithm/adjacent_find.h" }
+  module std_private_algorithm_all_of                                      [system] { header "__algorithm/all_of.h" }
+  module std_private_algorithm_any_of                                      [system] { header "__algorithm/any_of.h" }
+  module std_private_algorithm_binary_search                               [system] { header "__algorithm/binary_search.h" }
+  module std_private_algorithm_clamp                                       [system] { header "__algorithm/clamp.h" }
+  module std_private_algorithm_comp                                        [system] { header "__algorithm/comp.h" }
+  module std_private_algorithm_comp_ref_type                               [system] { header "__algorithm/comp_ref_type.h" }
+  module std_private_algorithm_copy                                        [system] {
+    header "__algorithm/copy.h"
+    export std_private_algorithm_copy_move_common
+  }
+  module std_private_algorithm_copy_backward                               [system] { header "__algorithm/copy_backward.h" }
+  module std_private_algorithm_copy_if                                     [system] { header "__algorithm/copy_if.h" }
+  module std_private_algorithm_copy_move_common                            [system] {
+    header "__algorithm/copy_move_common.h"
+    export std_private_type_traits_is_trivially_copyable
+  }
+  module std_private_algorithm_copy_n                                      [system] { header "__algorithm/copy_n.h" }
+  module std_private_algorithm_count                                       [system] { header "__algorithm/count.h" }
+  module std_private_algorithm_count_if                                    [system] { header "__algorithm/count_if.h" }
+  module std_private_algorithm_equal                                       [system] { header "__algorithm/equal.h" }
+  module std_private_algorithm_equal_range                                 [system] { header "__algorithm/equal_range.h" }
+  module std_private_algorithm_fill                                        [system] { header "__algorithm/fill.h" }
+  module std_private_algorithm_fill_n                                      [system] { header "__algorithm/fill_n.h" }
+  module std_private_algorithm_find                                        [system] {
+    header "__algorithm/find.h"
+    export std_private_algorithm_unwrap_iter
+  }
+  module std_private_algorithm_find_end                                    [system] { header "__algorithm/find_end.h" }
+  module std_private_algorithm_find_first_of                               [system] { header "__algorithm/find_first_of.h" }
+  module std_private_algorithm_find_if                                     [system] { header "__algorithm/find_if.h" }
+  module std_private_algorithm_find_if_not                                 [system] { header "__algorithm/find_if_not.h" }
+  module std_private_algorithm_find_segment_if                             [system] { header "__algorithm/find_segment_if.h" }
+  module std_private_algorithm_fold                                        [system] { header "__algorithm/fold.h" }
+  module std_private_algorithm_for_each                                    [system] { header "__algorithm/for_each.h" }
+  module std_private_algorithm_for_each_n                                  [system] { header "__algorithm/for_each_n.h" }
+  module std_private_algorithm_for_each_segment                            [system] { header "__algorithm/for_each_segment.h" }
+  module std_private_algorithm_generate                                    [system] { header "__algorithm/generate.h" }
+  module std_private_algorithm_generate_n                                  [system] { header "__algorithm/generate_n.h" }
+  module std_private_algorithm_half_positive                               [system] { header "__algorithm/half_positive.h" }
+  module std_private_algorithm_in_found_result                             [system] { header "__algorithm/in_found_result.h" }
+  module std_private_algorithm_in_fun_result                               [system] { header "__algorithm/in_fun_result.h" }
+  module std_private_algorithm_in_in_out_result                            [system] { header "__algorithm/in_in_out_result.h" }
+  module std_private_algorithm_in_in_result                                [system] { header "__algorithm/in_in_result.h" }
+  module std_private_algorithm_in_out_out_result                           [system] { header "__algorithm/in_out_out_result.h" }
+  module std_private_algorithm_in_out_result                               [system] { header "__algorithm/in_out_result.h" }
+  module std_private_algorithm_includes                                    [system] { header "__algorithm/includes.h" }
+  module std_private_algorithm_inplace_merge                               [system] { header "__algorithm/inplace_merge.h" }
+  module std_private_algorithm_is_heap                                     [system] { header "__algorithm/is_heap.h" }
+  module std_private_algorithm_is_heap_until                               [system] { header "__algorithm/is_heap_until.h" }
+  module std_private_algorithm_is_partitioned                              [system] { header "__algorithm/is_partitioned.h" }
+  module std_private_algorithm_is_permutation                              [system] { header "__algorithm/is_permutation.h" }
+  module std_private_algorithm_is_sorted                                   [system] { header "__algorithm/is_sorted.h" }
+  module std_private_algorithm_is_sorted_until                             [system] { header "__algorithm/is_sorted_until.h" }
+  module std_private_algorithm_iter_swap                                   [system] { header "__algorithm/iter_swap.h" }
+  module std_private_algorithm_iterator_operations                         [system] {
+    header "__algorithm/iterator_operations.h"
+    export *
+  }
+  module std_private_algorithm_lexicographical_compare                     [system] { header "__algorithm/lexicographical_compare.h" }
+  module std_private_algorithm_lexicographical_compare_three_way           [system] { header "__algorithm/lexicographical_compare_three_way.h" }
+  module std_private_algorithm_lower_bound                                 [system] { header "__algorithm/lower_bound.h" }
+  module std_private_algorithm_make_heap                                   [system] { header "__algorithm/make_heap.h" }
+  module std_private_algorithm_make_projected                              [system] { header "__algorithm/make_projected.h" }
+  module std_private_algorithm_max                                         [system] { header "__algorithm/max.h" }
+  module std_private_algorithm_max_element                                 [system] { header "__algorithm/max_element.h" }
+  module std_private_algorithm_merge                                       [system] { header "__algorithm/merge.h" }
+  module std_private_algorithm_min                                         [system] { header "__algorithm/min.h" }
+  module std_private_algorithm_min_element                                 [system] { header "__algorithm/min_element.h" }
+  module std_private_algorithm_min_max_result                              [system] { header "__algorithm/min_max_result.h" }
+  module std_private_algorithm_minmax                                      [system] {
+    header "__algorithm/minmax.h"
+    export *
+  }
+  module std_private_algorithm_minmax_element                              [system] { header "__algorithm/minmax_element.h" }
+  module std_private_algorithm_mismatch                                    [system] { header "__algorithm/mismatch.h" }
+  module std_private_algorithm_move                                        [system] { header "__algorithm/move.h" }
+  module std_private_algorithm_move_backward                               [system] { header "__algorithm/move_backward.h" }
+  module std_private_algorithm_next_permutation                            [system] { header "__algorithm/next_permutation.h" }
+  module std_private_algorithm_none_of                                     [system] { header "__algorithm/none_of.h" }
+  module std_private_algorithm_nth_element                                 [system] { header "__algorithm/nth_element.h" }
+  module std_private_algorithm_partial_sort                                [system] { header "__algorithm/partial_sort.h" }
+  module std_private_algorithm_partial_sort_copy                           [system] { header "__algorithm/partial_sort_copy.h" }
+  module std_private_algorithm_partition                                   [system] { header "__algorithm/partition.h" }
+  module std_private_algorithm_partition_copy                              [system] { header "__algorithm/partition_copy.h" }
+  module std_private_algorithm_partition_point                             [system] { header "__algorithm/partition_point.h" }
+  module std_private_algorithm_pop_heap                                    [system] { header "__algorithm/pop_heap.h" }
+  module std_private_algorithm_prev_permutation                            [system] { header "__algorithm/prev_permutation.h" }
+  module std_private_algorithm_pstl_any_all_none_of                        [system] { header "__algorithm/pstl_any_all_none_of.h" }
+  module std_private_algorithm_pstl_backend                                [system] {
+    header "__algorithm/pstl_backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backend                   [system] {
+    header "__algorithm/pstl_backends/cpu_backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_any_of           [system] { header "__algorithm/pstl_backends/cpu_backends/any_of.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_backend          [system] {
+    header "__algorithm/pstl_backends/cpu_backends/backend.h"
+    export *
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_fill             [system] { header "__algorithm/pstl_backends/cpu_backends/fill.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_find_if          [system] { header "__algorithm/pstl_backends/cpu_backends/find_if.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_for_each         [system] { header "__algorithm/pstl_backends/cpu_backends/for_each.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_libdispatch      [system] { header "__algorithm/pstl_backends/cpu_backends/libdispatch.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_merge            [system] { header "__algorithm/pstl_backends/cpu_backends/merge.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_serial           [system] { textual header "__algorithm/pstl_backends/cpu_backends/serial.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_stable_sort      [system] { header "__algorithm/pstl_backends/cpu_backends/stable_sort.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_thread           [system] { textual header "__algorithm/pstl_backends/cpu_backends/thread.h" }
+  module std_private_algorithm_pstl_backends_cpu_backends_transform        [system] {
+    header "__algorithm/pstl_backends/cpu_backends/transform.h"
+    export std_private_algorithm_transform
+  }
+  module std_private_algorithm_pstl_backends_cpu_backends_transform_reduce [system] { header "__algorithm/pstl_backends/cpu_backends/transform_reduce.h" }
+  module std_private_algorithm_pstl_copy                                   [system] { header "__algorithm/pstl_copy.h" }
+  module std_private_algorithm_pstl_count                                  [system] { header "__algorithm/pstl_count.h" }
+  module std_private_algorithm_pstl_equal                                  [system] { header "__algorithm/pstl_equal.h" }
+  module std_private_algorithm_pstl_fill                                   [system] { header "__algorithm/pstl_fill.h" }
+  module std_private_algorithm_pstl_find                                   [system] {
+    header "__algorithm/pstl_find.h"
+    export *
+  }
+  module std_private_algorithm_pstl_for_each                               [system] {
+    header "__algorithm/pstl_for_each.h"
+    export *
+  }
+  module std_private_algorithm_pstl_frontend_dispatch                      [system] {
+    header "__algorithm/pstl_frontend_dispatch.h"
+    export std_private_utility_forward
+  }
+  module std_private_algorithm_pstl_generate                               [system] { header "__algorithm/pstl_generate.h" }
+  module std_private_algorithm_pstl_is_partitioned                         [system] { header "__algorithm/pstl_is_partitioned.h" }
+  module std_private_algorithm_pstl_merge                                  [system] { header "__algorithm/pstl_merge.h" }
+  module std_private_algorithm_pstl_move                                   [system] { header "__algorithm/pstl_move.h" }
+  module std_private_algorithm_pstl_replace                                [system] { header "__algorithm/pstl_replace.h" }
+  module std_private_algorithm_pstl_rotate_copy                            [system] { header "__algorithm/pstl_rotate_copy.h" }
+  module std_private_algorithm_pstl_sort                                   [system] { header "__algorithm/pstl_sort.h" }
+  module std_private_algorithm_pstl_stable_sort                            [system] {
+    header "__algorithm/pstl_stable_sort.h"
+    export std_private_functional_operations
+  }
+  module std_private_algorithm_pstl_transform                              [system] { header "__algorithm/pstl_transform.h" }
+  module std_private_algorithm_push_heap                                   [system] { header "__algorithm/push_heap.h" }
+  module std_private_algorithm_ranges_adjacent_find                        [system] { header "__algorithm/ranges_adjacent_find.h" }
+  module std_private_algorithm_ranges_all_of                               [system] { header "__algorithm/ranges_all_of.h" }
+  module std_private_algorithm_ranges_any_of                               [system] { header "__algorithm/ranges_any_of.h" }
+  module std_private_algorithm_ranges_binary_search                        [system] {
+    header "__algorithm/ranges_binary_search.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_clamp                                [system] {
+    header "__algorithm/ranges_clamp.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_contains                             [system] { header "__algorithm/ranges_contains.h" }
+  module std_private_algorithm_ranges_copy                                 [system] {
+    header "__algorithm/ranges_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_backward                        [system] {
+    header "__algorithm/ranges_copy_backward.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_if                              [system] {
+    header "__algorithm/ranges_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_copy_n                               [system] {
+    header "__algorithm/ranges_copy_n.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_count                                [system] { header "__algorithm/ranges_count.h" }
+  module std_private_algorithm_ranges_count_if                             [system] { header "__algorithm/ranges_count_if.h" }
+  module std_private_algorithm_ranges_ends_with                            [system] { header "__algorithm/ranges_ends_with.h" }
+  module std_private_algorithm_ranges_equal                                [system] { header "__algorithm/ranges_equal.h" }
+  module std_private_algorithm_ranges_equal_range                          [system] {
+    header "__algorithm/ranges_equal_range.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_fill                                 [system] { header "__algorithm/ranges_fill.h" }
+  module std_private_algorithm_ranges_fill_n                               [system] { header "__algorithm/ranges_fill_n.h" }
+  module std_private_algorithm_ranges_find                                 [system] { header "__algorithm/ranges_find.h" }
+  module std_private_algorithm_ranges_find_end                             [system] { header "__algorithm/ranges_find_end.h" }
+  module std_private_algorithm_ranges_find_first_of                        [system] { header "__algorithm/ranges_find_first_of.h" }
+  module std_private_algorithm_ranges_find_if                              [system] { header "__algorithm/ranges_find_if.h" }
+  module std_private_algorithm_ranges_find_if_not                          [system] { header "__algorithm/ranges_find_if_not.h" }
+  module std_private_algorithm_ranges_for_each                             [system] {
+    header "__algorithm/ranges_for_each.h"
+    export std_private_algorithm_in_fun_result
+  }
+  module std_private_algorithm_ranges_for_each_n                           [system] {
+    header "__algorithm/ranges_for_each_n.h"
+    export std_private_algorithm_in_fun_result
+  }
+  module std_private_algorithm_ranges_generate                             [system] { header "__algorithm/ranges_generate.h" }
+  module std_private_algorithm_ranges_generate_n                           [system] { header "__algorithm/ranges_generate_n.h" }
+  module std_private_algorithm_ranges_includes                             [system] {
+    header "__algorithm/ranges_includes.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_inplace_merge                        [system] {
+    header "__algorithm/ranges_inplace_merge.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_heap                              [system] {
+    header "__algorithm/ranges_is_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_heap_until                        [system] {
+    header "__algorithm/ranges_is_heap_until.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_partitioned                       [system] { header "__algorithm/ranges_is_partitioned.h" }
+  module std_private_algorithm_ranges_is_permutation                       [system] { header "__algorithm/ranges_is_permutation.h" }
+  module std_private_algorithm_ranges_is_sorted                            [system] {
+    header "__algorithm/ranges_is_sorted.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_is_sorted_until                      [system] {
+    header "__algorithm/ranges_is_sorted_until.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_iterator_concept                     [system] { header "__algorithm/ranges_iterator_concept.h" }
+  module std_private_algorithm_ranges_lexicographical_compare              [system] {
+    header "__algorithm/ranges_lexicographical_compare.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_lower_bound                          [system] {
+    header "__algorithm/ranges_lower_bound.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_make_heap                            [system] {
+    header "__algorithm/ranges_make_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_max                                  [system] {
+    header "__algorithm/ranges_max.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_max_element                          [system] {
+    header "__algorithm/ranges_max_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_merge                                [system] {
+    header "__algorithm/ranges_merge.h"
+    export std_private_algorithm_in_in_out_result
+  }
+  module std_private_algorithm_ranges_min                                  [system] {
+    header "__algorithm/ranges_min.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_min_element                          [system] {
+    header "__algorithm/ranges_min_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_minmax                               [system] {
+    header "__algorithm/ranges_minmax.h"
+    export std_private_functional_ranges_operations
+    export std_private_algorithm_min_max_result
+  }
+  module std_private_algorithm_ranges_minmax_element                       [system] {
+    header "__algorithm/ranges_minmax_element.h"
+    export std_private_functional_ranges_operations
+    export std_private_algorithm_min_max_result
+  }
+  module std_private_algorithm_ranges_mismatch                             [system] {
+    header "__algorithm/ranges_mismatch.h"
+    export std_private_algorithm_in_in_result
+  }
+  module std_private_algorithm_ranges_move                                 [system] {
+    header "__algorithm/ranges_move.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_move_backward                        [system] {
+    header "__algorithm/ranges_move_backward.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_next_permutation                     [system] {
+    header "__algorithm/ranges_next_permutation.h"
+    export std_private_algorithm_in_found_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_none_of                              [system] { header "__algorithm/ranges_none_of.h" }
+  module std_private_algorithm_ranges_nth_element                          [system] {
+    header "__algorithm/ranges_nth_element.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partial_sort                         [system] {
+    header "__algorithm/ranges_partial_sort.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partial_sort_copy                    [system] {
+    header "__algorithm/ranges_partial_sort_copy.h"
+    export std_private_algorithm_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_partition                            [system] { header "__algorithm/ranges_partition.h" }
+  module std_private_algorithm_ranges_partition_copy                       [system] { header "__algorithm/ranges_partition_copy.h" }
+  module std_private_algorithm_ranges_partition_point                      [system] { header "__algorithm/ranges_partition_point.h" }
+  module std_private_algorithm_ranges_pop_heap                             [system] {
+    header "__algorithm/ranges_pop_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_prev_permutation                     [system] {
+    header "__algorithm/ranges_prev_permutation.h"
+    export std_private_algorithm_in_found_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_push_heap                            [system] {
+    header "__algorithm/ranges_push_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_remove                               [system] { header "__algorithm/ranges_remove.h" }
+  module std_private_algorithm_ranges_remove_copy                          [system] {
+    header "__algorithm/ranges_remove_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_remove_copy_if                       [system] {
+    header "__algorithm/ranges_remove_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_remove_if                            [system] { header "__algorithm/ranges_remove_if.h" }
+  module std_private_algorithm_ranges_replace                              [system] { header "__algorithm/ranges_replace.h" }
+  module std_private_algorithm_ranges_replace_copy                         [system] {
+    header "__algorithm/ranges_replace_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_replace_copy_if                      [system] {
+    header "__algorithm/ranges_replace_copy_if.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_replace_if                           [system] { header "__algorithm/ranges_replace_if.h" }
+  module std_private_algorithm_ranges_reverse                              [system] { header "__algorithm/ranges_reverse.h" }
+  module std_private_algorithm_ranges_reverse_copy                         [system] {
+    header "__algorithm/ranges_reverse_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_rotate                               [system] { header "__algorithm/ranges_rotate.h" }
+  module std_private_algorithm_ranges_rotate_copy                          [system] {
+    header "__algorithm/ranges_rotate_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_sample                               [system] { header "__algorithm/ranges_sample.h" }
+  module std_private_algorithm_ranges_search                               [system] { header "__algorithm/ranges_search.h" }
+  module std_private_algorithm_ranges_search_n                             [system] { header "__algorithm/ranges_search_n.h" }
+  module std_private_algorithm_ranges_set_difference                       [system] {
+    header "__algorithm/ranges_set_difference.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_set_intersection                     [system] {
+    header "__algorithm/ranges_set_intersection.h"
+    export std_private_algorithm_in_in_out_result
+  }
+  module std_private_algorithm_ranges_set_symmetric_difference             [system] {
+    header "__algorithm/ranges_set_symmetric_difference.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_set_union                            [system] {
+    header "__algorithm/ranges_set_union.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_shuffle                              [system] { header "__algorithm/ranges_shuffle.h" }
+  module std_private_algorithm_ranges_sort                                 [system] {
+    header "__algorithm/ranges_sort.h"
+    export std_private_algorithm_make_projected
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_sort_heap                            [system] {
+    header "__algorithm/ranges_sort_heap.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_stable_partition                     [system] { header "__algorithm/ranges_stable_partition.h" }
+  module std_private_algorithm_ranges_stable_sort                          [system] {
+    header "__algorithm/ranges_stable_sort.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_ranges_starts_with                          [system] { header "__algorithm/ranges_starts_with.h" }
+  module std_private_algorithm_ranges_swap_ranges                          [system] {
+    header "__algorithm/ranges_swap_ranges.h"
+    export std_private_algorithm_in_in_result
+  }
+  module std_private_algorithm_ranges_transform                            [system] {
+    header "__algorithm/ranges_transform.h"
+    export std_private_algorithm_in_in_out_result
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_unique                               [system] { header "__algorithm/ranges_unique.h" }
+  module std_private_algorithm_ranges_unique_copy                          [system] {
+    header "__algorithm/ranges_unique_copy.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_algorithm_ranges_upper_bound                          [system] {
+    header "__algorithm/ranges_upper_bound.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_algorithm_remove                                      [system] { header "__algorithm/remove.h" }
+  module std_private_algorithm_remove_copy                                 [system] { header "__algorithm/remove_copy.h" }
+  module std_private_algorithm_remove_copy_if                              [system] { header "__algorithm/remove_copy_if.h" }
+  module std_private_algorithm_remove_if                                   [system] { header "__algorithm/remove_if.h" }
+  module std_private_algorithm_replace                                     [system] { header "__algorithm/replace.h" }
+  module std_private_algorithm_replace_copy                                [system] { header "__algorithm/replace_copy.h" }
+  module std_private_algorithm_replace_copy_if                             [system] { header "__algorithm/replace_copy_if.h" }
+  module std_private_algorithm_replace_if                                  [system] { header "__algorithm/replace_if.h" }
+  module std_private_algorithm_reverse                                     [system] { header "__algorithm/reverse.h" }
+  module std_private_algorithm_reverse_copy                                [system] { header "__algorithm/reverse_copy.h" }
+  module std_private_algorithm_rotate                                      [system] { header "__algorithm/rotate.h" }
+  module std_private_algorithm_rotate_copy                                 [system] { header "__algorithm/rotate_copy.h" }
+  module std_private_algorithm_sample                                      [system] { header "__algorithm/sample.h" }
+  module std_private_algorithm_search                                      [system] { header "__algorithm/search.h" }
+  module std_private_algorithm_search_n                                    [system] { header "__algorithm/search_n.h" }
+  module std_private_algorithm_set_difference                              [system] { header "__algorithm/set_difference.h" }
+  module std_private_algorithm_set_intersection                            [system] { header "__algorithm/set_intersection.h" }
+  module std_private_algorithm_set_symmetric_difference                    [system] { header "__algorithm/set_symmetric_difference.h" }
+  module std_private_algorithm_set_union                                   [system] { header "__algorithm/set_union.h" }
+  module std_private_algorithm_shift_left                                  [system] { header "__algorithm/shift_left.h" }
+  module std_private_algorithm_shift_right                                 [system] { header "__algorithm/shift_right.h" }
+  module std_private_algorithm_shuffle                                     [system] { header "__algorithm/shuffle.h" }
+  module std_private_algorithm_sift_down                                   [system] { header "__algorithm/sift_down.h" }
+  module std_private_algorithm_sort                                        [system] {
+    header "__algorithm/sort.h"
+    export std_private_debug_utils_strict_weak_ordering_check
+  }
+  module std_private_algorithm_sort_heap                                   [system] { header "__algorithm/sort_heap.h" }
+  module std_private_algorithm_stable_partition                            [system] { header "__algorithm/stable_partition.h" }
+  module std_private_algorithm_stable_sort                                 [system] { header "__algorithm/stable_sort.h" }
+  module std_private_algorithm_swap_ranges                                 [system] {
+    header "__algorithm/swap_ranges.h"
+    export std_private_algorithm_iterator_operations
+  }
+  module std_private_algorithm_three_way_comp_ref_type                     [system] { header "__algorithm/three_way_comp_ref_type.h" }
+  module std_private_algorithm_transform                                   [system] { header "__algorithm/transform.h" }
+  module std_private_algorithm_uniform_random_bit_generator_adaptor        [system] { header "__algorithm/uniform_random_bit_generator_adaptor.h" }
+  module std_private_algorithm_unique                                      [system] { header "__algorithm/unique.h" }
+  module std_private_algorithm_unique_copy                                 [system] { header "__algorithm/unique_copy.h" }
+  module std_private_algorithm_unwrap_iter                                 [system] {
+    header "__algorithm/unwrap_iter.h"
+    export std_private_iterator_iterator_traits
+  }
+  module std_private_algorithm_unwrap_range                                [system] {
+    header "__algorithm/unwrap_range.h"
+    export std_private_utility_pair
+  }
+  module std_private_algorithm_upper_bound                                 [system] { header "__algorithm/upper_bound.h" }
+
+  module std_private_array_array_fwd [system] { header "__fwd/array.h" }
+
+  module std_private_atomic_aliases             [system] {
+    header "__atomic/aliases.h"
+    export std_private_atomic_atomic
+  }
+  module std_private_atomic_atomic              [system] {
+    header "__atomic/atomic.h"
+    export std_private_atomic_atomic_base
+  }
+  module std_private_atomic_atomic_base         [system] { header "__atomic/atomic_base.h" }
+  module std_private_atomic_atomic_flag         [system] {
+    header "__atomic/atomic_flag.h"
+    export *
+  }
+  module std_private_atomic_atomic_init         [system] { header "__atomic/atomic_init.h" }
+  module std_private_atomic_atomic_lock_free    [system] { header "__atomic/atomic_lock_free.h" }
+  module std_private_atomic_atomic_sync         [system] { header "__atomic/atomic_sync.h" }
+  module std_private_atomic_check_memory_order  [system] { header "__atomic/check_memory_order.h" }
+  module std_private_atomic_contention_t        [system] { header "__atomic/contention_t.h" }
+  module std_private_atomic_cxx_atomic_impl     [system] { header "__atomic/cxx_atomic_impl.h" }
+  module std_private_atomic_fence               [system] { header "__atomic/fence.h" }
+  module std_private_atomic_is_always_lock_free [system] { header "__atomic/is_always_lock_free.h" }
+  module std_private_atomic_kill_dependency     [system] { header "__atomic/kill_dependency.h" }
+  module std_private_atomic_memory_order        [system] { header "__atomic/memory_order.h" }
+
+  module std_private_bit_bit_cast       [system] { header "__bit/bit_cast.h" }
+  module std_private_bit_bit_ceil       [system] { header "__bit/bit_ceil.h" }
+  module std_private_bit_bit_floor      [system] { header "__bit/bit_floor.h" }
+  module std_private_bit_bit_log2       [system] { header "__bit/bit_log2.h" }
+  module std_private_bit_bit_width      [system] { header "__bit/bit_width.h" }
+  module std_private_bit_blsr           [system] { header "__bit/blsr.h" }
+  module std_private_bit_byteswap       [system] { header "__bit/byteswap.h" }
+  module std_private_bit_countl         [system] { header "__bit/countl.h" }
+  module std_private_bit_countr         [system] { header "__bit/countr.h" }
+  module std_private_bit_endian         [system] { header "__bit/endian.h" }
+  module std_private_bit_has_single_bit [system] { header "__bit/has_single_bit.h" }
+  module std_private_bit_invert_if      [system] { header "__bit/invert_if.h" }
+  module std_private_bit_popcount       [system] { header "__bit/popcount.h" }
+  module std_private_bit_rotate         [system] { header "__bit/rotate.h" }
+
+  module std_private_charconv_chars_format            [system] { header "__charconv/chars_format.h" }
+  module std_private_charconv_from_chars_integral     [system] { header "__charconv/from_chars_integral.h" }
+  module std_private_charconv_from_chars_result       [system] { header "__charconv/from_chars_result.h" }
+  module std_private_charconv_tables                  [system] { header "__charconv/tables.h" }
+  module std_private_charconv_to_chars                [system] { header "__charconv/to_chars.h" }
+  module std_private_charconv_to_chars_base_10        [system] { header "__charconv/to_chars_base_10.h" }
+  module std_private_charconv_to_chars_floating_point [system] { header "__charconv/to_chars_floating_point.h" }
+  module std_private_charconv_to_chars_integral       [system] { header "__charconv/to_chars_integral.h" }
+  module std_private_charconv_to_chars_result         [system] { header "__charconv/to_chars_result.h" }
+  module std_private_charconv_traits                  [system] { header "__charconv/traits.h" }
+
+  module std_private_chrono_calendar               [system] { header "__chrono/calendar.h" }
+  module std_private_chrono_concepts               [system] { header "__chrono/concepts.h" }
+  module std_private_chrono_convert_to_timespec    [system] { header "__chrono/convert_to_timespec.h" }
+  module std_private_chrono_convert_to_tm          [system] { header "__chrono/convert_to_tm.h" }
+  module std_private_chrono_day                    [system] { header "__chrono/day.h" }
+  module std_private_chrono_duration               [system] {
+    header "__chrono/duration.h"
+    export std_private_type_traits_is_convertible
+  }
+  module std_private_chrono_file_clock             [system] { header "__chrono/file_clock.h" }
+  module std_private_chrono_formatter              [system] {
+    header "__chrono/formatter.h"
+  }
+  module std_private_chrono_hh_mm_ss               [system] { header "__chrono/hh_mm_ss.h" }
+  module std_private_chrono_high_resolution_clock  [system] {
+    header "__chrono/high_resolution_clock.h"
+    export std_private_chrono_steady_clock
+    export std_private_chrono_system_clock
+  }
+  module std_private_chrono_literals               [system] { header "__chrono/literals.h" }
+  module std_private_chrono_month                  [system] { header "__chrono/month.h" }
+  module std_private_chrono_month_weekday          [system] { header "__chrono/month_weekday.h" }
+  module std_private_chrono_monthday               [system] { header "__chrono/monthday.h" }
+  module std_private_chrono_ostream                [system] {
+    header "__chrono/ostream.h"
+  }
+  module std_private_chrono_parser_std_format_spec [system] {
+    header "__chrono/parser_std_format_spec.h"
+  }
+  module std_private_chrono_statically_widen       [system] { header "__chrono/statically_widen.h" }
+  module std_private_chrono_steady_clock           [system] {
+    header "__chrono/steady_clock.h"
+    export std_private_chrono_time_point
+  }
+  module std_private_chrono_system_clock           [system] {
+    header "__chrono/system_clock.h"
+    export std_private_chrono_time_point
+  }
+  module std_private_chrono_tzdb                   [system] {
+    header "__chrono/tzdb.h"
+    export *
+  }
+  module std_private_chrono_tzdb_list              [system] {
+    header "__chrono/tzdb_list.h"
+    export *
+  }
+  module std_private_chrono_time_point             [system] { header "__chrono/time_point.h" }
+  module std_private_chrono_weekday                [system] { header "__chrono/weekday.h" }
+  module std_private_chrono_year                   [system] { header "__chrono/year.h" }
+  module std_private_chrono_year_month             [system] { header "__chrono/year_month.h" }
+  module std_private_chrono_year_month_day         [system] { header "__chrono/year_month_day.h" }
+  module std_private_chrono_year_month_weekday     [system] { header "__chrono/year_month_weekday.h" }
+
+  module std_private_compare_common_comparison_category     [system] { header "__compare/common_comparison_category.h" }
+  module std_private_compare_compare_partial_order_fallback [system] { header "__compare/compare_partial_order_fallback.h" }
+  module std_private_compare_compare_strong_order_fallback  [system] { header "__compare/compare_strong_order_fallback.h" }
+  module std_private_compare_compare_three_way              [system] { header "__compare/compare_three_way.h" }
+  module std_private_compare_compare_three_way_result       [system] { header "__compare/compare_three_way_result.h" }
+  module std_private_compare_compare_weak_order_fallback    [system] { header "__compare/compare_weak_order_fallback.h" }
+  module std_private_compare_is_eq                          [system] { header "__compare/is_eq.h" }
+  module std_private_compare_ordering                       [system] { header "__compare/ordering.h" }
+  module std_private_compare_partial_order                  [system] { header "__compare/partial_order.h" }
+  module std_private_compare_strong_order                   [system] { header "__compare/strong_order.h" }
+  module std_private_compare_synth_three_way                [system] { header "__compare/synth_three_way.h" }
+  module std_private_compare_three_way_comparable           [system] { header "__compare/three_way_comparable.h" }
+  module std_private_compare_weak_order                     [system] { header "__compare/weak_order.h" }
+
+  module std_private_concepts_arithmetic            [system] { header "__concepts/arithmetic.h" }
+  module std_private_concepts_assignable            [system] { header "__concepts/assignable.h" }
+  module std_private_concepts_boolean_testable      [system] { header "__concepts/boolean_testable.h" }
+  module std_private_concepts_class_or_enum         [system] { header "__concepts/class_or_enum.h" }
+  module std_private_concepts_common_reference_with [system] { header "__concepts/common_reference_with.h" }
+  module std_private_concepts_common_with           [system] { header "__concepts/common_with.h" }
+  module std_private_concepts_constructible         [system] {
+    header "__concepts/constructible.h"
+    export std_private_concepts_destructible
+  }
+  module std_private_concepts_convertible_to        [system] { header "__concepts/convertible_to.h" }
+  module std_private_concepts_copyable              [system] { header "__concepts/copyable.h" }
+  module std_private_concepts_derived_from          [system] { header "__concepts/derived_from.h" }
+  module std_private_concepts_destructible          [system] {
+    header "__concepts/destructible.h"
+    export std_private_type_traits_is_nothrow_destructible
+  }
+  module std_private_concepts_different_from        [system] { header "__concepts/different_from.h" }
+  module std_private_concepts_equality_comparable   [system] {
+    header "__concepts/equality_comparable.h"
+    export std_private_type_traits_common_reference
+  }
+  module std_private_concepts_invocable             [system] { header "__concepts/invocable.h" }
+  module std_private_concepts_movable               [system] {
+    header "__concepts/movable.h"
+    export std_private_type_traits_is_object
+  }
+  module std_private_concepts_predicate             [system] { header "__concepts/predicate.h" }
+  module std_private_concepts_regular               [system] { header "__concepts/regular.h" }
+  module std_private_concepts_relation              [system] { header "__concepts/relation.h" }
+  module std_private_concepts_same_as               [system] {
+    header "__concepts/same_as.h"
+    export std_private_type_traits_is_same
+  }
+  module std_private_concepts_semiregular           [system] { header "__concepts/semiregular.h" }
+  module std_private_concepts_swappable             [system] { header "__concepts/swappable.h" }
+  module std_private_concepts_totally_ordered       [system] { header "__concepts/totally_ordered.h" }
+
+  module std_private_condition_variable_condition_variable [system] {
+    header "__condition_variable/condition_variable.h"
+    export *
+  }
+
+  module std_private_coroutine_coroutine_handle      [system] { header "__coroutine/coroutine_handle.h" }
+  module std_private_coroutine_coroutine_traits      [system] { header "__coroutine/coroutine_traits.h" }
+  module std_private_coroutine_noop_coroutine_handle [system] { header "__coroutine/noop_coroutine_handle.h" }
+  module std_private_coroutine_trivial_awaitables    [system] { header "__coroutine/trivial_awaitables.h" }
+
+  module std_private_debug_utils_randomize_range            [system] { header "__debug_utils/randomize_range.h" }
+  module std_private_debug_utils_strict_weak_ordering_check [system] {
+    header "__debug_utils/strict_weak_ordering_check.h"
+    export std_private_type_traits_is_constant_evaluated
+  }
+
+  module std_private_exception_exception        [system] { header "__exception/exception.h" }
+  module std_private_exception_exception_ptr    [system] {
+    header "__exception/exception_ptr.h"
+    export std_private_exception_operations
+  }
+  module std_private_exception_nested_exception [system] { header "__exception/nested_exception.h" }
+  module std_private_exception_operations       [system] { header "__exception/operations.h" }
+  module std_private_exception_terminate        [system] { header "__exception/terminate.h" }
+
+  module std_private_expected_bad_expected_access [system] { header "__expected/bad_expected_access.h" }
+  module std_private_expected_expected            [system] { header "__expected/expected.h" }
+  module std_private_expected_unexpect            [system] { header "__expected/unexpect.h" }
+  module std_private_expected_unexpected          [system] { header "__expected/unexpected.h" }
+
+  module std_private_filesystem_copy_options                 [system] { header "__filesystem/copy_options.h" }
+  module std_private_filesystem_directory_entry              [system] {
+    header "__filesystem/directory_entry.h"
+    export *
+  }
+  module std_private_filesystem_directory_iterator           [system] {
+    header "__filesystem/directory_iterator.h"
+    export *
+  }
+  module std_private_filesystem_directory_options            [system] { header "__filesystem/directory_options.h" }
+  module std_private_filesystem_file_status                  [system] { header "__filesystem/file_status.h" }
+  module std_private_filesystem_file_time_type               [system] { header "__filesystem/file_time_type.h" }
+  module std_private_filesystem_file_type                    [system] { header "__filesystem/file_type.h" }
+  module std_private_filesystem_filesystem_error             [system] {
+    header "__filesystem/filesystem_error.h"
+    export *
+  }
+  module std_private_filesystem_operations                   [system] { header "__filesystem/operations.h" }
+  module std_private_filesystem_path                         [system] {
+    header "__filesystem/path.h"
+    export *
+  }
+  module std_private_filesystem_path_iterator                [system] { header "__filesystem/path_iterator.h" }
+  module std_private_filesystem_perm_options                 [system] { header "__filesystem/perm_options.h" }
+  module std_private_filesystem_perms                        [system] { header "__filesystem/perms.h" }
+  module std_private_filesystem_recursive_directory_iterator [system] {
+    header "__filesystem/recursive_directory_iterator.h"
+    export *
+  }
+  module std_private_filesystem_space_info                   [system] { header "__filesystem/space_info.h" }
+  module std_private_filesystem_u8path                       [system] { header "__filesystem/u8path.h" }
+
+  module std_private_format_buffer                          [system] { header "__format/buffer.h" }
+  module std_private_format_concepts                        [system] { header "__format/concepts.h" }
+  module std_private_format_container_adaptor               [system] { header "__format/container_adaptor.h" }
+  module std_private_format_enable_insertable               [system] { header "__format/enable_insertable.h" }
+  module std_private_format_escaped_output_table            [system] { header "__format/escaped_output_table.h" }
+  module std_private_format_extended_grapheme_cluster_table [system] { header "__format/extended_grapheme_cluster_table.h" }
+  module std_private_format_format_arg                      [system] { header "__format/format_arg.h" }
+  module std_private_format_format_arg_store                [system] { header "__format/format_arg_store.h" }
+  module std_private_format_format_args                     [system] { header "__format/format_args.h" }
+  module std_private_format_format_context                  [system] {
+    header "__format/format_context.h"
+    export *
+  }
+  module std_private_format_format_error                    [system] { header "__format/format_error.h" }
+  module std_private_format_format_functions                [system] {
+    header "__format/format_functions.h"
+    export std_string
+  }
+  module std_private_format_format_fwd                      [system] { header "__format/format_fwd.h" }
+  module std_private_format_format_parse_context            [system] { header "__format/format_parse_context.h" }
+  module std_private_format_format_string                   [system] { header "__format/format_string.h" }
+  module std_private_format_format_to_n_result              [system] {
+    header "__format/format_to_n_result.h"
+    export std_private_iterator_incrementable_traits
+  }
+  module std_private_format_formatter                       [system] { header "__format/formatter.h" }
+  module std_private_format_formatter_bool                  [system] { header "__format/formatter_bool.h" }
+  module std_private_format_formatter_char                  [system] { header "__format/formatter_char.h" }
+  module std_private_format_formatter_floating_point        [system] { header "__format/formatter_floating_point.h" }
+  module std_private_format_formatter_integer               [system] { header "__format/formatter_integer.h" }
+  module std_private_format_formatter_integral              [system] { header "__format/formatter_integral.h" }
+  module std_private_format_formatter_output                [system] { header "__format/formatter_output.h" }
+  module std_private_format_formatter_pointer               [system] { header "__format/formatter_pointer.h" }
+  module std_private_format_formatter_string                [system] { header "__format/formatter_string.h" }
+  module std_private_format_formatter_tuple                 [system] { header "__format/formatter_tuple.h" }
+  module std_private_format_parser_std_format_spec          [system] { header "__format/parser_std_format_spec.h" }
+  module std_private_format_range_default_formatter         [system] { header "__format/range_default_formatter.h" }
+  module std_private_format_range_formatter                 [system] { header "__format/range_formatter.h" }
+  module std_private_format_unicode                         [system] {
+    header "__format/unicode.h"
+    export std_private_format_extended_grapheme_cluster_table
+  }
+  module std_private_format_width_estimation_table          [system] { header "__format/width_estimation_table.h" }
+  module std_private_format_write_escaped                   [system] { header "__format/write_escaped.h" }
+
+  module std_private_functional_binary_function            [system] { header "__functional/binary_function.h" }
+  module std_private_functional_binary_negate              [system] { header "__functional/binary_negate.h" }
+  module std_private_functional_bind                       [system] { header "__functional/bind.h" }
+  module std_private_functional_bind_back                  [system] { header "__functional/bind_back.h" }
+  module std_private_functional_bind_front                 [system] { header "__functional/bind_front.h" }
+  module std_private_functional_binder1st                  [system] { header "__functional/binder1st.h" }
+  module std_private_functional_binder2nd                  [system] { header "__functional/binder2nd.h" }
+  module std_private_functional_boyer_moore_searcher       [system] {
+    header "__functional/boyer_moore_searcher.h"
+    export std_private_memory_shared_ptr
+  }
+  module std_private_functional_compose                    [system] {
+    header "__functional/compose.h"
+    export std_private_functional_perfect_forward
+  }
+  module std_private_functional_default_searcher           [system] { header "__functional/default_searcher.h" }
+  module std_private_functional_function                   [system] { header "__functional/function.h" }
+  module std_private_functional_hash                       [system] {
+    header "__functional/hash.h"
+    export std_cstdint
+    export std_private_type_traits_underlying_type
+    export std_private_utility_pair
+  }
+  module std_private_functional_hash_fwd                   [system] { header "__fwd/hash.h" }
+  module std_private_functional_identity                   [system] { header "__functional/identity.h" }
+  module std_private_functional_invoke                     [system] {
+    header "__functional/invoke.h"
+    export *
+  }
+  module std_private_functional_is_transparent             [system] { header "__functional/is_transparent.h" }
+  module std_private_functional_mem_fn                     [system] { header "__functional/mem_fn.h" }
+  module std_private_functional_mem_fun_ref                [system] { header "__functional/mem_fun_ref.h" }
+  module std_private_functional_not_fn                     [system] { header "__functional/not_fn.h" }
+  module std_private_functional_operations                 [system] { header "__functional/operations.h" }
+  module std_private_functional_perfect_forward            [system] {
+    header "__functional/perfect_forward.h"
+    export *
+  }
+  module std_private_functional_pointer_to_binary_function [system] { header "__functional/pointer_to_binary_function.h" }
+  module std_private_functional_pointer_to_unary_function  [system] { header "__functional/pointer_to_unary_function.h" }
+  module std_private_functional_ranges_operations          [system] { header "__functional/ranges_operations.h" }
+  module std_private_functional_reference_wrapper          [system] { header "__functional/reference_wrapper.h" }
+  module std_private_functional_unary_function             [system] { header "__functional/unary_function.h" }
+  module std_private_functional_unary_negate               [system] { header "__functional/unary_negate.h" }
+  module std_private_functional_weak_result_type           [system] { header "__functional/weak_result_type.h" }
+
+  module std_private_ios_fpos [system] { header "__ios/fpos.h" }
+
+  module std_private_iosfwd_fstream_fwd   [system] { header "__fwd/fstream.h" }
+  module std_private_iosfwd_ios_fwd       [system] { header "__fwd/ios.h" }
+  module std_private_iosfwd_istream_fwd   [system] { header "__fwd/istream.h" }
+  module std_private_iosfwd_ostream_fwd   [system] { header "__fwd/ostream.h" }
+  module std_private_iosfwd_sstream_fwd   [system] { header "__fwd/sstream.h" }
+  module std_private_iosfwd_streambuf_fwd [system] { header "__fwd/streambuf.h" }
+
+  module std_private_iterator_access                  [system] { header "__iterator/access.h" }
+  module std_private_iterator_advance                 [system] { header "__iterator/advance.h" }
+  module std_private_iterator_back_insert_iterator    [system] { header "__iterator/back_insert_iterator.h" }
+  module std_private_iterator_bounded_iter            [system] { header "__iterator/bounded_iter.h" }
+  module std_private_iterator_common_iterator         [system] { header "__iterator/common_iterator.h" }
+  module std_private_iterator_concepts                [system] {
+    header "__iterator/concepts.h"
+    export std_private_concepts_constructible
+    export std_private_concepts_equality_comparable
+    export std_private_concepts_movable
+    export std_private_type_traits_common_reference
+    export std_private_type_traits_is_reference
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_iterator_counted_iterator        [system] { header "__iterator/counted_iterator.h" }
+  module std_private_iterator_cpp17_iterator_concepts [system] { header "__iterator/cpp17_iterator_concepts.h" }
+  module std_private_iterator_data                    [system] { header "__iterator/data.h" }
+  module std_private_iterator_default_sentinel        [system] { header "__iterator/default_sentinel.h" }
+  module std_private_iterator_distance                [system] {
+    header "__iterator/distance.h"
+    export std_private_ranges_size
+  }
+  module std_private_iterator_empty                   [system] { header "__iterator/empty.h" }
+  module std_private_iterator_erase_if_container      [system] { header "__iterator/erase_if_container.h" }
+  module std_private_iterator_front_insert_iterator   [system] { header "__iterator/front_insert_iterator.h" }
+  module std_private_iterator_incrementable_traits    [system] { header "__iterator/incrementable_traits.h" }
+  module std_private_iterator_indirectly_comparable   [system] { header "__iterator/indirectly_comparable.h" }
+  module std_private_iterator_insert_iterator         [system] { header "__iterator/insert_iterator.h" }
+  module std_private_iterator_istream_iterator        [system] { header "__iterator/istream_iterator.h" }
+  module std_private_iterator_istreambuf_iterator     [system] { header "__iterator/istreambuf_iterator.h" }
+  module std_private_iterator_iter_move               [system] { header "__iterator/iter_move.h" }
+  module std_private_iterator_iter_swap               [system] { header "__iterator/iter_swap.h" }
+  module std_private_iterator_iterator                [system] { header "__iterator/iterator.h" }
+  module std_private_iterator_iterator_traits         [system] {
+    header "__iterator/iterator_traits.h"
+    export std_private_type_traits_is_primary_template
+  }
+  module std_private_iterator_iterator_with_data      [system] { header "__iterator/iterator_with_data.h" }
+  module std_private_iterator_mergeable               [system] {
+    header "__iterator/mergeable.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_iterator_move_iterator           [system] { header "__iterator/move_iterator.h" }
+  module std_private_iterator_move_sentinel           [system] { header "__iterator/move_sentinel.h" }
+  module std_private_iterator_next                    [system] { header "__iterator/next.h" }
+  module std_private_iterator_ostream_iterator        [system] { header "__iterator/ostream_iterator.h" }
+  module std_private_iterator_ostreambuf_iterator     [system] {
+    header "__iterator/ostreambuf_iterator.h"
+    export *
+  }
+  module std_private_iterator_permutable              [system] { header "__iterator/permutable.h" }
+  module std_private_iterator_prev                    [system] { header "__iterator/prev.h" }
+  module std_private_iterator_projected               [system] { header "__iterator/projected.h" }
+  module std_private_iterator_ranges_iterator_traits  [system] { header "__iterator/ranges_iterator_traits.h" }
+  module std_private_iterator_readable_traits         [system] { header "__iterator/readable_traits.h" }
+  module std_private_iterator_reverse_access          [system] { header "__iterator/reverse_access.h" }
+  module std_private_iterator_reverse_iterator        [system] { header "__iterator/reverse_iterator.h" }
+  module std_private_iterator_segmented_iterator      [system] { header "__iterator/segmented_iterator.h" }
+  module std_private_iterator_size                    [system] { header "__iterator/size.h" }
+  module std_private_iterator_sortable                [system] {
+    header "__iterator/sortable.h"
+    export std_private_functional_ranges_operations
+  }
+  module std_private_iterator_unreachable_sentinel    [system] { header "__iterator/unreachable_sentinel.h" }
+  module std_private_iterator_wrap_iter               [system] { header "__iterator/wrap_iter.h" }
+
+  module std_private_locale_locale_base_api_bsd_locale_defaults  [system] { textual header "__locale_dir/locale_base_api/bsd_locale_defaults.h" }
+  module std_private_locale_locale_base_api_bsd_locale_fallbacks [system] { textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" }
+  module std_private_locale_locale_base_api_locale_guard         [system] { header "__locale_dir/locale_base_api/locale_guard.h" }
+
+  module std_private_math_abs                             [system] { header "__math/abs.h" }
+  module std_private_math_copysign                        [system] { header "__math/copysign.h" }
+  module std_private_math_error_functions                 [system] { header "__math/error_functions.h" }
+  module std_private_math_exponential_functions           [system] { header "__math/exponential_functions.h" }
+  module std_private_math_fdim                            [system] { header "__math/fdim.h" }
+  module std_private_math_fma                             [system] { header "__math/fma.h" }
+  module std_private_math_gamma                           [system] { header "__math/gamma.h" }
+  module std_private_math_hyperbolic_functions            [system] { header "__math/hyperbolic_functions.h" }
+  module std_private_math_hypot                           [system] { header "__math/hypot.h" }
+  module std_private_math_inverse_hyperbolic_functions    [system] { header "__math/inverse_hyperbolic_functions.h" }
+  module std_private_math_inverse_trigonometric_functions [system] { header "__math/inverse_trigonometric_functions.h" }
+  module std_private_math_logarithms                      [system] { header "__math/logarithms.h" }
+  module std_private_math_min_max                         [system] { header "__math/min_max.h" }
+  module std_private_math_modulo                          [system] { header "__math/modulo.h" }
+  module std_private_math_remainder                       [system] { header "__math/remainder.h" }
+  module std_private_math_roots                           [system] { header "__math/roots.h" }
+  module std_private_math_rounding_functions              [system] { header "__math/rounding_functions.h" }
+  module std_private_math_traits                          [system] { header "__math/traits.h" }
+  module std_private_math_trigonometric_functions         [system] { header "__math/trigonometric_functions.h" }
+
+  module std_private_mdspan_default_accessor [system] { header "__mdspan/default_accessor.h" }
+  module std_private_mdspan_extents          [system] {
+    header "__mdspan/extents.h"
+    export *
+  }
+  module std_private_mdspan_layout_left      [system] { header "__mdspan/layout_left.h" }
+  module std_private_mdspan_layout_right     [system] { header "__mdspan/layout_right.h" }
+  module std_private_mdspan_layout_stride    [system] { header "__mdspan/layout_stride.h" }
+  module std_private_mdspan_mdspan           [system] { header "__mdspan/mdspan.h" }
+  module std_private_mdspan_mdspan_fwd       [system] { header "__fwd/mdspan.h" }
+
+  module std_private_memory_addressof                       [system] { header "__memory/addressof.h" }
+  module std_private_memory_align                           [system] { header "__memory/align.h" }
+  module std_private_memory_aligned_alloc                   [system] { header "__memory/aligned_alloc.h" }
+  module std_private_memory_allocate_at_least               [system] { header "__memory/allocate_at_least.h" }
+  module std_private_memory_allocation_guard                [system] { header "__memory/allocation_guard.h" }
+  module std_private_memory_allocator                       [system] { header "__memory/allocator.h" }
+  module std_private_memory_allocator_arg_t                 [system] { header "__memory/allocator_arg_t.h" }
+  module std_private_memory_allocator_destructor            [system] { header "__memory/allocator_destructor.h" }
+  module std_private_memory_allocator_traits                [system] { header "__memory/allocator_traits.h" }
+  module std_private_memory_assume_aligned                  [system] { header "__memory/assume_aligned.h" }
+  module std_private_memory_auto_ptr                        [system] { header "__memory/auto_ptr.h" }
+  module std_private_memory_builtin_new_allocator           [system] {
+    header "__memory/builtin_new_allocator.h"
+    export *
+  }
+  module std_private_memory_compressed_pair                 [system] { header "__memory/compressed_pair.h" }
+  module std_private_memory_concepts                        [system] {
+    header "__memory/concepts.h"
+    export std_private_type_traits_remove_reference
+  }
+  module std_private_memory_construct_at                    [system] { header "__memory/construct_at.h" }
+  module std_private_memory_destruct_n                      [system] { header "__memory/destruct_n.h" }
+  module std_private_memory_pointer_traits                  [system] { header "__memory/pointer_traits.h" }
+  module std_private_memory_ranges_construct_at             [system] { header "__memory/ranges_construct_at.h" }
+  module std_private_memory_ranges_uninitialized_algorithms [system] {
+    header "__memory/ranges_uninitialized_algorithms.h"
+    export std_private_algorithm_in_out_result
+  }
+  module std_private_memory_raw_storage_iterator            [system] { header "__memory/raw_storage_iterator.h" }
+  module std_private_memory_shared_ptr                      [system] {
+    header "__memory/shared_ptr.h"
+    export std_private_memory_uninitialized_algorithms
+  }
+  module std_private_memory_swap_allocator                  [system] { header "__memory/swap_allocator.h" }
+  module std_private_memory_temp_value                      [system] { header "__memory/temp_value.h" }
+  module std_private_memory_temporary_buffer                [system] { header "__memory/temporary_buffer.h" }
+  module std_private_memory_uninitialized_algorithms        [system] {
+    header "__memory/uninitialized_algorithms.h"
+    export std_private_algorithm_copy
+  }
+  module std_private_memory_unique_ptr                      [system] {
+    header "__memory/unique_ptr.h"
+    export std_private_type_traits_add_lvalue_reference
+    export std_private_type_traits_is_pointer
+    export std_private_type_traits_type_identity
+  }
+  module std_private_memory_uses_allocator                  [system] { header "__memory/uses_allocator.h" }
+  module std_private_memory_uses_allocator_construction     [system] { header "__memory/uses_allocator_construction.h" }
+  module std_private_memory_voidify                         [system] { header "__memory/voidify.h" }
+
+  module std_private_memory_resource_memory_resource              [system] { header "__memory_resource/memory_resource.h" }
+  module std_private_memory_resource_memory_resource_fwd          [system] { header "__fwd/memory_resource.h" }
+  module std_private_memory_resource_monotonic_buffer_resource    [system] { header "__memory_resource/monotonic_buffer_resource.h" }
+  module std_private_memory_resource_polymorphic_allocator        [system] { header "__memory_resource/polymorphic_allocator.h" }
+  module std_private_memory_resource_pool_options                 [system] { header "__memory_resource/pool_options.h" }
+  module std_private_memory_resource_synchronized_pool_resource   [system] {
+    header "__memory_resource/synchronized_pool_resource.h"
+    export *
+  }
+  module std_private_memory_resource_unsynchronized_pool_resource [system] { header "__memory_resource/unsynchronized_pool_resource.h" }
+
+  module std_private_mutex_lock_guard  [system] { header "__mutex/lock_guard.h" }
+  module std_private_mutex_mutex       [system] { header "__mutex/mutex.h" }
+  module std_private_mutex_once_flag  [system]  { header "__mutex/once_flag.h" }
+  module std_private_mutex_tag_types   [system] { header "__mutex/tag_types.h" }
+  module std_private_mutex_unique_lock [system] { header "__mutex/unique_lock.h" }
+
+  module std_private_numeric_accumulate               [system] { header "__numeric/accumulate.h" }
+  module std_private_numeric_adjacent_difference      [system] { header "__numeric/adjacent_difference.h" }
+  module std_private_numeric_exclusive_scan           [system] { header "__numeric/exclusive_scan.h" }
+  module std_private_numeric_gcd_lcm                  [system] { header "__numeric/gcd_lcm.h" }
+  module std_private_numeric_inclusive_scan           [system] { header "__numeric/inclusive_scan.h" }
+  module std_private_numeric_inner_product            [system] { header "__numeric/inner_product.h" }
+  module std_private_numeric_iota                     [system] { header "__numeric/iota.h" }
+  module std_private_numeric_midpoint                 [system] { header "__numeric/midpoint.h" }
+  module std_private_numeric_partial_sum              [system] { header "__numeric/partial_sum.h" }
+  module std_private_numeric_pstl_reduce              [system] { header "__numeric/pstl_reduce.h" }
+  module std_private_numeric_pstl_transform_reduce    [system] {
+    header "__numeric/pstl_transform_reduce.h"
+    export *
+  }
+  module std_private_numeric_reduce                   [system] { header "__numeric/reduce.h" }
+  module std_private_numeric_saturation_arithmetic    [system] { header "__numeric/saturation_arithmetic.h" }
+  module std_private_numeric_transform_exclusive_scan [system] { header "__numeric/transform_exclusive_scan.h" }
+  module std_private_numeric_transform_inclusive_scan [system] { header "__numeric/transform_inclusive_scan.h" }
+  module std_private_numeric_transform_reduce         [system] { header "__numeric/transform_reduce.h" }
+
+  module std_private_random_bernoulli_distribution          [system] { header "__random/bernoulli_distribution.h" }
+  module std_private_random_binomial_distribution           [system] { header "__random/binomial_distribution.h" }
+  module std_private_random_cauchy_distribution             [system] { header "__random/cauchy_distribution.h" }
+  module std_private_random_chi_squared_distribution        [system] { header "__random/chi_squared_distribution.h" }
+  module std_private_random_clamp_to_integral               [system] { header "__random/clamp_to_integral.h" }
+  module std_private_random_default_random_engine           [system] { header "__random/default_random_engine.h" }
+  module std_private_random_discard_block_engine            [system] { header "__random/discard_block_engine.h" }
+  module std_private_random_discrete_distribution           [system] {
+    header "__random/discrete_distribution.h"
+    export *
+  }
+  module std_private_random_exponential_distribution        [system] { header "__random/exponential_distribution.h" }
+  module std_private_random_extreme_value_distribution      [system] { header "__random/extreme_value_distribution.h" }
+  module std_private_random_fisher_f_distribution           [system] { header "__random/fisher_f_distribution.h" }
+  module std_private_random_gamma_distribution              [system] { header "__random/gamma_distribution.h" }
+  module std_private_random_generate_canonical              [system] { header "__random/generate_canonical.h" }
+  module std_private_random_geometric_distribution          [system] { header "__random/geometric_distribution.h" }
+  module std_private_random_independent_bits_engine         [system] { header "__random/independent_bits_engine.h" }
+  module std_private_random_is_seed_sequence                [system] { header "__random/is_seed_sequence.h" }
+  module std_private_random_is_valid                        [system] { header "__random/is_valid.h" }
+  module std_private_random_knuth_b                         [system] { header "__random/knuth_b.h" }
+  module std_private_random_linear_congruential_engine      [system] { header "__random/linear_congruential_engine.h" }
+  module std_private_random_log2                            [system] { header "__random/log2.h" }
+  module std_private_random_lognormal_distribution          [system] { header "__random/lognormal_distribution.h" }
+  module std_private_random_mersenne_twister_engine         [system] { header "__random/mersenne_twister_engine.h" }
+  module std_private_random_negative_binomial_distribution  [system] { header "__random/negative_binomial_distribution.h" }
+  module std_private_random_normal_distribution             [system] { header "__random/normal_distribution.h" }
+  module std_private_random_piecewise_constant_distribution [system] {
+    header "__random/piecewise_constant_distribution.h"
+    export *
+  }
+  module std_private_random_piecewise_linear_distribution   [system] {
+    header "__random/piecewise_linear_distribution.h"
+    export *
+  }
+  module std_private_random_poisson_distribution            [system] { header "__random/poisson_distribution.h" }
+  module std_private_random_random_device                   [system] {
+    header "__random/random_device.h"
+    export *
+  }
+  module std_private_random_ranlux                          [system] { header "__random/ranlux.h" }
+  module std_private_random_seed_seq                        [system] {
+    header "__random/seed_seq.h"
+    export *
+  }
+  module std_private_random_shuffle_order_engine            [system] { header "__random/shuffle_order_engine.h" }
+  module std_private_random_student_t_distribution          [system] { header "__random/student_t_distribution.h" }
+  module std_private_random_subtract_with_carry_engine      [system] { header "__random/subtract_with_carry_engine.h" }
+  module std_private_random_uniform_int_distribution        [system] { header "__random/uniform_int_distribution.h" }
+  module std_private_random_uniform_random_bit_generator    [system] { header "__random/uniform_random_bit_generator.h" }
+  module std_private_random_uniform_real_distribution       [system] { header "__random/uniform_real_distribution.h" }
+  module std_private_random_weibull_distribution            [system] { header "__random/weibull_distribution.h" }
+
+  module std_private_ranges_access                     [system] { header "__ranges/access.h" }
+  module std_private_ranges_all                        [system] {
+    header "__ranges/all.h"
+    export std_private_functional_compose
+    export std_private_functional_perfect_forward
+    export std_private_ranges_owning_view
+  }
+  module std_private_ranges_as_rvalue_view             [system] { header "__ranges/as_rvalue_view.h" }
+  module std_private_ranges_chunk_by_view              [system] { header "__ranges/chunk_by_view.h" }
+  module std_private_ranges_common_view                [system] { header "__ranges/common_view.h" }
+  module std_private_ranges_concepts                   [system] {
+    header "__ranges/concepts.h"
+    export std_private_iterator_concepts
+  }
+  module std_private_ranges_container_compatible_range [system] { header "__ranges/container_compatible_range.h" }
+  module std_private_ranges_counted                    [system] {
+    header "__ranges/counted.h"
+    export std_span
+  }
+  module std_private_ranges_dangling                   [system] { header "__ranges/dangling.h" }
+  module std_private_ranges_data                       [system] { header "__ranges/data.h" }
+  module std_private_ranges_drop_view                  [system] { header "__ranges/drop_view.h" }
+  module std_private_ranges_drop_while_view            [system] { header "__ranges/drop_while_view.h" }
+  module std_private_ranges_elements_view              [system] { header "__ranges/elements_view.h" }
+  module std_private_ranges_empty                      [system] { header "__ranges/empty.h" }
+  module std_private_ranges_empty_view                 [system] { header "__ranges/empty_view.h" }
+  module std_private_ranges_enable_borrowed_range      [system] { header "__ranges/enable_borrowed_range.h" }
+  module std_private_ranges_enable_view                [system] { header "__ranges/enable_view.h" }
+  module std_private_ranges_filter_view                [system] {
+    header "__ranges/filter_view.h"
+    export std_private_ranges_range_adaptor
+  }
+  module std_private_ranges_from_range                 [system] { header "__ranges/from_range.h" }
+  module std_private_ranges_iota_view                  [system] { header "__ranges/iota_view.h" }
+  module std_private_ranges_istream_view               [system] {
+    header "__ranges/istream_view.h"
+  }
+  module std_private_ranges_join_view                  [system] {
+    header "__ranges/join_view.h"
+    export std_private_iterator_iterator_with_data
+    export std_private_iterator_segmented_iterator
+  }
+  module std_private_ranges_lazy_split_view            [system] {
+    header "__ranges/lazy_split_view.h"
+    export std_private_ranges_non_propagating_cache
+  }
+  module std_private_ranges_movable_box                [system] { header "__ranges/movable_box.h" }
+  module std_private_ranges_non_propagating_cache      [system] { header "__ranges/non_propagating_cache.h" }
+  module std_private_ranges_owning_view                [system] { header "__ranges/owning_view.h" }
+  module std_private_ranges_range_adaptor              [system] { header "__ranges/range_adaptor.h" }
+  module std_private_ranges_rbegin                     [system] { header "__ranges/rbegin.h" }
+  module std_private_ranges_ref_view                   [system] { header "__ranges/ref_view.h" }
+  module std_private_ranges_rend                       [system] { header "__ranges/rend.h" }
+  module std_private_ranges_repeat_view                [system] { header "__ranges/repeat_view.h" }
+  module std_private_ranges_reverse_view               [system] { header "__ranges/reverse_view.h" }
+  module std_private_ranges_single_view                [system] { header "__ranges/single_view.h" }
+  module std_private_ranges_size                       [system] {
+    header "__ranges/size.h"
+    export std_private_type_traits_make_unsigned
+  }
+  module std_private_ranges_split_view                 [system] { header "__ranges/split_view.h" }
+  module std_private_ranges_subrange                   [system] {
+    header "__ranges/subrange.h"
+    export std_private_ranges_subrange_fwd
+  }
+  module std_private_ranges_subrange_fwd               [system] {
+    header "__fwd/subrange.h"
+    export std_private_iterator_concepts
+  }
+  module std_private_ranges_take_view                  [system] { header "__ranges/take_view.h" }
+  module std_private_ranges_take_while_view            [system] { header "__ranges/take_while_view.h" }
+  module std_private_ranges_to                         [system] { header "__ranges/to.h" }
+  module std_private_ranges_transform_view             [system] {
+    header "__ranges/transform_view.h"
+    export std_private_functional_bind_back
+    export std_private_functional_perfect_forward
+    export std_private_ranges_movable_box
+  }
+  module std_private_ranges_view_interface             [system] { header "__ranges/view_interface.h" }
+  module std_private_ranges_views                      [system] { header "__ranges/views.h" }
+  module std_private_ranges_zip_view                   [system] { header "__ranges/zip_view.h" }
+
+  module std_private_span_span_fwd [system] { header "__fwd/span.h" }
+
+  module std_private_stop_token_atomic_unique_lock   [system] { header "__stop_token/atomic_unique_lock.h" }
+  module std_private_stop_token_intrusive_list_view  [system] { header "__stop_token/intrusive_list_view.h" }
+  module std_private_stop_token_intrusive_shared_ptr [system] { header "__stop_token/intrusive_shared_ptr.h" }
+  module std_private_stop_token_stop_callback        [system] { header "__stop_token/stop_callback.h" }
+  module std_private_stop_token_stop_source          [system] {
+    header "__stop_token/stop_source.h"
+    export *
+  }
+  module std_private_stop_token_stop_state           [system] {
+    header "__stop_token/stop_state.h"
+    export *
+  }
+  module std_private_stop_token_stop_token           [system] {
+    header "__stop_token/stop_token.h"
+    export *
+  }
+
+  module std_private_string_char_traits           [system] {
+    header "__string/char_traits.h"
+    export *
+  }
+  module std_private_string_constexpr_c_functions [system] {
+    header "__string/constexpr_c_functions.h"
+    export std_private_type_traits_is_equality_comparable
+  }
+  module std_private_string_extern_template_lists [system] { header "__string/extern_template_lists.h" }
+  module std_private_string_string_fwd            [system] { header "__fwd/string.h" }
+
+  module std_private_string_view_string_view_fwd [system] { header "__fwd/string_view.h" }
+
+  module std_private_system_error_errc            [system] { header "__system_error/errc.h" }
+  module std_private_system_error_error_category  [system] { header "__system_error/error_category.h" }
+  module std_private_system_error_error_code      [system] {
+    header "__system_error/error_code.h"
+    export std_private_functional_hash
+    export std_private_functional_unary_function
+  }
+  module std_private_system_error_error_condition [system] {
+    header "__system_error/error_condition.h"
+    export std_private_functional_hash
+    export std_private_functional_unary_function
+  }
+  module std_private_system_error_system_error    [system] { header "__system_error/system_error.h" }
+
+  module std_private_thread_formatter            [system] { header "__thread/formatter.h" }
+  module std_private_thread_id                   [system] { header "__thread/id.h" }
+  module std_private_thread_jthread              [system] {
+    header "__thread/jthread.h"
+    export *
+  }
+  module std_private_thread_poll_with_backoff    [system] { header "__thread/poll_with_backoff.h" }
+  module std_private_thread_this_thread          [system] { header "__thread/this_thread.h" }
+  module std_private_thread_thread               [system] {
+    header "__thread/thread.h"
+    export *
+  }
+  module std_private_thread_timed_backoff_policy [system] { header "__thread/timed_backoff_policy.h" }
+
+  module std_private_tuple_get_fwd          [system] { header "__fwd/get.h" }
+  module std_private_tuple_make_tuple_types [system] { header "__tuple/make_tuple_types.h" }
+  module std_private_tuple_pair_like        [system] {
+    header "__tuple/pair_like.h"
+    export std_private_tuple_tuple_like
+  }
+  module std_private_tuple_sfinae_helpers   [system] { header "__tuple/sfinae_helpers.h" }
+  module std_private_tuple_tuple_element    [system] { header "__tuple/tuple_element.h" }
+  module std_private_tuple_tuple_fwd        [system] { header "__fwd/tuple.h" }
+  module std_private_tuple_tuple_indices    [system] { header "__tuple/tuple_indices.h" }
+  module std_private_tuple_tuple_like       [system] { header "__tuple/tuple_like.h" }
+  module std_private_tuple_tuple_like_ext   [system] { header "__tuple/tuple_like_ext.h" }
+  module std_private_tuple_tuple_size       [system] { header "__tuple/tuple_size.h" }
+  module std_private_tuple_tuple_types      [system] { header "__tuple/tuple_types.h" }
+
+  module std_private_type_traits_add_const                                 [system] { header "__type_traits/add_const.h" }
+  module std_private_type_traits_add_cv                                    [system] { header "__type_traits/add_cv.h" }
+  module std_private_type_traits_add_lvalue_reference                      [system] {
+    header "__type_traits/add_lvalue_reference.h"
+    export std_private_type_traits_is_referenceable
+  }
+  module std_private_type_traits_add_pointer                               [system] { header "__type_traits/add_pointer.h" }
+  module std_private_type_traits_add_rvalue_reference                      [system] { header "__type_traits/add_rvalue_reference.h" }
+  module std_private_type_traits_add_volatile                              [system] { header "__type_traits/add_volatile.h" }
+  module std_private_type_traits_aligned_storage                           [system] { header "__type_traits/aligned_storage.h" }
+  module std_private_type_traits_aligned_union                             [system] { header "__type_traits/aligned_union.h" }
+  module std_private_type_traits_alignment_of                              [system] { header "__type_traits/alignment_of.h" }
+  module std_private_type_traits_apply_cv                                  [system] {
+    header "__type_traits/apply_cv.h"
+    export std_private_type_traits_is_const
+    export std_private_type_traits_is_volatile
+  }
+  module std_private_type_traits_can_extract_key                           [system] { header "__type_traits/can_extract_key.h" }
+  module std_private_type_traits_common_reference                          [system] {
+    header "__type_traits/common_reference.h"
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_type_traits_common_type                               [system] {
+    header "__type_traits/common_type.h"
+    export std_private_utility_declval
+  }
+  module std_private_type_traits_conditional                               [system] { header "__type_traits/conditional.h" }
+  module std_private_type_traits_conjunction                               [system] { header "__type_traits/conjunction.h" }
+  module std_private_type_traits_copy_cv                                   [system] { header "__type_traits/copy_cv.h" }
+  module std_private_type_traits_copy_cvref                                [system] { header "__type_traits/copy_cvref.h" }
+  module std_private_type_traits_datasizeof                                [system] { header "__type_traits/datasizeof.h" }
+  module std_private_type_traits_decay                                     [system] {
+    header "__type_traits/decay.h"
+    export std_private_type_traits_add_pointer
+  }
+  module std_private_type_traits_dependent_type                            [system] { header "__type_traits/dependent_type.h" }
+  module std_private_type_traits_disjunction                               [system] { header "__type_traits/disjunction.h" }
+  module std_private_type_traits_enable_if                                 [system] { header "__type_traits/enable_if.h" }
+  module std_private_type_traits_extent                                    [system] { header "__type_traits/extent.h" }
+  module std_private_type_traits_has_unique_object_representation          [system] { header "__type_traits/has_unique_object_representation.h" }
+  module std_private_type_traits_has_virtual_destructor                    [system] { header "__type_traits/has_virtual_destructor.h" }
+  module std_private_type_traits_integral_constant                         [system] { header "__type_traits/integral_constant.h" }
+  module std_private_type_traits_invoke                                    [system] {
+    header "__type_traits/invoke.h"
+    export std_private_type_traits_conditional
+    export std_private_type_traits_decay
+    export std_private_type_traits_decay
+    export std_private_type_traits_enable_if
+    export std_private_type_traits_is_base_of
+    export std_private_type_traits_is_core_convertible
+    export std_private_type_traits_is_reference_wrapper
+    export std_private_type_traits_is_same
+    export std_private_type_traits_is_void
+    export std_private_type_traits_nat
+    export std_private_type_traits_remove_cv
+  }
+  module std_private_type_traits_is_abstract                               [system] { header "__type_traits/is_abstract.h" }
+  module std_private_type_traits_is_aggregate                              [system] { header "__type_traits/is_aggregate.h" }
+  module std_private_type_traits_is_allocator                              [system] { header "__type_traits/is_allocator.h" }
+  module std_private_type_traits_is_always_bitcastable                     [system] { header "__type_traits/is_always_bitcastable.h" }
+  module std_private_type_traits_is_arithmetic                             [system] {
+    header "__type_traits/is_arithmetic.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_array                                  [system] {
+    header "__type_traits/is_array.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_assignable                             [system] { header "__type_traits/is_assignable.h" }
+  module std_private_type_traits_is_base_of                                [system] { header "__type_traits/is_base_of.h" }
+  module std_private_type_traits_is_bounded_array                          [system] { header "__type_traits/is_bounded_array.h" }
+  module std_private_type_traits_is_callable                               [system] { header "__type_traits/is_callable.h" }
+  module std_private_type_traits_is_char_like_type                         [system] { header "__type_traits/is_char_like_type.h" }
+  module std_private_type_traits_is_class                                  [system] { header "__type_traits/is_class.h" }
+  module std_private_type_traits_is_compound                               [system] { header "__type_traits/is_compound.h" }
+  module std_private_type_traits_is_const                                  [system] { header "__type_traits/is_const.h" }
+  module std_private_type_traits_is_constant_evaluated                     [system] { header "__type_traits/is_constant_evaluated.h" }
+  module std_private_type_traits_is_constructible                          [system] { header "__type_traits/is_constructible.h" }
+  module std_private_type_traits_is_convertible                            [system] {
+    header "__type_traits/is_convertible.h"
+    export std_private_type_traits_is_array
+  }
+  module std_private_type_traits_is_copy_assignable                        [system] { header "__type_traits/is_copy_assignable.h" }
+  module std_private_type_traits_is_copy_constructible                     [system] { header "__type_traits/is_copy_constructible.h" }
+  module std_private_type_traits_is_core_convertible                       [system] {
+    header "__type_traits/is_core_convertible.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_default_constructible                  [system] { header "__type_traits/is_default_constructible.h" }
+  module std_private_type_traits_is_destructible                           [system] { header "__type_traits/is_destructible.h" }
+  module std_private_type_traits_is_empty                                  [system] { header "__type_traits/is_empty.h" }
+  module std_private_type_traits_is_enum                                   [system] {
+    header "__type_traits/is_enum.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_equality_comparable                    [system] {
+    header "__type_traits/is_equality_comparable.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_execution_policy                       [system] {
+    header "__type_traits/is_execution_policy.h"
+    export std_private_type_traits_remove_cvref
+  }
+  module std_private_type_traits_is_final                                  [system] { header "__type_traits/is_final.h" }
+  module std_private_type_traits_is_floating_point                         [system] { header "__type_traits/is_floating_point.h" }
+  module std_private_type_traits_is_function                               [system] { header "__type_traits/is_function.h" }
+  module std_private_type_traits_is_fundamental                            [system] { header "__type_traits/is_fundamental.h" }
+  module std_private_type_traits_is_implicitly_default_constructible       [system] { header "__type_traits/is_implicitly_default_constructible.h" }
+  module std_private_type_traits_is_integral                               [system] { header "__type_traits/is_integral.h" }
+  module std_private_type_traits_is_literal_type                           [system] { header "__type_traits/is_literal_type.h" }
+  module std_private_type_traits_is_member_function_pointer                [system] { header "__type_traits/is_member_function_pointer.h" }
+  module std_private_type_traits_is_member_object_pointer                  [system] { header "__type_traits/is_member_object_pointer.h" }
+  module std_private_type_traits_is_member_pointer                         [system] { header "__type_traits/is_member_pointer.h" }
+  module std_private_type_traits_is_move_assignable                        [system] { header "__type_traits/is_move_assignable.h" }
+  module std_private_type_traits_is_move_constructible                     [system] { header "__type_traits/is_move_constructible.h" }
+  module std_private_type_traits_is_nothrow_assignable                     [system] { header "__type_traits/is_nothrow_assignable.h" }
+  module std_private_type_traits_is_nothrow_constructible                  [system] { header "__type_traits/is_nothrow_constructible.h" }
+  module std_private_type_traits_is_nothrow_convertible                    [system] { header "__type_traits/is_nothrow_convertible.h" }
+  module std_private_type_traits_is_nothrow_copy_assignable                [system] { header "__type_traits/is_nothrow_copy_assignable.h" }
+  module std_private_type_traits_is_nothrow_copy_constructible             [system] { header "__type_traits/is_nothrow_copy_constructible.h" }
+  module std_private_type_traits_is_nothrow_default_constructible          [system] { header "__type_traits/is_nothrow_default_constructible.h" }
+  module std_private_type_traits_is_nothrow_destructible                   [system] {
+    header "__type_traits/is_nothrow_destructible.h"
+    export std_private_type_traits_is_destructible
+  }
+  module std_private_type_traits_is_nothrow_move_assignable                [system] { header "__type_traits/is_nothrow_move_assignable.h" }
+  module std_private_type_traits_is_nothrow_move_constructible             [system] {
+    header "__type_traits/is_nothrow_move_constructible.h"
+    export std_private_type_traits_is_nothrow_constructible
+  }
+  module std_private_type_traits_is_null_pointer                           [system] {
+    header "__type_traits/is_null_pointer.h"
+    export std_cstddef
+  }
+  module std_private_type_traits_is_object                                 [system] {
+    header "__type_traits/is_object.h"
+    export std_private_type_traits_is_scalar
+  }
+  module std_private_type_traits_is_pod                                    [system] { header "__type_traits/is_pod.h" }
+  module std_private_type_traits_is_pointer                                [system] { header "__type_traits/is_pointer.h" }
+  module std_private_type_traits_is_polymorphic                            [system] { header "__type_traits/is_polymorphic.h" }
+  module std_private_type_traits_is_primary_template                       [system] {
+    header "__type_traits/is_primary_template.h"
+    export std_private_type_traits_enable_if
+  }
+  module std_private_type_traits_is_reference                              [system] { header "__type_traits/is_reference.h" }
+  module std_private_type_traits_is_reference_wrapper                      [system] { header "__type_traits/is_reference_wrapper.h" }
+  module std_private_type_traits_is_referenceable                          [system] { header "__type_traits/is_referenceable.h" }
+  module std_private_type_traits_is_same                                   [system] {
+    header "__type_traits/is_same.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_scalar                                 [system] {
+    header "__type_traits/is_scalar.h"
+    export std_private_type_traits_is_null_pointer
+  }
+  module std_private_type_traits_is_scoped_enum                            [system] { header "__type_traits/is_scoped_enum.h" }
+  module std_private_type_traits_is_signed                                 [system] { header "__type_traits/is_signed.h" }
+  module std_private_type_traits_is_signed_integer                         [system] { header "__type_traits/is_signed_integer.h" }
+  module std_private_type_traits_is_specialization                         [system] { header "__type_traits/is_specialization.h" }
+  module std_private_type_traits_is_standard_layout                        [system] { header "__type_traits/is_standard_layout.h" }
+  module std_private_type_traits_is_swappable                              [system] {
+    header "__type_traits/is_swappable.h"
+    export std_private_type_traits_is_move_constructible
+  }
+  module std_private_type_traits_is_trivial                                [system] { header "__type_traits/is_trivial.h" }
+  module std_private_type_traits_is_trivially_assignable                   [system] { header "__type_traits/is_trivially_assignable.h" }
+  module std_private_type_traits_is_trivially_constructible                [system] { header "__type_traits/is_trivially_constructible.h" }
+  module std_private_type_traits_is_trivially_copy_assignable              [system] { header "__type_traits/is_trivially_copy_assignable.h" }
+  module std_private_type_traits_is_trivially_copy_constructible           [system] { header "__type_traits/is_trivially_copy_constructible.h" }
+  module std_private_type_traits_is_trivially_copyable                     [system] { header "__type_traits/is_trivially_copyable.h" }
+  module std_private_type_traits_is_trivially_default_constructible        [system] { header "__type_traits/is_trivially_default_constructible.h" }
+  module std_private_type_traits_is_trivially_destructible                 [system] { header "__type_traits/is_trivially_destructible.h" }
+  module std_private_type_traits_is_trivially_lexicographically_comparable [system] { header "__type_traits/is_trivially_lexicographically_comparable.h" }
+  module std_private_type_traits_is_trivially_move_assignable              [system] { header "__type_traits/is_trivially_move_assignable.h" }
+  module std_private_type_traits_is_trivially_move_constructible           [system] { header "__type_traits/is_trivially_move_constructible.h" }
+  module std_private_type_traits_is_unbounded_array                        [system] { header "__type_traits/is_unbounded_array.h" }
+  module std_private_type_traits_is_union                                  [system] { header "__type_traits/is_union.h" }
+  module std_private_type_traits_is_unsigned                               [system] { header "__type_traits/is_unsigned.h" }
+  module std_private_type_traits_is_unsigned_integer                       [system] { header "__type_traits/is_unsigned_integer.h" }
+  module std_private_type_traits_is_valid_expansion                        [system] { header "__type_traits/is_valid_expansion.h" }
+  module std_private_type_traits_is_void                                   [system] {
+    header "__type_traits/is_void.h"
+    export std_private_type_traits_integral_constant
+  }
+  module std_private_type_traits_is_volatile                               [system] { header "__type_traits/is_volatile.h" }
+  module std_private_type_traits_lazy                                      [system] { header "__type_traits/lazy.h" }
+  module std_private_type_traits_make_32_64_or_128_bit                     [system] { header "__type_traits/make_32_64_or_128_bit.h" }
+  module std_private_type_traits_make_const_lvalue_ref                     [system] { header "__type_traits/make_const_lvalue_ref.h" }
+  module std_private_type_traits_make_signed                               [system] { header "__type_traits/make_signed.h" }
+  module std_private_type_traits_make_unsigned                             [system] {
+    header "__type_traits/make_unsigned.h"
+    export std_private_type_traits_is_unsigned
+  }
+  module std_private_type_traits_maybe_const                               [system] { header "__type_traits/maybe_const.h" }
+  module std_private_type_traits_nat                                       [system] { header "__type_traits/nat.h" }
+  module std_private_type_traits_negation                                  [system] { header "__type_traits/negation.h" }
+  module std_private_type_traits_noexcept_move_assign_container            [system] { header "__type_traits/noexcept_move_assign_container.h" }
+  module std_private_type_traits_operation_traits                          [system] { header "__type_traits/operation_traits.h" }
+  module std_private_type_traits_promote                                   [system] { header "__type_traits/promote.h" }
+  module std_private_type_traits_rank                                      [system] { header "__type_traits/rank.h" }
+  module std_private_type_traits_remove_all_extents                        [system] { header "__type_traits/remove_all_extents.h" }
+  module std_private_type_traits_remove_const                              [system] { header "__type_traits/remove_const.h" }
+  module std_private_type_traits_remove_const_ref                          [system] { header "__type_traits/remove_const_ref.h" }
+  module std_private_type_traits_remove_cv                                 [system] {
+    header "__type_traits/remove_cv.h"
+    export std_private_type_traits_remove_const
+    export std_private_type_traits_remove_volatile
+  }
+  module std_private_type_traits_remove_cvref                              [system] { header "__type_traits/remove_cvref.h" }
+  module std_private_type_traits_remove_extent                             [system] { header "__type_traits/remove_extent.h" }
+  module std_private_type_traits_remove_pointer                            [system] { header "__type_traits/remove_pointer.h" }
+  module std_private_type_traits_remove_reference                          [system] { header "__type_traits/remove_reference.h" }
+  module std_private_type_traits_remove_volatile                           [system] { header "__type_traits/remove_volatile.h" }
+  module std_private_type_traits_result_of                                 [system] { header "__type_traits/result_of.h" }
+  module std_private_type_traits_strip_signature                           [system] { header "__type_traits/strip_signature.h" }
+  module std_private_type_traits_type_identity                             [system] { header "__type_traits/type_identity.h" }
+  module std_private_type_traits_type_list                                 [system] { header "__type_traits/type_list.h" }
+  module std_private_type_traits_underlying_type                           [system] {
+    header "__type_traits/underlying_type.h"
+    export std_private_type_traits_is_enum
+  }
+  module std_private_type_traits_unwrap_ref                                [system] { header "__type_traits/unwrap_ref.h" }
+  module std_private_type_traits_void_t                                    [system] { header "__type_traits/void_t.h" }
+
+  module std_private_utility_as_const               [system] { header "__utility/as_const.h" }
+  module std_private_utility_as_lvalue              [system] { header "__utility/as_lvalue.h" }
+  module std_private_utility_auto_cast              [system] {
+    header "__utility/auto_cast.h"
+    export std_private_type_traits_decay
+  }
+  module std_private_utility_cmp                    [system] {
+    header "__utility/cmp.h"
+    export std_private_type_traits_make_unsigned
+  }
+  module std_private_utility_convert_to_integral    [system] { header "__utility/convert_to_integral.h" }
+  module std_private_utility_declval                [system] { header "__utility/declval.h" }
+  module std_private_utility_empty                  [system] { header "__utility/empty.h" }
+  module std_private_utility_exception_guard        [system] { header "__utility/exception_guard.h" }
+  module std_private_utility_exchange               [system] { header "__utility/exchange.h" }
+  module std_private_utility_forward                [system] { header "__utility/forward.h" }
+  module std_private_utility_forward_like           [system] { header "__utility/forward_like.h" }
+  module std_private_utility_in_place               [system] { header "__utility/in_place.h" }
+  module std_private_utility_integer_sequence       [system] { header "__utility/integer_sequence.h" }
+  module std_private_utility_is_pointer_in_range    [system] { header "__utility/is_pointer_in_range.h" }
+  module std_private_utility_move                   [system] {
+    header "__utility/move.h"
+    export std_private_type_traits_is_copy_constructible
+    export std_private_type_traits_is_nothrow_move_constructible
+    export std_private_type_traits_remove_reference
+  }
+  module std_private_utility_no_destroy             [system] { header "__utility/no_destroy.h" }
+  module std_private_utility_pair                   [system] {
+    header "__utility/pair.h"
+    export std_private_ranges_subrange_fwd
+    export std_private_tuple_pair_like
+    export std_private_type_traits_is_assignable
+    export std_private_type_traits_is_constructible
+    export std_private_type_traits_is_convertible
+    export std_private_type_traits_is_copy_assignable
+    export std_private_type_traits_is_move_assignable
+    export std_private_type_traits_is_nothrow_copy_constructible
+    export std_private_type_traits_is_nothrow_default_constructible
+    export std_private_type_traits_is_nothrow_move_assignable
+    export std_private_utility_pair_fwd
+  }
+  module std_private_utility_pair_fwd               [system] { header "__fwd/pair.h" }
+  module std_private_utility_piecewise_construct    [system] { header "__utility/piecewise_construct.h" }
+  module std_private_utility_priority_tag           [system] { header "__utility/priority_tag.h" }
+  module std_private_utility_rel_ops                [system] { header "__utility/rel_ops.h" }
+  module std_private_utility_small_buffer           [system] { header "__utility/small_buffer.h" }
+  module std_private_utility_swap                   [system] {
+    header "__utility/swap.h"
+    export std_private_type_traits_is_swappable
+  }
+  module std_private_utility_to_underlying          [system] { header "__utility/to_underlying.h" }
+  module std_private_utility_unreachable            [system] { header "__utility/unreachable.h" }
+
+  module std_private_variant_monostate [system] { header "__variant/monostate.h" }
+}
diff --git a/devel/root/files/patch-cmake_modules_SetUpFreeBSD.cmake b/devel/root/files/patch-cmake_modules_SetUpFreeBSD.cmake
new file mode 100644
index 000000000000..5e62271be920
--- /dev/null
+++ b/devel/root/files/patch-cmake_modules_SetUpFreeBSD.cmake
@@ -0,0 +1,12 @@
+--- cmake/modules/SetUpFreeBSD.cmake.orig	2024-03-21 09:58:40 UTC
++++ cmake/modules/SetUpFreeBSD.cmake
+@@ -11,6 +11,9 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686)
+   set(FP_MATH_FLAGS "-msse2 -mfpmath=sse")
+   set(ROOT_ARCHITECTURE freebsdi686)
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i386) # FreeBSD port maintainer note: Treating i386 as i686 might just work...
++  set(FP_MATH_FLAGS "-msse2 -mfpmath=sse")
++  set(ROOT_ARCHITECTURE freebsdi386)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
+   set(ROOT_ARCHITECTURE freebsdarm64)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
diff --git a/devel/root/files/patch-core_clingutils_CMakeLists.txt b/devel/root/files/patch-core_clingutils_CMakeLists.txt
new file mode 100644
index 000000000000..9894be5a0cc4
--- /dev/null
+++ b/devel/root/files/patch-core_clingutils_CMakeLists.txt
@@ -0,0 +1,23 @@
+--- core/clingutils/CMakeLists.txt.orig	2024-04-12 17:58:43 UTC
++++ core/clingutils/CMakeLists.txt
+@@ -123,6 +123,20 @@ if (runtime_cxxmodules)
+   if (CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0.0.15000309)
+     set(custom_modulemaps ${custom_modulemaps} std_darwin.modulemap)
+   endif()
++  #[[
++  FreeBSD port maintainer note:
++  Related to upstream PR https://github.com/root-project/root/pull/14920.
++  Depending on a given system's version of LLVM, the standard library module.modulemap file
++  distributed with the OS might cause ROOT to fail to build, because the module.modulemap
++  file needs patching.
++  The port patch removes the implicit use of the system's module.modulemap file and applies,
++  explicitly, the same module.modulemap file - with modifications, if needed.
++  The (modified) module.modulemap file is provided by the port in
++  ${PATCHDIR}/interpreter-cling-include-cling-std__fbsd${OSREL}.modulemap.
++  ]]#
++  if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
++    set(custom_modulemaps ${custom_modulemaps} std_fbsd.modulemap)
++  endif()
+ 
+   if (NOT libcxx)
+     if (MSVC)
diff --git a/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx b/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx
new file mode 100644
index 000000000000..92992dfd133b
--- /dev/null
+++ b/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx
@@ -0,0 +1,18 @@
+--- core/clingutils/src/TClingUtils.cxx.orig	2024-05-30 18:16:07 UTC
++++ core/clingutils/src/TClingUtils.cxx
+@@ -3357,8 +3357,13 @@ std::string ROOT::TMetaUtils::GetFileName(const clang:
+       // we trace it back to the top-level system header that includes this
+       // declaration.
+       if (interp.getCI()->getLangOpts().Modules && !headerFE) {
+-         assert(decl.isFirstDecl() && "Couldn't trace back include from a decl"
+-                                      " that is not from an AST file");
++        /*
++         * FreeBSD port maintainer note: CMake option 'asserts' is enabled, when building ROOT with debug symbols.
++         *                               Building then fails on this one assertion. We hack out the assertion, building
++         *                               succeeds once again, and we pray that everything will be fine.
++         */
++         //assert(decl.isFirstDecl() && "Couldn't trace back include from a decl"
++         //                             " that is not from an AST file");
+          assert(StringRef(includeLoc.printToString(sourceManager)).startswith("<module-includes>"));
+          break;
+       }
diff --git a/devel/root/files/patch-interpreter_CMakeLists.txt b/devel/root/files/patch-interpreter_CMakeLists.txt
deleted file mode 100644
index d4e5ae9a861d..000000000000
--- a/devel/root/files/patch-interpreter_CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- interpreter/CMakeLists.txt.orig	2023-12-09 12:40:45 UTC
-+++ interpreter/CMakeLists.txt
-@@ -81,21 +81,17 @@ set(LLVM_ABI_BREAKING_CHECKS FORCE_OFF CACHE BOOL "" F
- 
- set(CMAKE_REQUIRED_QUIET 1)  # Make the configuration of LLVM quiet
- 
--if(ROOT_ARCHITECTURE MATCHES linuxarm64)
-+if(ROOT_ARCHITECTURE MATCHES arm64)
-   set(ROOT_CLING_TARGET "AArch64")
--elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
-+elseif(ROOT_ARCHITECTURE MATCHES arm)
-   set(ROOT_CLING_TARGET "ARM")
--elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
-+elseif(ROOT_ARCHITECTURE MATCHES ppc64)
-   set(ROOT_CLING_TARGET "PowerPC")
--elseif(ROOT_ARCHITECTURE MATCHES linuxs390)
-+elseif(ROOT_ARCHITECTURE MATCHES s390)
-   set(ROOT_CLING_TARGET "SystemZ")
--elseif(ROOT_ARCHITECTURE MATCHES linuxriscv64)
-+elseif(ROOT_ARCHITECTURE MATCHES riscv64)
-   set(ROOT_CLING_TARGET "RISCV")
--elseif(ROOT_ARCHITECTURE MATCHES linux)
--  set(ROOT_CLING_TARGET "X86")
--elseif(ROOT_ARCHITECTURE MATCHES macosxarm64)
--  set(ROOT_CLING_TARGET "AArch64")
--elseif(ROOT_ARCHITECTURE MATCHES macosx)
-+elseif(ROOT_ARCHITECTURE MATCHES freebsd OR ROOT_ARCHITECTURE MATCHES linux OR ROOT_ARCHITECTURE MATCHES macosx)
-   set(ROOT_CLING_TARGET "X86")
- elseif(ROOT_ARCHITECTURE MATCHES win32 OR ROOT_ARCHITECTURE MATCHES win64)
-   set(ROOT_CLING_TARGET "X86")
diff --git a/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp b/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp
new file mode 100644
index 000000000000..12c23ecdf2c5
--- /dev/null
+++ b/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp
@@ -0,0 +1,14 @@
+--- interpreter/cling/lib/Interpreter/CIFactory.cpp.orig	2024-05-30 18:22:02 UTC
++++ interpreter/cling/lib/Interpreter/CIFactory.cpp
+@@ -699,6 +699,11 @@ namespace {
+                               clingIncLoc.str().str(), MOverlay,
+                               /*RegisterModuleMap=*/ true,
+                               /*AllowModulemapOverride=*/ false);
++#elif __FreeBSD__ // See 'FreeBSD port maintainer note' in core/clingutils/CMakeLists.txt
++    maybeAppendOverlayEntry(stdIncLoc.str(), "std_fbsd.modulemap",
++                            clingIncLoc.str().str(), MOverlay,
++                            /*RegisterModuleMap=*/ true,
++                            /*AllowModulemapOverride=*/ false);
+ #else
+     maybeAppendOverlayEntry(cIncLoc.str(), "libc.modulemap",
+                             clingIncLoc.str().str(), MOverlay,
diff --git a/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp
new file mode 100644
index 000000000000..b5a4559cbeec
--- /dev/null
+++ b/devel/root/files/patch-interpreter_cling_lib_Interpreter_Interpreter.cpp
@@ -0,0 +1,13 @@
+--- interpreter/cling/lib/Interpreter/Interpreter.cpp.orig	2024-05-30 18:23:48 UTC
++++ interpreter/cling/lib/Interpreter/Interpreter.cpp
+@@ -889,8 +889,10 @@ namespace cling {
+                                     /*AllowExtraSearch*/ true))
+       return loadModule(M, complain);
+ 
++#ifndef __FreeBSD__ // See 'FreeBSD port maintainer note' in core/clingutils/CMakeLists.txt
+    if (complain)
+      llvm::errs() << "Module " << moduleName << " not found.\n";
++#endif
+ 
+ 
+    return false;
diff --git a/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp b/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp
deleted file mode 100644
index 556a68a289ab..000000000000
--- a/devel/root/files/patch-interpreter_llvm-project_clang_lib_Serialization_ASTWriter.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp.orig	2024-01-11 19:51:52 UTC
-+++ interpreter/llvm-project/clang/lib/Serialization/ASTWriter.cpp
-@@ -2498,8 +2498,10 @@ unsigned ASTWriter::getSubmoduleID(Module *Mod) {
-   // did not result in us loading a module file for that submodule. For
-   // instance, a cross-top-level-module 'conflict' declaration will hit this.
-   unsigned ID = getLocalOrImportedSubmoduleID(Mod);
-+  /*
-   assert((ID || !Mod) &&
-          "asked for module ID for non-local, non-imported module");
-+   */
-   return ID;
- }
- 
diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
index 856f58b5a8fd..6e838821aa10 100644
--- a/devel/root/pkg-plist
+++ b/devel/root/pkg-plist
@@ -1,9 +1,10 @@
+%%FORTRAN%%bin/g2root
 bin/genreflex
+%%FORTRAN%%bin/h2root
 bin/hadd
-bin/hist2workspace
-bin/prepareHistFactory
+%%XML%%%%ROOFIT%%bin/hist2workspace
+%%ROOFIT%%bin/prepareHistFactory
 bin/proofserv
-bin/proofserv.exe
 bin/rmkdepend
 %%X11%%bin/root
 bin/root-config
@@ -31,12 +32,11 @@ bin/setxrd.sh
 bin/thisroot.csh
 bin/thisroot.fish
 bin/thisroot.sh
-bin/xpdtest
-%%ETCDIR%%/HistFactorySchema.dtd
+%%ROOFIT%%%%ETCDIR%%/HistFactorySchema.dtd
 %%ETCDIR%%/Makefile.arch
 %%ETCDIR%%/RadioNuclides.txt
-%%ETCDIR%%/RooFitHS3_wsexportkeys.json
-%%ETCDIR%%/RooFitHS3_wsfactoryexpressions.json
+%%ROOFIT%%%%ETCDIR%%/RooFitHS3_wsexportkeys.json
+%%ROOFIT%%%%ETCDIR%%/RooFitHS3_wsfactoryexpressions.json
 %%ETCDIR%%/class.rules
 %%ETCDIR%%/cling/Interpreter/DynamicExprInfo.h
 %%ETCDIR%%/cling/Interpreter/DynamicLookupLifetimeHandler.h
@@ -51,332 +51,205 @@ bin/xpdtest
 %%ETCDIR%%/cling/cint/multimap
 %%ETCDIR%%/cling/cint/multiset
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/cuda.modulemap
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_builtin_vars.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_cmath.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_complex_builtins.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_device_functions.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_intrinsics.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_libdevice_declares.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_math.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_math_forward_declares.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_cuda_runtime_wrapper.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_hip_cmath.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_hip_libdevice_declares.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_hip_math.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__clang_hip_runtime_wrapper.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__stddef_max_align_t.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__wmmintrin_aes.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/__wmmintrin_pclmul.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/adxintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/altivec.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ammintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/amxintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm64intr.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_acle.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_bf16.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_cde.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_cmse.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_fp16.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_mve.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_neon.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/arm_sve.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/armintr.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx2intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512bf16intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512bitalgintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512bwintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512cdintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512dqintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512erintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512fintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512ifmaintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512ifmavlintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512pfintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vbmi2intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vbmiintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vbmivlintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlbf16intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlbitalgintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlbwintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlcdintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vldqintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlvbmi2intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlvnniintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vlvp2intersectintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vnniintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vp2intersectintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vpopcntdqintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avx512vpopcntdqvlintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avxintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/avxvnniintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/bmi2intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/bmiintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/builtins.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cet.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cetintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cldemoteintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/clflushoptintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/clwbintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/clzerointrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cpuid.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cuda_wrappers/algorithm
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cuda_wrappers/complex
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/cuda_wrappers/new
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/emmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/enqcmdintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/f16cintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/float.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/fma4intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/fmaintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/fxsrintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/gfniintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/hexagon_circ_brev_intrinsics.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/hexagon_protos.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/hexagon_types.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/hresetintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/htmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/htmxlintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/hvx_hexagon_protos.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ia32intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/immintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/inttypes.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/invpcidintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/iso646.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/keylockerintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/limits.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/lwpintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/lzcntintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/mm3dnow.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/mm_malloc.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/mmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/module.modulemap
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/movdirintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/msa.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/mwaitxintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/nmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/opencl-c-base.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/opencl-c.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/cmath
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/complex
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/complex.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/complex_cmath.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/math.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/openmp_wrappers/new
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/pconfigintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/pkuintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/pmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/popcntintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/emmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/mm_malloc.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/mmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/pmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/smmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/tmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ppc_wrappers/xmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/prfchwintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/ptwriteintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/rdseedintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/riscv_vector.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/rtmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/s390intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/serializeintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/sgxintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/shaintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/smmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdalign.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdarg.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdatomic.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdbool.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stddef.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdint.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/stdnoreturn.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/tbmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/tgmath.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/tmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/tsxldtrkintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/uintrintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/unwind.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/vadefs.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/vaesintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/varargs.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/vecintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/vpclmulqdqintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/waitpkgintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/wasm_simd128.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/wbnoinvdintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/wmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/x86gprintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/x86intrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xmmintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xopintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xsavecintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xsaveintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xsaveoptintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xsavesintrin.h
-%%ETCDIR%%/cling/lib/clang/13.0.0/include/xtestintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_builtin_vars.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_cmath.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_complex_builtins.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_device_functions.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_intrinsics.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_libdevice_declares.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_math.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_math_forward_declares.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_runtime_wrapper.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_texture_intrinsics.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_hip_cmath.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_hip_libdevice_declares.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_hip_math.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_hip_runtime_wrapper.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_hip_stdlib.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__stddef_max_align_t.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__wmmintrin_aes.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__wmmintrin_pclmul.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/adxintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/altivec.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ammintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/amxfp16intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/amxintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm64intr.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_acle.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_bf%%ROOT_CLANG_VER%%.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_cde.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_cmse.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_fp%%ROOT_CLANG_VER%%.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_mve.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_neon.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_neon_sve_bridge.h
+%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/arm_sve.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/armintr.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx2intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512bf16intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512bitalgintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512bwintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512cdintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512dqintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512erintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512fintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512fp16intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512ifmaintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512ifmavlintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512pfintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vbmi2intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vbmiintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vbmivlintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlbf16intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlbitalgintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlbwintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlcdintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vldqintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlfp16intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlvbmi2intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlvnniintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vlvp2intersectintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vnniintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vp2intersectintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vpopcntdqintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avx512vpopcntdqvlintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avxifmaintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avxintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avxneconvertintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avxvnniint8intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/avxvnniintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/bmi2intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/bmiintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/builtins.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cet.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cetintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cldemoteintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/clflushoptintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/clwbintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/clzerointrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cmpccxaddintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cpuid.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/crc32intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cuda_wrappers/algorithm
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cuda_wrappers/cmath
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cuda_wrappers/complex
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/cuda_wrappers/new
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/emmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/enqcmdintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/f16cintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/float.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/fma4intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/fmaintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/fxsrintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/gfniintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hexagon_circ_brev_intrinsics.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hexagon_protos.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hexagon_types.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hlsl.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hlsl/hlsl_basic_types.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hlsl/hlsl_intrinsics.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hresetintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/htmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/htmxlintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/hvx_hexagon_protos.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ia32intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/immintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/inttypes.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/invpcidintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/iso646.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/keylockerintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/larchintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/limits.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/lwpintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/lzcntintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/mm3dnow.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/mm_malloc.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/mmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/module.modulemap
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/movdirintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/msa.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/mwaitxintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/nmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/opencl-c-base.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/opencl-c.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/__clang_openmp_device_functions.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/cmath
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/complex
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/complex.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/complex_cmath.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/math.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/openmp_wrappers/new
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/pconfigintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/pkuintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/pmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/popcntintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/bmi2intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/bmiintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/emmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/immintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/mm_malloc.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/mmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/pmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/smmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/tmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/x86gprintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/x86intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ppc_wrappers/xmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/prfchiintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/prfchwintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/ptwriteintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/raointintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/rdpruintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/rdseedintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/rtmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/s390intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/serializeintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/sgxintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/shaintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/smmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdalign.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdarg.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdatomic.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdbool.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stddef.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdint.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/stdnoreturn.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/tbmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/tgmath.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/tmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/tsxldtrkintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/uintrintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/unwind.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/vadefs.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/vaesintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/varargs.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/vecintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/velintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/velintrin_approx.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/velintrin_gen.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/vpclmulqdqintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/waitpkgintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/wasm_simd128.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/wbnoinvdintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/wmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/x86gprintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/x86intrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xmmintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xopintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsavecintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsaveintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsaveoptintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsavesintrin.h
+%%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xtestintrin.h
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/libc.modulemap
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/module.modulemap
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/std.modulemap
+%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/std_fbsd.modulemap
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/tinyxml2.modulemap
 %%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/vc.modulemap
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/allDict.cxx.pch
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/allCppflags.txt
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/allHeaders.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/allLinkDefs.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/bindings/pyroot_legacy/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/bindings/r/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/bindings/tpython/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/base/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/base/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/base/inc/LinkDef2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/base/inc/LinkDef3.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/cont/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/imt/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/macosx/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/meta/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/multiproc/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/rint/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/thread/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/unix/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/core/winnt/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/gdml/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/geombuilder/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/geompainter/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/vecgeom/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/geom/webviewer/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/asimage/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/asimage/inc/LinkDefGui.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/cocoa/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/fitsio/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/gpad/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/gpadv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/graf/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/gviz/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/postscript/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/primitivesv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/win32gdk/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/x11/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf2d/x11ttf/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/csg/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/eve7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/g3d/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/gl/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/gviz3d/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/graf3d/x3d/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/browsable/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/browserv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/fitpanel/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/fitpanelv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/ged/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/gui/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/guibuilder/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/guihtml/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/recorder/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/sessionviewer/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/webdisplay/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/gui/webgui6/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/hbook/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/hist/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/histdrawv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/histpainter/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/histv7/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/spectrum/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/spectrumpainter/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/hist/unfold/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/html/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/dcache/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/gfal/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/io/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/mpi/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/sql/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/xml/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/io/xmlparser/inc/LinkDef.h
 %%ETCDIR%%/dictpch/makepch.py
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/fftw/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/foam/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/fumili/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/genetic/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector32.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVectorAll.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef3.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef_Func.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef_Func.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef_RootFinding.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/matrix/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/minuit/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/minuit2/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/mlp/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/physics/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/quadp/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/rtools/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDefAll.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDefD32.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/splot/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/unuran/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/math/vecops/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/montecarlo/eg/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/montecarlo/pythia6/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/montecarlo/pythia8/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/auth/inc/LinkDefRoot.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/davix/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/http/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/httpsniff/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/monalisa/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/net/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/netx/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/net/netxng/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/proof/proof/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/proof/proofbench/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/proof/proofplayer/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/proof/proofplayer/inc/LinkDefDraw.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/proof/proofx/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/RDataFrameHelpers/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/histfactory/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/roofit/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/roofitcore/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/roofitmore/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/roostats/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/roofit/xroofit/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/sql/mysql/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/sql/odbc/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/sql/oracle/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/sql/pgsql/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/sql/sqlite/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/pymva/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/rmva/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/sofie/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/sofie_parsers/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef1.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef2.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef3.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef4.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef5.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDefUtils.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tmva/tmvagui/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/dataframe/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/ntuple/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/ntupleutil/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/tree/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/treeplayer/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/treeviewer/inc/LinkDef.h
-%%ONLY_INSTALLED_ON_AARCH64%%%%ETCDIR%%/dictpch/tree/webviewer/inc/LinkDef.h
 %%ETCDIR%%/gdb-backtrace.sh
 %%ETCDIR%%/gitinfo.txt
 %%ETCDIR%%/helgrind-root.supp
@@ -445,7 +318,6 @@ bin/xpdtest
 %%ETCDIR%%/plugins/TDataSetManager/P010_TDataSetManagerFile.C
 %%ETCDIR%%/plugins/TFile/P010_TWebFile.C
 %%ETCDIR%%/plugins/TFile/P040_TDCacheFile.C
-%%ETCDIR%%/plugins/TFile/P050_TGFALFile.C
 %%ETCDIR%%/plugins/TFile/P080_TXMLFile.C
 %%ETCDIR%%/plugins/TFile/P090_TSQLFile.C
 %%ETCDIR%%/plugins/TFile/P100_TXNetFile.C
@@ -540,8 +412,6 @@ bin/xpdtest
 %%ETCDIR%%/proof/motd.sample
 %%ETCDIR%%/proof/noproof.sample
 %%ETCDIR%%/proof/proof.conf.sample
-%%ETCDIR%%/proof/proofbench/ProofBenchCPUSel.par
-%%ETCDIR%%/proof/proofbench/ProofBenchDataSel.par
 %%ETCDIR%%/proof/proofbench/README
 %%ETCDIR%%/proof/rootnetrc.sample
 %%ETCDIR%%/proof/utils/circle.sh
@@ -558,6 +428,7 @@ bin/xpdtest
 %%ETCDIR%%/proof/xpd.groups.sample
 %%ETCDIR%%/root.desktop
 %%ETCDIR%%/root.mimes
+%%ETCDIR%%/runfirefox.sh
 %%ETCDIR%%/system.rootauthrc
 %%ETCDIR%%/system.rootdaemonrc
 %%ETCDIR%%/system.rootrc
@@ -600,7 +471,7 @@ include/root/GLConstants.h
 include/root/Getline.h
 include/root/Gtypes.h
 include/root/GuiTypes.h
-include/root/HFMsgService.h
+%%ROOFIT%%include/root/HFMsgService.h
 include/root/HFitInterface.h
 include/root/HelpSMText.h
 include/root/HelpText.h
@@ -628,7 +499,7 @@ include/root/Math/BrentMinimizer1D.h
 include/root/Math/BrentRootFinder.h
 include/root/Math/Cartesian2D.h
 include/root/Math/Cartesian3D.h
-include/root/Math/ChebyshevApprox.h
+%%MATHMORE%%include/root/Math/ChebyshevApprox.h
 include/root/Math/ChebyshevPol.h
 include/root/Math/CholeskyDecomp.h
 include/root/Math/CladDerivator.h
@@ -637,7 +508,7 @@ include/root/Math/CramerInversionSym.icc
 include/root/Math/Cylindrical3D.h
 include/root/Math/CylindricalEta3D.h
 include/root/Math/Delaunay2D.h
-include/root/Math/Derivator.h
+%%MATHMORE%%include/root/Math/Derivator.h
 include/root/Math/Dfact.h
 include/root/Math/Dfactir.h
 include/root/Math/Dfinv.h
@@ -646,7 +517,7 @@ include/root/Math/DisplacementVector2D.h
 include/root/Math/DisplacementVector3D.h
 include/root/Math/DistFunc.h
 include/root/Math/DistFuncMathCore.h
-include/root/Math/DistFuncMathMore.h
+%%MATHMORE%%include/root/Math/DistFuncMathMore.h
 include/root/Math/DistSampler.h
 include/root/Math/DistSamplerOptions.h
 include/root/Math/Dsfact.h
@@ -658,22 +529,22 @@ include/root/Math/Factory.h
 include/root/Math/FitMethodFunction.h
 include/root/Math/Functions.h
 include/root/Math/Functor.h
-include/root/Math/GSLFunctionAdapter.h
-include/root/Math/GSLIntegrator.h
-include/root/Math/GSLMCIntegrator.h
-include/root/Math/GSLMinimizer.h
-include/root/Math/GSLMinimizer1D.h
-include/root/Math/GSLMultiRootFinder.h
-include/root/Math/GSLNLSMinimizer.h
-include/root/Math/GSLQuasiRandom.h
-include/root/Math/GSLRandom.h
-include/root/Math/GSLRandomFunctions.h
-include/root/Math/GSLRndmEngines.h
-include/root/Math/GSLRootFinder.h
-include/root/Math/GSLRootFinderDeriv.h
-include/root/Math/GSLRootHelper.h
-include/root/Math/GSLSimAnMinimizer.h
-include/root/Math/GSLSimAnnealing.h
+%%MATHMORE%%include/root/Math/GSLFunctionAdapter.h
+%%MATHMORE%%include/root/Math/GSLIntegrator.h
+%%MATHMORE%%include/root/Math/GSLMCIntegrator.h
+%%MATHMORE%%include/root/Math/GSLMinimizer.h
+%%MATHMORE%%include/root/Math/GSLMinimizer1D.h
+%%MATHMORE%%include/root/Math/GSLMultiRootFinder.h
+%%MATHMORE%%include/root/Math/GSLNLSMinimizer.h
+%%MATHMORE%%include/root/Math/GSLQuasiRandom.h
+%%MATHMORE%%include/root/Math/GSLRandom.h
+%%MATHMORE%%include/root/Math/GSLRandomFunctions.h
+%%MATHMORE%%include/root/Math/GSLRndmEngines.h
+%%MATHMORE%%include/root/Math/GSLRootFinder.h
+%%MATHMORE%%include/root/Math/GSLRootFinderDeriv.h
+%%MATHMORE%%include/root/Math/GSLRootHelper.h
+%%MATHMORE%%include/root/Math/GSLSimAnMinimizer.h
+%%MATHMORE%%include/root/Math/GSLSimAnnealing.h
 include/root/Math/GaussIntegrator.h
 include/root/Math/GaussLegendreIntegrator.h
 include/root/Math/GenAlgoOptions.h
@@ -745,7 +616,7 @@ include/root/Math/GenVector/Translation3D.h
 include/root/Math/GenVector/VectorUtil.h
 include/root/Math/GenVector/eta.h
 include/root/Math/GenVector/etaMax.h
-include/root/Math/GeneticMinimizer.h
+%%TMVAML%%include/root/Math/GeneticMinimizer.h
 include/root/Math/GoFTest.h
 include/root/Math/HelperOps.h
 include/root/Math/IFunction.h
@@ -755,19 +626,19 @@ include/root/Math/IOptions.h
 include/root/Math/IParamFunction.h
 include/root/Math/IParamFunctionfwd.h
 include/root/Math/IRootFinderMethod.h
-include/root/Math/IntegrationTypes.h
+%%MATHMORE%%include/root/Math/IntegrationTypes.h
 include/root/Math/Integrator.h
 include/root/Math/IntegratorMultiDim.h
 include/root/Math/IntegratorOptions.h
-include/root/Math/InterpolationTypes.h
-include/root/Math/Interpolator.h
+%%MATHMORE%%include/root/Math/InterpolationTypes.h
+%%MATHMORE%%include/root/Math/Interpolator.h
 include/root/Math/KDTree.h
 include/root/Math/KDTree.icc
 include/root/Math/LCGEngine.h
 include/root/Math/LorentzRotation.h
 include/root/Math/LorentzVector.h
-include/root/Math/MCIntegrationTypes.h
-include/root/Math/MCParameters.h
+%%MATHMORE%%include/root/Math/MCIntegrationTypes.h
+%%MATHMORE%%include/root/Math/MCParameters.h
 include/root/Math/MConfig.h
 include/root/Math/Math.h
 include/root/Math/MatrixFunctions.h
@@ -782,14 +653,14 @@ include/root/Math/MinimizerVariableTransformation.h
 include/root/Math/MixMaxEngine.h
 include/root/Math/MixMaxEngine.icc
 include/root/Math/MultiDimParamFunctionAdapter.h
-include/root/Math/MultiNumGradFunction.h
-include/root/Math/MultiRootFinder.h
+%%MATHMORE%%include/root/Math/MultiNumGradFunction.h
+%%MATHMORE%%include/root/Math/MultiRootFinder.h
 include/root/Math/OneDimFunctionAdapter.h
-include/root/Math/ParamFunction.h
+%%MATHMORE%%include/root/Math/ParamFunction.h
 include/root/Math/ParamFunctor.h
 include/root/Math/PdfFunc.h
 include/root/Math/PdfFuncMathCore.h
-include/root/Math/PdfFuncMathMore.h
+%%MATHMORE%%include/root/Math/PdfFuncMathMore.h
 include/root/Math/Plane3D.h
 include/root/Math/Point2D.h
 include/root/Math/Point2Dfwd.h
@@ -797,7 +668,7 @@ include/root/Math/Point3D.h
 include/root/Math/Point3Dfwd.h
 include/root/Math/Polar2D.h
 include/root/Math/Polar3D.h
-include/root/Math/Polynomial.h
+%%MATHMORE%%include/root/Math/Polynomial.h
 include/root/Math/PositionVector2D.h
 include/root/Math/PositionVector3D.h
 include/root/Math/ProbFunc.h
@@ -808,15 +679,15 @@ include/root/Math/PxPyPzE4D.h
 include/root/Math/PxPyPzM4D.h
 include/root/Math/QuantFunc.h
 include/root/Math/QuantFuncMathCore.h
-include/root/Math/QuantFuncMathMore.h
-include/root/Math/QuasiRandom.h
+%%MATHMORE%%include/root/Math/QuantFuncMathMore.h
+%%MATHMORE%%include/root/Math/QuasiRandom.h
 include/root/Math/Quaternion.h
 include/root/Math/Random.h
 include/root/Math/RandomFunctions.h
 include/root/Math/RanluxppEngine.h
 include/root/Math/RichardsonDerivator.h
 include/root/Math/RootFinder.h
-include/root/Math/RootFinderAlgorithms.h
+%%MATHMORE%%include/root/Math/RootFinderAlgorithms.h
 include/root/Math/Rotation3D.h
 include/root/Math/RotationX.h
 include/root/Math/RotationY.h
@@ -830,7 +701,7 @@ include/root/Math/SVector.h
 include/root/Math/SVector.icc
 include/root/Math/SpecFunc.h
 include/root/Math/SpecFuncMathCore.h
-include/root/Math/SpecFuncMathMore.h
+%%MATHMORE%%include/root/Math/SpecFuncMathMore.h
 include/root/Math/StaticCheck.h
 include/root/Math/StdEngine.h
 include/root/Math/TDataPoint.h
@@ -843,12 +714,12 @@ include/root/Math/Translation3D.h
 include/root/Math/Types.h
 include/root/Math/UnaryOperators.h
 include/root/Math/Util.h
-include/root/Math/Vavilov.h
-include/root/Math/VavilovAccurate.h
-include/root/Math/VavilovAccurateCdf.h
-include/root/Math/VavilovAccuratePdf.h
-include/root/Math/VavilovAccurateQuantile.h
-include/root/Math/VavilovFast.h
+%%MATHMORE%%include/root/Math/Vavilov.h
+%%MATHMORE%%include/root/Math/VavilovAccurate.h
+%%MATHMORE%%include/root/Math/VavilovAccurateCdf.h
+%%MATHMORE%%include/root/Math/VavilovAccuratePdf.h
+%%MATHMORE%%include/root/Math/VavilovAccurateQuantile.h
+%%MATHMORE%%include/root/Math/VavilovFast.h
 include/root/Math/Vector2D.h
 include/root/Math/Vector2Dfwd.h
 include/root/Math/Vector3D.h
@@ -976,26 +847,26 @@ include/root/PosixThreadInc.h
 include/root/RConfig.h
 include/root/RConfigOptions.h
 include/root/RConfigure.h
-include/root/RGitCommit.h
-%%ROOT7%%include/root/ROOT/Browsable/RAnyObjectHolder.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RElement.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RGroup.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RHolder.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RItem.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RLevelIter.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RProvider.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RShared.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RSysFile.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RSysFileItem.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RUnique.hxx
-%%ROOT7%%include/root/ROOT/Browsable/RWrapper.hxx
-%%ROOT7%%include/root/ROOT/Browsable/TKeyItem.hxx
-%%ROOT7%%include/root/ROOT/Browsable/TObjectElement.hxx
-%%ROOT7%%include/root/ROOT/Browsable/TObjectHolder.hxx
-%%ROOT7%%include/root/ROOT/Browsable/TObjectItem.hxx
+include/root/ROOT.modulemap
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RAnyObjectHolder.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RElement.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RGroup.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RHolder.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RItem.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RLevelIter.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RProvider.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RShared.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RSysFile.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RSysFileItem.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RUnique.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/RWrapper.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/TKeyItem.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/TObjectElement.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/TObjectHolder.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/Browsable/TObjectItem.hxx
 include/root/ROOT/EExecutionPolicy.hxx
 include/root/ROOT/InternalTreeUtils.hxx
-include/root/ROOT/RArrowDS.hxx
+%%DATAFRAME%%include/root/ROOT/RArrowDS.hxx
 %%ROOT7%%include/root/ROOT/RAttrAggregation.hxx
 %%ROOT7%%include/root/ROOT/RAttrAxis.hxx
 %%ROOT7%%include/root/ROOT/RAttrBase.hxx
@@ -1012,10 +883,10 @@ include/root/ROOT/RArrowDS.hxx
 %%ROOT7%%include/root/ROOT/RAxisConfig.hxx
 %%ROOT7%%include/root/ROOT/RAxisDrawable.hxx
 %%ROOT7%%include/root/ROOT/RBox.hxx
-%%ROOT7%%include/root/ROOT/RBrowser.hxx
-%%ROOT7%%include/root/ROOT/RBrowserData.hxx
-%%ROOT7%%include/root/ROOT/RBrowserReply.hxx
-%%ROOT7%%include/root/ROOT/RBrowserRequest.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RBrowser.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RBrowserData.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RBrowserReply.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RBrowserRequest.hxx
 %%ROOT7%%include/root/ROOT/RCanvas.hxx
 %%ROOT7%%include/root/ROOT/RCluster.hxx
 %%ROOT7%%include/root/ROOT/RClusterPool.hxx
@@ -1026,58 +897,58 @@ include/root/ROOT/RArrowDS.hxx
 include/root/ROOT/RConcurrentHashColl.hxx
 include/root/ROOT/RConfig.h
 include/root/ROOT/RConfig.hxx
-include/root/ROOT/RCsvDS.hxx
-include/root/ROOT/RDF/ActionHelpers.hxx
-include/root/ROOT/RDF/ColumnReaderUtils.hxx
-include/root/ROOT/RDF/GraphNode.hxx
-include/root/ROOT/RDF/GraphUtils.hxx
-include/root/ROOT/RDF/HistoModels.hxx
-include/root/ROOT/RDF/InterfaceUtils.hxx
-include/root/ROOT/RDF/PyROOTHelpers.hxx
-include/root/ROOT/RDF/RAction.hxx
-include/root/ROOT/RDF/RActionBase.hxx
-include/root/ROOT/RDF/RActionImpl.hxx
-include/root/ROOT/RDF/RColumnReaderBase.hxx
-include/root/ROOT/RDF/RColumnRegister.hxx
-include/root/ROOT/RDF/RCutFlowReport.hxx
-include/root/ROOT/RDF/RDFDescription.hxx
-include/root/ROOT/RDF/RDSColumnReader.hxx
-include/root/ROOT/RDF/RDatasetSpec.hxx
-include/root/ROOT/RDF/RDefine.hxx
-include/root/ROOT/RDF/RDefineBase.hxx
-include/root/ROOT/RDF/RDefinePerSample.hxx
-include/root/ROOT/RDF/RDefineReader.hxx
-include/root/ROOT/RDF/RDisplay.hxx
-include/root/ROOT/RDF/RFilter.hxx
-include/root/ROOT/RDF/RFilterBase.hxx
-include/root/ROOT/RDF/RInterface.hxx
-include/root/ROOT/RDF/RInterfaceBase.hxx
-include/root/ROOT/RDF/RJittedAction.hxx
-include/root/ROOT/RDF/RJittedDefine.hxx
-include/root/ROOT/RDF/RJittedFilter.hxx
-include/root/ROOT/RDF/RJittedVariation.hxx
-include/root/ROOT/RDF/RLazyDSImpl.hxx
-include/root/ROOT/RDF/RLoopManager.hxx
-include/root/ROOT/RDF/RMergeableValue.hxx
-include/root/ROOT/RDF/RMetaData.hxx
-include/root/ROOT/RDF/RNewSampleNotifier.hxx
-include/root/ROOT/RDF/RNodeBase.hxx
-include/root/ROOT/RDF/RRange.hxx
-include/root/ROOT/RDF/RRangeBase.hxx
-include/root/ROOT/RDF/RResultMap.hxx
-include/root/ROOT/RDF/RSample.hxx
-include/root/ROOT/RDF/RSampleInfo.hxx
-include/root/ROOT/RDF/RTreeColumnReader.hxx
-include/root/ROOT/RDF/RVariation.hxx
-include/root/ROOT/RDF/RVariationBase.hxx
-include/root/ROOT/RDF/RVariationReader.hxx
-include/root/ROOT/RDF/RVariationsDescription.hxx
-include/root/ROOT/RDF/RVariedAction.hxx
-include/root/ROOT/RDF/Utils.hxx
-include/root/ROOT/RDFHelpers.hxx
+%%DATAFRAME%%include/root/ROOT/RCsvDS.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/ActionHelpers.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/ColumnReaderUtils.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/GraphNode.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/GraphUtils.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/HistoModels.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/InterfaceUtils.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/PyROOTHelpers.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RAction.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RActionBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RActionImpl.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RColumnReaderBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RColumnRegister.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RCutFlowReport.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDFDescription.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDSColumnReader.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDatasetSpec.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDefine.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDefineBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDefinePerSample.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDefineReader.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RDisplay.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RFilter.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RFilterBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RInterface.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RInterfaceBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RJittedAction.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RJittedDefine.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RJittedFilter.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RJittedVariation.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RLazyDSImpl.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RLoopManager.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RMergeableValue.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RMetaData.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RNewSampleNotifier.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RNodeBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RRange.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RRangeBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RResultMap.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RSample.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RSampleInfo.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RTreeColumnReader.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RVariation.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RVariationBase.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RVariationReader.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RVariationsDescription.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/RVariedAction.hxx
+%%DATAFRAME%%include/root/ROOT/RDF/Utils.hxx
+%%DATAFRAME%%include/root/ROOT/RDFHelpers.hxx
 %%ROOT7%%include/root/ROOT/RDaos.hxx
-include/root/ROOT/RDataFrame.hxx
-include/root/ROOT/RDataSource.hxx
+%%DATAFRAME%%include/root/ROOT/RDataFrame.hxx
+%%DATAFRAME%%include/root/ROOT/RDataSource.hxx
 %%ROOT7%%include/root/ROOT/RDirectory.hxx
 %%ROOT7%%include/root/ROOT/RDirectoryEntry.hxx
 %%ROOT7%%include/root/ROOT/RDisplayItem.hxx
@@ -1085,74 +956,75 @@ include/root/ROOT/RDataSource.hxx
 %%ROOT7%%include/root/ROOT/RDrawableRequest.hxx
 %%ROOT7%%include/root/ROOT/REntry.hxx
 %%ROOT7%%include/root/ROOT/RError.hxx
-%%ROOT7%%include/root/ROOT/REveBox.hxx
-%%ROOT7%%include/root/ROOT/REveBoxSet.hxx
-%%ROOT7%%include/root/ROOT/REveCalo.hxx
-%%ROOT7%%include/root/ROOT/REveCaloData.hxx
-%%ROOT7%%include/root/ROOT/REveChunkManager.hxx
-%%ROOT7%%include/root/ROOT/REveClient.hxx
-%%ROOT7%%include/root/ROOT/REveCompound.hxx
-%%ROOT7%%include/root/ROOT/REveDataCollection.hxx
-%%ROOT7%%include/root/ROOT/REveDataProxyBuilderBase.hxx
-%%ROOT7%%include/root/ROOT/REveDataSimpleProxyBuilder.hxx
-%%ROOT7%%include/root/ROOT/REveDataSimpleProxyBuilderTemplate.hxx
-%%ROOT7%%include/root/ROOT/REveDataTable.hxx
-%%ROOT7%%include/root/ROOT/REveDigitSet.hxx
-%%ROOT7%%include/root/ROOT/REveElement.hxx
-%%ROOT7%%include/root/ROOT/REveEllipsoid.hxx
-%%ROOT7%%include/root/ROOT/REveFrameBox.hxx
-%%ROOT7%%include/root/ROOT/REveGeoPolyShape.hxx
-%%ROOT7%%include/root/ROOT/REveGeoShape.hxx
-%%ROOT7%%include/root/ROOT/REveGeoShapeExtract.hxx
-%%ROOT7%%include/root/ROOT/REveGluTess.hxx
-%%ROOT7%%include/root/ROOT/REveJetCone.hxx
-%%ROOT7%%include/root/ROOT/REveLine.hxx
-%%ROOT7%%include/root/ROOT/REveManager.hxx
-%%ROOT7%%include/root/ROOT/REvePathMark.hxx
-%%ROOT7%%include/root/ROOT/REvePointSet.hxx
-%%ROOT7%%include/root/ROOT/REvePolygonSetProjected.hxx
-%%ROOT7%%include/root/ROOT/REveProjectionBases.hxx
-%%ROOT7%%include/root/ROOT/REveProjectionManager.hxx
-%%ROOT7%%include/root/ROOT/REveProjections.hxx
-%%ROOT7%%include/root/ROOT/REveRGBAPalette.hxx
-%%ROOT7%%include/root/ROOT/REveRenderData.hxx
-%%ROOT7%%include/root/ROOT/REveScalableStraightLineSet.hxx
-%%ROOT7%%include/root/ROOT/REveScene.hxx
-%%ROOT7%%include/root/ROOT/REveSceneInfo.hxx
-%%ROOT7%%include/root/ROOT/REveSecondarySelectable.hxx
-%%ROOT7%%include/root/ROOT/REveSelection.hxx
-%%ROOT7%%include/root/ROOT/REveShape.hxx
-%%ROOT7%%include/root/ROOT/REveStraightLineSet.hxx
-%%ROOT7%%include/root/ROOT/REveSystem.hxx
-%%ROOT7%%include/root/ROOT/REveTableInfo.hxx
-%%ROOT7%%include/root/ROOT/REveTableProxyBuilder.hxx
-%%ROOT7%%include/root/ROOT/REveTrack.hxx
-%%ROOT7%%include/root/ROOT/REveTrackProjected.hxx
-%%ROOT7%%include/root/ROOT/REveTrackPropagator.hxx
-%%ROOT7%%include/root/ROOT/REveTrans.hxx
-%%ROOT7%%include/root/ROOT/REveTreeTools.hxx
-%%ROOT7%%include/root/ROOT/REveTypes.hxx
-%%ROOT7%%include/root/ROOT/REveUtil.hxx
-%%ROOT7%%include/root/ROOT/REveVSD.hxx
-%%ROOT7%%include/root/ROOT/REveVSDStructs.hxx
-%%ROOT7%%include/root/ROOT/REveVector.hxx
-%%ROOT7%%include/root/ROOT/REveViewContext.hxx
-%%ROOT7%%include/root/ROOT/REveViewer.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveBox.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveBoxSet.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveCalo.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveCaloData.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveChunkManager.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveClient.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveCompound.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDataCollection.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDataProxyBuilderBase.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDataSimpleProxyBuilder.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDataSimpleProxyBuilderTemplate.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDataTable.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveDigitSet.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveElement.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveEllipsoid.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveFrameBox.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveGeoPolyShape.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveGeoShape.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveGeoShapeExtract.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveGluTess.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveJetCone.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveLine.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveManager.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REvePathMark.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REvePointSet.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REvePolygonSetProjected.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveProjectionBases.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveProjectionManager.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveProjections.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveRGBAPalette.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveRenderData.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveScalableStraightLineSet.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveScene.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveSceneInfo.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveSecondarySelectable.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveSelection.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveShape.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveStraightLineSet.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveSystem.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTableInfo.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTableProxyBuilder.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTrack.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTrackProjected.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTrackPropagator.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTrans.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTreeTools.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveTypes.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveUtil.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveVSD.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveVSDStructs.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveVector.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveViewContext.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/REveViewer.hxx
 %%ROOT7%%include/root/ROOT/RField.hxx
 %%ROOT7%%include/root/ROOT/RFieldVisitor.hxx
 %%ROOT7%%include/root/ROOT/RFile.hxx
-%%ROOT7%%include/root/ROOT/RFileDialog.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RFileDialog.hxx
 %%ROOT7%%include/root/ROOT/RFit.hxx
-%%ROOT7%%include/root/ROOT/RFitPanel.hxx
-%%ROOT7%%include/root/ROOT/RFitPanelModel.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RFitPanel.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RFitPanelModel.hxx
+%%ROOT7%%include/root/ROOT/RFloat16.hxx
 %%ROOT7%%include/root/ROOT/RFont.hxx
 %%ROOT7%%include/root/ROOT/RFrame.hxx
 %%ROOT7%%include/root/ROOT/RFrameTitle.hxx
 include/root/ROOT/RFriendInfo.hxx
-%%ROOT7%%include/root/ROOT/RGeoPainter.hxx
-%%ROOT7%%include/root/ROOT/RGeomData.hxx
-%%ROOT7%%include/root/ROOT/RGeomHierarchy.hxx
-%%ROOT7%%include/root/ROOT/RGeomViewer.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RGeoPainter.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RGeomData.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RGeomHierarchy.hxx
+%%HTTP%%%%ROOT7%%include/root/ROOT/RGeomViewer.hxx
 %%ROOT7%%include/root/ROOT/RHist.hxx
 %%ROOT7%%include/root/ROOT/RHistBinIter.hxx
 %%ROOT7%%include/root/ROOT/RHistBufferedFill.hxx
@@ -1166,7 +1038,7 @@ include/root/ROOT/RFriendInfo.hxx
 %%ROOT7%%include/root/ROOT/RHistView.hxx
 %%ROOT7%%include/root/ROOT/RIndexIter.hxx
 include/root/ROOT/RIoUring.hxx
-include/root/ROOT/RLazyDS.hxx
+%%DATAFRAME%%include/root/ROOT/RLazyDS.hxx
 %%ROOT7%%include/root/ROOT/RLegend.hxx
 %%ROOT7%%include/root/ROOT/RLine.hxx
 include/root/ROOT/RLogger.hxx
@@ -1174,20 +1046,27 @@ include/root/ROOT/RLogger.hxx
 %%ROOT7%%include/root/ROOT/RMenuItems.hxx
 %%ROOT7%%include/root/ROOT/RMiniFile.hxx
 %%ROOT7%%include/root/ROOT/RNTuple.hxx
-include/root/ROOT/RNTupleDS.hxx
+%%DATAFRAME%%include/root/ROOT/RNTupleDS.hxx
+%%ROOT7%%include/root/ROOT/RNTupleCollectionWriter.hxx
 %%ROOT7%%include/root/ROOT/RNTupleDescriptor.hxx
+%%ROOT7%%include/root/ROOT/RNTupleFillContext.hxx
 %%ROOT7%%include/root/ROOT/RNTupleImporter.hxx
+%%ROOT7%%include/root/ROOT/RNTupleImtTaskScheduler.hxx
 %%ROOT7%%include/root/ROOT/RNTupleInspector.hxx
 %%ROOT7%%include/root/ROOT/RNTupleMerger.hxx
 %%ROOT7%%include/root/ROOT/RNTupleMetrics.hxx
 %%ROOT7%%include/root/ROOT/RNTupleModel.hxx
-%%ROOT7%%include/root/ROOT/RNTupleOptions.hxx
+%%ROOT7%%include/root/ROOT/RNTupleParallelWriter.hxx
+%%ROOT7%%include/root/ROOT/RNTupleReadOptions.hxx
+%%ROOT7%%include/root/ROOT/RNTupleReader.hxx
 %%ROOT7%%include/root/ROOT/RNTupleSerialize.hxx
 %%ROOT7%%include/root/ROOT/RNTupleUtil.hxx
 %%ROOT7%%include/root/ROOT/RNTupleView.hxx
+%%ROOT7%%include/root/ROOT/RNTupleWriteOptions.hxx
+%%ROOT7%%include/root/ROOT/RNTupleWriteOptionsDaos.hxx
+%%ROOT7%%include/root/ROOT/RNTupleWriter.hxx
 %%ROOT7%%include/root/ROOT/RNTupleZip.hxx
 include/root/ROOT/RNotFn.hxx
-%%PYROOT%%include/root/ROOT/RNumpyDS.hxx
 %%ROOT7%%include/root/ROOT/ROnFrameDrawable.hxx
 %%ROOT7%%include/root/ROOT/RPad.hxx
 %%ROOT7%%include/root/ROOT/RPadBase.hxx
@@ -1197,6 +1076,7 @@ include/root/ROOT/RNotFn.hxx
 %%ROOT7%%include/root/ROOT/RPadPos.hxx
 %%ROOT7%%include/root/ROOT/RPage.hxx
 %%ROOT7%%include/root/ROOT/RPageAllocator.hxx
+%%ROOT7%%include/root/ROOT/RPageNullSink.hxx
 %%ROOT7%%include/root/ROOT/RPagePool.hxx
 %%ROOT7%%include/root/ROOT/RPageSinkBuf.hxx
 %%ROOT7%%include/root/ROOT/RPageSourceFriends.hxx
@@ -1209,47 +1089,46 @@ include/root/ROOT/RNotFn.hxx
 %%ROOT7%%include/root/ROOT/RPaveText.hxx
 include/root/ROOT/RRangeCast.hxx
 include/root/ROOT/RRawFile.hxx
-include/root/ROOT/RRawFileNetXNG.hxx
+%%XROOTD%%include/root/ROOT/RRawFileNetXNG.hxx
+include/root/ROOT/RRawFileTFile.hxx
 include/root/ROOT/RRawFileUnix.hxx
 include/root/ROOT/RRawFileWin.hxx
-include/root/ROOT/RResultHandle.hxx
-include/root/ROOT/RResultPtr.hxx
-include/root/ROOT/RRootDS.hxx
+%%DATAFRAME%%include/root/ROOT/RResultHandle.hxx
+%%DATAFRAME%%include/root/ROOT/RResultPtr.hxx
+%%DATAFRAME%%include/root/ROOT/RRootDS.hxx
 include/root/ROOT/RSlotStack.hxx
-include/root/ROOT/RSnapshotOptions.hxx
+%%DATAFRAME%%include/root/ROOT/RSnapshotOptions.hxx
 include/root/ROOT/RSpan.hxx
-include/root/ROOT/RSqliteDS.hxx
+%%DATAFRAME%%include/root/ROOT/RSqliteDS.hxx
 include/root/ROOT/RStringView.hxx
 %%ROOT7%%include/root/ROOT/RStyle.hxx
 include/root/ROOT/RTaskArena.hxx
 %%ROOT7%%include/root/ROOT/RText.hxx
-include/root/ROOT/RTreeViewer.hxx
-include/root/ROOT/RTrivialDS.hxx
-%%ROOT7%%include/root/ROOT/RTupleApply.hxx
+%%HTTP%%include/root/ROOT/RTreeViewer.hxx
+%%DATAFRAME%%include/root/ROOT/RTrivialDS.hxx
 include/root/ROOT/RVec.hxx
+%%DATAFRAME%%include/root/ROOT/RVecDS.hxx
 include/root/ROOT/RVersion.hxx
 %%ROOT7%%include/root/ROOT/RVirtualCanvasPainter.hxx
-%%ROOT7%%include/root/ROOT/RWebBrowserImp.hxx
-include/root/ROOT/RWebDisplayArgs.hxx
-include/root/ROOT/RWebDisplayHandle.hxx
-include/root/ROOT/RWebWindow.hxx
-include/root/ROOT/RWebWindowsManager.hxx
-include/root/ROOT/RWrap_libcpp_string_view.h
+%%HTTP%%%%ROOT7%%include/root/ROOT/RWebBrowserImp.hxx
+%%HTTP%%include/root/ROOT/RWebDisplayArgs.hxx
+%%HTTP%%include/root/ROOT/RWebDisplayHandle.hxx
+%%HTTP%%include/root/ROOT/RWebWindow.hxx
+%%HTTP%%include/root/ROOT/RWebWindowsManager.hxx
 include/root/ROOT/StringConv.hxx
 include/root/ROOT/StringUtils.hxx
 include/root/ROOT/TBufferMerger.hxx
-include/root/ROOT/TDataFrame.hxx
+%%DATAFRAME%%include/root/ROOT/TDataFrame.hxx
 include/root/ROOT/TErrorDefaultHandler.hxx
 include/root/ROOT/TExecutor.hxx
 include/root/ROOT/TExecutorCRTP.hxx
-include/root/ROOT/TFuture.hxx
 include/root/ROOT/TIOFeatures.hxx
 %%ROOT7%%include/root/ROOT/TObjectDisplayItem.hxx
 %%ROOT7%%include/root/ROOT/TObjectDrawable.hxx
 include/root/ROOT/TProcessExecutor.hxx
 %%PYROOT%%include/root/ROOT/TPyDispatcher.h
 include/root/ROOT/TRWSpinLock.hxx
-include/root/ROOT/TResultProxy.hxx
+%%DATAFRAME%%include/root/ROOT/TResultProxy.hxx
 include/root/ROOT/TSeq.hxx
 include/root/ROOT/TSequentialExecutor.hxx
 include/root/ROOT/TSpinMutex.hxx
@@ -1261,8 +1140,6 @@ include/root/ROOT/TTreeProcessorMT.hxx
 include/root/ROOT/TTreeReaderFast.hxx
 include/root/ROOT/TTreeReaderValueFast.hxx
 include/root/ROOT/TypeTraits.hxx
-%%ROOT7%%include/root/ROOT/impl_tuple_apply.hxx
-include/root/ROOT/libcpp_string_view.h
 %%ROOT7%%include/root/ROOT/libdaos_mock/daos.h
 include/root/ROOT/span.hxx
 include/root/RQ_OBJECT.h
@@ -1272,381 +1149,372 @@ include/root/RStringView.h
 include/root/RVersion.h
 include/root/RZip.h
 include/root/Riostream.h
-include/root/Roo1DTable.h
-include/root/Roo2DKeysPdf.h
-include/root/RooAICRegistry.h
-include/root/RooAbsAnaConvPdf.h
-include/root/RooAbsArg.h
-include/root/RooAbsBinning.h
-include/root/RooAbsCache.h
-include/root/RooAbsCacheElement.h
-include/root/RooAbsCachedPdf.h
-include/root/RooAbsCachedReal.h
-include/root/RooAbsCategory.h
-include/root/RooAbsCategoryLValue.h
-include/root/RooAbsCollection.h
-include/root/RooAbsData.h
-include/root/RooAbsDataHelper.h
-include/root/RooAbsDataStore.h
-include/root/RooAbsFunc.h
-include/root/RooAbsGenContext.h
-include/root/RooAbsHiddenReal.h
-include/root/RooAbsIntegrator.h
-include/root/RooAbsLValue.h
-include/root/RooAbsMCStudyModule.h
-include/root/RooAbsMoment.h
-include/root/RooAbsOptTestStatistic.h
-include/root/RooAbsPdf.h
-include/root/RooAbsProxy.h
-include/root/RooAbsReal.h
-include/root/RooAbsRealLValue.h
-include/root/RooAbsSelfCachedPdf.h
-include/root/RooAbsSelfCachedReal.h
-include/root/RooAbsStudy.h
-include/root/RooAbsTestStatistic.h
-include/root/RooAdaptiveGaussKronrodIntegrator1D.h
-include/root/RooAdaptiveIntegratorND.h
-include/root/RooAddGenContext.h
-include/root/RooAddModel.h
-include/root/RooAddPdf.h
-include/root/RooAddition.h
-include/root/RooArgList.h
-include/root/RooArgProxy.h
-include/root/RooArgSet.h
-include/root/RooArgusBG.h
-include/root/RooBCPEffDecay.h
-include/root/RooBCPGenDecay.h
-include/root/RooBDecay.h
-include/root/RooBMixDecay.h
-include/root/RooBernstein.h
-include/root/RooBifurGauss.h
-include/root/RooBinIntegrator.h
-include/root/RooBinSamplingPdf.h
-include/root/RooBinWidthFunction.h
-include/root/RooBinnedGenContext.h
-include/root/RooBinning.h
-include/root/RooBinningCategory.h
-include/root/RooBlindTools.h
-include/root/RooBreitWigner.h
-include/root/RooBrentRootFinder.h
-%%ROOT7%%include/root/RooBrowser.h
-include/root/RooBukinPdf.h
-include/root/RooCBShape.h
-include/root/RooCFunction1Binding.h
-include/root/RooCFunction2Binding.h
-include/root/RooCFunction3Binding.h
-include/root/RooCFunction4Binding.h
-include/root/RooCacheManager.h
-include/root/RooCachedPdf.h
-include/root/RooCachedReal.h
-include/root/RooCategory.h
-include/root/RooCategoryProxy.h
-include/root/RooChangeTracker.h
-include/root/RooChebychev.h
-include/root/RooChi2MCSModule.h
-include/root/RooChi2Var.h
-include/root/RooChiSquarePdf.h
-include/root/RooClassFactory.h
-include/root/RooCmdArg.h
-include/root/RooCmdConfig.h
-include/root/RooCollectionProxy.h
-include/root/RooCompositeDataStore.h
-include/root/RooConstVar.h
-include/root/RooConstraintSum.h
-include/root/RooConvCoefVar.h
-include/root/RooConvGenContext.h
-include/root/RooCrystalBall.h
-include/root/RooCurve.h
-include/root/RooCustomizer.h
-include/root/RooDLLSignificanceMCSModule.h
-include/root/RooDataHist.h
-include/root/RooDataHistSliceIter.h
-include/root/RooDataProjBinding.h
-include/root/RooDataSet.h
-include/root/RooDataWeightedAverage.h
-include/root/RooDecay.h
-include/root/RooDerivative.h
-include/root/RooDirItem.h
-include/root/RooDouble.h
-include/root/RooDstD0BG.h
-include/root/RooEffGenContext.h
-include/root/RooEffProd.h
-include/root/RooEfficiency.h
-include/root/RooEllipse.h
-include/root/RooErrorHandler.h
-include/root/RooErrorVar.h
-include/root/RooExpPoly.h
-include/root/RooExpensiveObjectCache.h
-include/root/RooExponential.h
-include/root/RooExtendPdf.h
-include/root/RooExtendedBinding.h
-include/root/RooExtendedTerm.h
-include/root/RooFFTConvPdf.h
-include/root/RooFactoryWSTool.h
-include/root/RooFirstMoment.h
-include/root/RooFit.h
-include/root/RooFit/Config.h
-include/root/RooFit/Detail/AnalyticalIntegrals.h
-include/root/RooFit/Detail/CodeSquashContext.h
-include/root/RooFit/Detail/DataMap.h
-include/root/RooFit/Detail/EvaluateFuncs.h
-include/root/RooFit/Detail/JSONInterface.h
-include/root/RooFit/Detail/NormalizationHelpers.h
-include/root/RooFit/Evaluator.h
-include/root/RooFit/Floats.h
-include/root/RooFit/ModelConfig.h
-include/root/RooFit/TestStatistics/LikelihoodGradientWrapper.h
-include/root/RooFit/TestStatistics/LikelihoodWrapper.h
-include/root/RooFit/TestStatistics/RooAbsL.h
-include/root/RooFit/TestStatistics/RooBinnedL.h
-include/root/RooFit/TestStatistics/RooRealL.h
-include/root/RooFit/TestStatistics/RooSubsidiaryL.h
-include/root/RooFit/TestStatistics/RooSumL.h
-include/root/RooFit/TestStatistics/RooUnbinnedL.h
-include/root/RooFit/TestStatistics/buildLikelihood.h
-include/root/RooFit/UniqueId.h
-%%ROOT7%%include/root/RooFit/xRooFit/Config.h
-%%ROOT7%%include/root/RooFit/xRooFit/xRooBrowser.h
-%%ROOT7%%include/root/RooFit/xRooFit/xRooFit.h
-%%ROOT7%%include/root/RooFit/xRooFit/xRooHypoSpace.h
-%%ROOT7%%include/root/RooFit/xRooFit/xRooNLLVar.h
-%%ROOT7%%include/root/RooFit/xRooFit/xRooNode.h
-include/root/RooFitHS3/JSONIO.h
-include/root/RooFitHS3/RooJSONFactoryWSTool.h
-include/root/RooFitLegacy/RooCatTypeLegacy.h
-include/root/RooFitLegacy/RooCategorySharedProperties.h
-include/root/RooFitLegacy/RooTreeData.h
-include/root/RooFitMoreLib.h
-include/root/RooFitResult.h
-include/root/RooFormulaVar.h
-include/root/RooFracRemainder.h
-include/root/RooFuncWrapper.h
-include/root/RooFunctor.h
-include/root/RooFunctor1DBinding.h
-include/root/RooFunctorBinding.h
-include/root/RooGExpModel.h
-include/root/RooGamma.h
-include/root/RooGaussKronrodIntegrator1D.h
-include/root/RooGaussModel.h
-include/root/RooGaussian.h
-include/root/RooGenContext.h
-include/root/RooGenFitStudy.h
-include/root/RooGenericPdf.h
-include/root/RooGlobalFunc.h
-include/root/RooGrid.h
-include/root/RooHelpers.h
-include/root/RooHist.h
-include/root/RooHistConstraint.h
-include/root/RooHistError.h
-include/root/RooHistFunc.h
-include/root/RooHistPdf.h
-include/root/RooHypatia2.h
-include/root/RooImproperIntegrator1D.h
-include/root/RooIntegralMorph.h
-include/root/RooInvTransform.h
-include/root/RooJeffreysPrior.h
-include/root/RooJohnson.h
-include/root/RooKeysPdf.h
-include/root/RooLagrangianMorphFunc.h
-include/root/RooLandau.h
-include/root/RooLegendre.h
-include/root/RooLinTransBinning.h
-include/root/RooLinearCombination.h
-include/root/RooLinearVar.h
-include/root/RooLinkedList.h
-include/root/RooLinkedListElem.h
-include/root/RooLinkedListIter.h
-include/root/RooListProxy.h
-include/root/RooLognormal.h
-include/root/RooMCIntegrator.h
-include/root/RooMCStudy.h
-include/root/RooMappedCategory.h
-include/root/RooMath.h
-include/root/RooMathCoreReg.h
-include/root/RooMathMoreReg.h
-include/root/RooMinimizer.h
-include/root/RooMoment.h
-include/root/RooMomentMorph.h
-include/root/RooMomentMorphFunc.h
-include/root/RooMomentMorphFuncND.h
-include/root/RooMsgService.h
-include/root/RooMultiBinomial.h
-include/root/RooMultiCategory.h
-include/root/RooMultiVarGaussian.h
-include/root/RooNDKeysPdf.h
-include/root/RooNLLVar.h
-include/root/RooNameReg.h
-include/root/RooNonCPEigenDecay.h
-include/root/RooNonCentralChiSquare.h
-include/root/RooNormSetCache.h
-include/root/RooNovosibirsk.h
-include/root/RooNumCdf.h
-include/root/RooNumConvPdf.h
-include/root/RooNumConvolution.h
-include/root/RooNumGenConfig.h
-include/root/RooNumIntConfig.h
-include/root/RooNumIntFactory.h
-include/root/RooNumRunningInt.h
-include/root/RooNumber.h
-include/root/RooObjCacheManager.h
-include/root/RooParamBinning.h
-include/root/RooParamHistFunc.h
-include/root/RooParametricStepFunction.h
-include/root/RooPlot.h
-include/root/RooPlotable.h
-include/root/RooPoisson.h
-include/root/RooPolyFunc.h
-include/root/RooPolyVar.h
-include/root/RooPolynomial.h
-include/root/RooPower.h
-include/root/RooPrintable.h
-include/root/RooProdGenContext.h
-include/root/RooProdPdf.h
-include/root/RooProduct.h
-include/root/RooProfileLL.h
-include/root/RooProjectedPdf.h
-include/root/RooProofDriverSelector.h
-include/root/RooPullVar.h
-include/root/RooQuasiRandomGenerator.h
-include/root/RooRandom.h
-include/root/RooRandomizeParamMCSModule.h
-include/root/RooRangeBinning.h
-include/root/RooRangeBoolean.h
-include/root/RooRatio.h
-include/root/RooRealBinding.h
-include/root/RooRealConstant.h
-include/root/RooRealIntegral.h
-include/root/RooRealMPFE.h
-include/root/RooRealProxy.h
-include/root/RooRealSumFunc.h
-include/root/RooRealSumPdf.h
-include/root/RooRealVar.h
-include/root/RooRealVarSharedProperties.h
-include/root/RooRecursiveFraction.h
-include/root/RooRefCountList.h
-include/root/RooResolutionModel.h
-include/root/RooRombergIntegrator.h
-include/root/RooSTLRefCountList.h
-include/root/RooSecondMoment.h
-include/root/RooSetProxy.h
-include/root/RooSharedProperties.h
-include/root/RooSimGenContext.h
-include/root/RooSimSplitGenContext.h
-include/root/RooSimWSTool.h
-include/root/RooSimultaneous.h
-include/root/RooSpHarmonic.h
-include/root/RooSpline.h
-include/root/RooStats/AsymptoticCalculator.h
-include/root/RooStats/BayesianCalculator.h
-include/root/RooStats/BernsteinCorrection.h
-include/root/RooStats/CombinedCalculator.h
-include/root/RooStats/ConfInterval.h
-include/root/RooStats/ConfidenceBelt.h
-include/root/RooStats/DebuggingSampler.h
-include/root/RooStats/DebuggingTestStat.h
-include/root/RooStats/DetailedOutputAggregator.h
-include/root/RooStats/FeldmanCousins.h
-include/root/RooStats/FrequentistCalculator.h
-include/root/RooStats/HLFactory.h
-include/root/RooStats/Heaviside.h
-include/root/RooStats/HistFactory/Asimov.h
-include/root/RooStats/HistFactory/Channel.h
-include/root/RooStats/HistFactory/ConfigParser.h
-include/root/RooStats/HistFactory/Data.h
-include/root/RooStats/HistFactory/Detail/HistFactoryImpl.h
-include/root/RooStats/HistFactory/FlexibleInterpVar.h
-include/root/RooStats/HistFactory/HistFactoryException.h
-include/root/RooStats/HistFactory/HistFactoryModelUtils.h
-include/root/RooStats/HistFactory/HistFactoryNavigation.h
-include/root/RooStats/HistFactory/HistRef.h
-include/root/RooStats/HistFactory/HistoToWorkspaceFactoryFast.h
-include/root/RooStats/HistFactory/LinInterpVar.h
-include/root/RooStats/HistFactory/MakeModelAndMeasurementsFast.h
-include/root/RooStats/HistFactory/Measurement.h
-include/root/RooStats/HistFactory/ParamHistFunc.h
-include/root/RooStats/HistFactory/PiecewiseInterpolation.h
-include/root/RooStats/HistFactory/PreprocessFunction.h
-include/root/RooStats/HistFactory/RooBarlowBeestonLL.h
-include/root/RooStats/HistFactory/Sample.h
-include/root/RooStats/HistFactory/Systematics.h
-include/root/RooStats/HybridCalculator.h
-include/root/RooStats/HybridPlot.h
-include/root/RooStats/HybridResult.h
-include/root/RooStats/HypoTestCalculator.h
-include/root/RooStats/HypoTestCalculatorGeneric.h
-include/root/RooStats/HypoTestInverter.h
-include/root/RooStats/HypoTestInverterPlot.h
-include/root/RooStats/HypoTestInverterResult.h
-include/root/RooStats/HypoTestPlot.h
-include/root/RooStats/HypoTestResult.h
-include/root/RooStats/IntervalCalculator.h
-include/root/RooStats/LikelihoodInterval.h
-include/root/RooStats/LikelihoodIntervalPlot.h
-include/root/RooStats/MCMCCalculator.h
-include/root/RooStats/MCMCInterval.h
-include/root/RooStats/MCMCIntervalPlot.h
-include/root/RooStats/MarkovChain.h
-include/root/RooStats/MaxLikelihoodEstimateTestStat.h
-include/root/RooStats/MetropolisHastings.h
-include/root/RooStats/MinNLLTestStat.h
-include/root/RooStats/ModelConfig.h
-include/root/RooStats/NeymanConstruction.h
-include/root/RooStats/NumEventsTestStat.h
-include/root/RooStats/NumberCountingPdfFactory.h
-include/root/RooStats/NumberCountingUtils.h
-include/root/RooStats/PdfProposal.h
-include/root/RooStats/PointSetInterval.h
-include/root/RooStats/ProfileInspector.h
-include/root/RooStats/ProfileLikelihoodCalculator.h
-include/root/RooStats/ProfileLikelihoodTestStat.h
-include/root/RooStats/ProofConfig.h
-include/root/RooStats/ProposalFunction.h
-include/root/RooStats/ProposalHelper.h
-include/root/RooStats/RatioOfProfiledLikelihoodsTestStat.h
-include/root/RooStats/RooStatsUtils.h
-include/root/RooStats/SPlot.h
-include/root/RooStats/SamplingDistPlot.h
-include/root/RooStats/SamplingDistribution.h
-include/root/RooStats/SequentialProposal.h
-include/root/RooStats/SimpleInterval.h
-include/root/RooStats/SimpleLikelihoodRatioTestStat.h
-include/root/RooStats/TestStatSampler.h
-include/root/RooStats/TestStatistic.h
-include/root/RooStats/ToyMCImportanceSampler.h
-include/root/RooStats/ToyMCSampler.h
-include/root/RooStats/ToyMCStudy.h
-include/root/RooStats/UniformProposal.h
-include/root/RooStats/UpperLimitMCSModule.h
-include/root/RooStepFunction.h
-include/root/RooStreamParser.h
-include/root/RooStringVar.h
-include/root/RooStringView.h
-include/root/RooStudyManager.h
-include/root/RooStudyPackage.h
-include/root/RooSuperCategory.h
-include/root/RooTFnBinding.h
-include/root/RooTFnPdfBinding.h
-include/root/RooTMathReg.h
-include/root/RooTObjWrap.h
-include/root/RooTable.h
-include/root/RooTemplateProxy.h
-include/root/RooThresholdCategory.h
-include/root/RooTrace.h
-include/root/RooTreeDataStore.h
-include/root/RooTruthModel.h
-include/root/RooUnblindCPAsymVar.h
-include/root/RooUnblindOffset.h
-include/root/RooUnblindPrecision.h
-include/root/RooUnblindUniform.h
-include/root/RooUniform.h
-include/root/RooUniformBinning.h
-include/root/RooUnitTest.h
-include/root/RooVectorDataStore.h
-include/root/RooVoigtian.h
-include/root/RooWorkspace.h
-include/root/RooWorkspaceHandle.h
-include/root/RooWrapperPdf.h
-include/root/RooXYChi2Var.h
+%%ROOFIT%%include/root/Roo1DTable.h
+%%ROOFIT%%include/root/Roo2DKeysPdf.h
+%%ROOFIT%%include/root/RooAICRegistry.h
+%%ROOFIT%%include/root/RooAbsAnaConvPdf.h
+%%ROOFIT%%include/root/RooAbsArg.h
+%%ROOFIT%%include/root/RooAbsBinning.h
+%%ROOFIT%%include/root/RooAbsCache.h
+%%ROOFIT%%include/root/RooAbsCacheElement.h
+%%ROOFIT%%include/root/RooAbsCachedPdf.h
+%%ROOFIT%%include/root/RooAbsCachedReal.h
+%%ROOFIT%%include/root/RooAbsCategory.h
+%%ROOFIT%%include/root/RooAbsCategoryLValue.h
+%%ROOFIT%%include/root/RooAbsCollection.h
+%%ROOFIT%%include/root/RooAbsData.h
+%%ROOFIT%%%%DATAFRAME%%include/root/RooAbsDataHelper.h
+%%ROOFIT%%include/root/RooAbsDataStore.h
+%%ROOFIT%%include/root/RooAbsFunc.h
+%%ROOFIT%%include/root/RooAbsGenContext.h
+%%ROOFIT%%include/root/RooAbsHiddenReal.h
+%%ROOFIT%%include/root/RooAbsIntegrator.h
+%%ROOFIT%%include/root/RooAbsLValue.h
+%%ROOFIT%%include/root/RooAbsMCStudyModule.h
+%%ROOFIT%%include/root/RooAbsMoment.h
+%%ROOFIT%%include/root/RooAbsOptTestStatistic.h
+%%ROOFIT%%include/root/RooAbsPdf.h
+%%ROOFIT%%include/root/RooAbsProxy.h
+%%ROOFIT%%include/root/RooAbsReal.h
+%%ROOFIT%%include/root/RooAbsRealLValue.h
+%%ROOFIT%%include/root/RooAbsSelfCachedPdf.h
+%%ROOFIT%%include/root/RooAbsSelfCachedReal.h
+%%ROOFIT%%include/root/RooAbsStudy.h
+%%ROOFIT%%include/root/RooAbsTestStatistic.h
+%%ROOFIT%%include/root/RooAddGenContext.h
+%%ROOFIT%%include/root/RooAddModel.h
+%%ROOFIT%%include/root/RooAddPdf.h
+%%ROOFIT%%include/root/RooAddition.h
+%%ROOFIT%%include/root/RooArgList.h
+%%ROOFIT%%include/root/RooArgProxy.h
+%%ROOFIT%%include/root/RooArgSet.h
+%%ROOFIT%%include/root/RooArgusBG.h
+%%ROOFIT%%include/root/RooBCPEffDecay.h
+%%ROOFIT%%include/root/RooBCPGenDecay.h
+%%ROOFIT%%include/root/RooBDecay.h
+%%ROOFIT%%include/root/RooBMixDecay.h
+%%ROOFIT%%include/root/RooBernstein.h
+%%ROOFIT%%include/root/RooBifurGauss.h
+%%ROOFIT%%include/root/RooBinSamplingPdf.h
+%%ROOFIT%%include/root/RooBinWidthFunction.h
+%%ROOFIT%%include/root/RooBinnedGenContext.h
+%%ROOFIT%%include/root/RooBinning.h
+%%ROOFIT%%include/root/RooBinningCategory.h
+%%ROOFIT%%include/root/RooBlindTools.h
+%%ROOFIT%%include/root/RooBreitWigner.h
+%%ROOFIT%%include/root/RooBrentRootFinder.h
+%%ROOFIT%%%%ROOT7%%include/root/RooBrowser.h
+%%ROOFIT%%include/root/RooBukinPdf.h
+%%ROOFIT%%include/root/RooCBShape.h
+%%ROOFIT%%include/root/RooCFunction1Binding.h
+%%ROOFIT%%include/root/RooCFunction2Binding.h
+%%ROOFIT%%include/root/RooCFunction3Binding.h
+%%ROOFIT%%include/root/RooCFunction4Binding.h
+%%ROOFIT%%include/root/RooCacheManager.h
+%%ROOFIT%%include/root/RooCachedPdf.h
+%%ROOFIT%%include/root/RooCachedReal.h
+%%ROOFIT%%include/root/RooCategory.h
+%%ROOFIT%%include/root/RooCategoryProxy.h
+%%ROOFIT%%include/root/RooChangeTracker.h
+%%ROOFIT%%include/root/RooChebychev.h
+%%ROOFIT%%include/root/RooChi2MCSModule.h
+%%ROOFIT%%include/root/RooChi2Var.h
+%%ROOFIT%%include/root/RooChiSquarePdf.h
+%%ROOFIT%%include/root/RooClassFactory.h
+%%ROOFIT%%include/root/RooCmdArg.h
+%%ROOFIT%%include/root/RooCmdConfig.h
+%%ROOFIT%%include/root/RooCollectionProxy.h
+%%ROOFIT%%include/root/RooCompositeDataStore.h
+%%ROOFIT%%include/root/RooConstVar.h
+%%ROOFIT%%include/root/RooConstraintSum.h
+%%ROOFIT%%include/root/RooConvCoefVar.h
+%%ROOFIT%%include/root/RooConvGenContext.h
+%%ROOFIT%%include/root/RooCrystalBall.h
+%%ROOFIT%%include/root/RooCurve.h
+%%ROOFIT%%include/root/RooCustomizer.h
+%%ROOFIT%%include/root/RooDLLSignificanceMCSModule.h
+%%ROOFIT%%include/root/RooDataHist.h
+%%ROOFIT%%include/root/RooDataHistSliceIter.h
+%%ROOFIT%%include/root/RooDataProjBinding.h
+%%ROOFIT%%include/root/RooDataSet.h
+%%ROOFIT%%include/root/RooDecay.h
+%%ROOFIT%%include/root/RooDerivative.h
+%%ROOFIT%%include/root/RooDirItem.h
+%%ROOFIT%%include/root/RooDouble.h
+%%ROOFIT%%include/root/RooDstD0BG.h
+%%ROOFIT%%include/root/RooEffGenContext.h
+%%ROOFIT%%include/root/RooEffProd.h
+%%ROOFIT%%include/root/RooEfficiency.h
+%%ROOFIT%%include/root/RooEllipse.h
+%%ROOFIT%%include/root/RooErrorHandler.h
+%%ROOFIT%%include/root/RooErrorVar.h
+%%ROOFIT%%include/root/RooExpensiveObjectCache.h
+%%ROOFIT%%include/root/RooExponential.h
+%%ROOFIT%%include/root/RooExtendPdf.h
+%%ROOFIT%%include/root/RooExtendedBinding.h
+%%ROOFIT%%include/root/RooExtendedTerm.h
+%%ROOFIT%%include/root/RooFFTConvPdf.h
+%%ROOFIT%%include/root/RooFactoryWSTool.h
+%%ROOFIT%%include/root/RooFirstMoment.h
+%%ROOFIT%%include/root/RooFit.h
+%%ROOFIT%%include/root/RooFit/Config.h
+%%ROOFIT%%include/root/RooFit/Detail/BatchModeDataHelpers.h
+%%ROOFIT%%include/root/RooFit/Detail/CodeSquashContext.h
+%%ROOFIT%%include/root/RooFit/Detail/JSONInterface.h
+%%ROOFIT%%include/root/RooFit/Detail/MathFuncs.h
+%%ROOFIT%%include/root/RooFit/Detail/NormalizationHelpers.h
+%%ROOFIT%%include/root/RooFit/EvalContext.h
+%%ROOFIT%%include/root/RooFit/Evaluator.h
+%%ROOFIT%%include/root/RooFit/Floats.h
+%%ROOFIT%%include/root/RooFit/ModelConfig.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/LikelihoodGradientWrapper.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/LikelihoodWrapper.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooAbsL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooBinnedL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooRealL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooSubsidiaryL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooSumL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/RooUnbinnedL.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/SharedOffset.h
+%%ROOFIT%%include/root/RooFit/TestStatistics/buildLikelihood.h
+%%ROOFIT%%include/root/RooFit/UniqueId.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/Config.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/xRooBrowser.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/xRooFit.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/xRooHypoSpace.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/xRooNLLVar.h
+%%ROOFIT%%%%ROOT7%%include/root/RooFit/xRooFit/xRooNode.h
+%%ROOFIT%%include/root/RooFitHS3/JSONIO.h
+%%ROOFIT%%include/root/RooFitHS3/RooJSONFactoryWSTool.h
+%%ROOFIT%%include/root/RooFitLegacy/RooCatTypeLegacy.h
+%%ROOFIT%%include/root/RooFitLegacy/RooCategorySharedProperties.h
+%%ROOFIT%%include/root/RooFitLegacy/RooTreeData.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooFitMoreLib.h
+%%ROOFIT%%include/root/RooFitResult.h
+%%ROOFIT%%include/root/RooFormulaVar.h
+%%ROOFIT%%include/root/RooFracRemainder.h
+%%ROOFIT%%include/root/RooFuncWrapper.h
+%%ROOFIT%%include/root/RooFunctor.h
+%%ROOFIT%%include/root/RooFunctor1DBinding.h
+%%ROOFIT%%include/root/RooFunctorBinding.h
+%%ROOFIT%%include/root/RooGExpModel.h
+%%ROOFIT%%include/root/RooGamma.h
+%%ROOFIT%%include/root/RooGaussModel.h
+%%ROOFIT%%include/root/RooGaussian.h
+%%ROOFIT%%include/root/RooGenContext.h
+%%ROOFIT%%include/root/RooGenFitStudy.h
+%%ROOFIT%%include/root/RooGenericPdf.h
+%%ROOFIT%%include/root/RooGlobalFunc.h
+%%ROOFIT%%include/root/RooHelpers.h
+%%ROOFIT%%include/root/RooHist.h
+%%ROOFIT%%include/root/RooHistConstraint.h
+%%ROOFIT%%include/root/RooHistError.h
+%%ROOFIT%%include/root/RooHistFunc.h
+%%ROOFIT%%include/root/RooHistPdf.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooHypatia2.h
+%%ROOFIT%%include/root/RooIntegralMorph.h
+%%ROOFIT%%include/root/RooInvTransform.h
+%%ROOFIT%%include/root/RooJeffreysPrior.h
+%%ROOFIT%%include/root/RooJohnson.h
+%%ROOFIT%%include/root/RooKeysPdf.h
+%%ROOFIT%%include/root/RooLagrangianMorphFunc.h
+%%ROOFIT%%include/root/RooLandau.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooLegendre.h
+%%ROOFIT%%include/root/RooLegacyExpPoly.h
+%%ROOFIT%%include/root/RooLinTransBinning.h
+%%ROOFIT%%include/root/RooLinearCombination.h
+%%ROOFIT%%include/root/RooLinearVar.h
+%%ROOFIT%%include/root/RooLinkedList.h
+%%ROOFIT%%include/root/RooLinkedListElem.h
+%%ROOFIT%%include/root/RooLinkedListIter.h
+%%ROOFIT%%include/root/RooListProxy.h
+%%ROOFIT%%include/root/RooLognormal.h
+%%ROOFIT%%include/root/RooMCStudy.h
+%%ROOFIT%%include/root/RooMappedCategory.h
+%%ROOFIT%%include/root/RooMath.h
+%%ROOFIT%%include/root/RooMathCoreReg.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooMathMoreReg.h
+%%ROOFIT%%include/root/RooMinimizer.h
+%%ROOFIT%%include/root/RooMoment.h
+%%ROOFIT%%include/root/RooMomentMorph.h
+%%ROOFIT%%include/root/RooMomentMorphFunc.h
+%%ROOFIT%%include/root/RooMomentMorphFuncND.h
+%%ROOFIT%%include/root/RooMsgService.h
+%%ROOFIT%%include/root/RooMultiBinomial.h
+%%ROOFIT%%include/root/RooMultiCategory.h
+%%ROOFIT%%include/root/RooMultiVarGaussian.h
+%%ROOFIT%%include/root/RooNDKeysPdf.h
+%%ROOFIT%%include/root/RooNLLVar.h
+%%ROOFIT%%include/root/RooNameReg.h
+%%ROOFIT%%include/root/RooNonCPEigenDecay.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooNonCentralChiSquare.h
+%%ROOFIT%%include/root/RooNormSetCache.h
+%%ROOFIT%%include/root/RooNovosibirsk.h
+%%ROOFIT%%include/root/RooNumCdf.h
+%%ROOFIT%%include/root/RooNumConvPdf.h
+%%ROOFIT%%include/root/RooNumConvolution.h
+%%ROOFIT%%include/root/RooNumGenConfig.h
+%%ROOFIT%%include/root/RooNumIntConfig.h
+%%ROOFIT%%include/root/RooNumIntFactory.h
+%%ROOFIT%%include/root/RooNumRunningInt.h
+%%ROOFIT%%include/root/RooNumber.h
+%%ROOFIT%%include/root/RooObjCacheManager.h
+%%ROOFIT%%include/root/RooParamBinning.h
+%%ROOFIT%%include/root/RooParamHistFunc.h
+%%ROOFIT%%include/root/RooParametricStepFunction.h
+%%ROOFIT%%include/root/RooPlot.h
+%%ROOFIT%%include/root/RooPlotable.h
+%%ROOFIT%%include/root/RooPoisson.h
+%%ROOFIT%%include/root/RooPolyFunc.h
+%%ROOFIT%%include/root/RooPolyVar.h
+%%ROOFIT%%include/root/RooPolynomial.h
+%%ROOFIT%%include/root/RooPowerSum.h
+%%ROOFIT%%include/root/RooPrintable.h
+%%ROOFIT%%include/root/RooProdGenContext.h
+%%ROOFIT%%include/root/RooProdPdf.h
+%%ROOFIT%%include/root/RooProduct.h
+%%ROOFIT%%include/root/RooProfileLL.h
+%%ROOFIT%%include/root/RooProjectedPdf.h
+%%ROOFIT%%include/root/RooProofDriverSelector.h
+%%ROOFIT%%include/root/RooPullVar.h
+%%ROOFIT%%include/root/RooQuasiRandomGenerator.h
+%%ROOFIT%%include/root/RooRandom.h
+%%ROOFIT%%include/root/RooRandomizeParamMCSModule.h
+%%ROOFIT%%include/root/RooRangeBinning.h
+%%ROOFIT%%include/root/RooRangeBoolean.h
+%%ROOFIT%%include/root/RooRatio.h
+%%ROOFIT%%include/root/RooRealBinding.h
+%%ROOFIT%%include/root/RooRealConstant.h
+%%ROOFIT%%include/root/RooRealIntegral.h
+%%ROOFIT%%include/root/RooRealMPFE.h
+%%ROOFIT%%include/root/RooRealProxy.h
+%%ROOFIT%%include/root/RooRealSumFunc.h
+%%ROOFIT%%include/root/RooRealSumPdf.h
+%%ROOFIT%%include/root/RooRealVar.h
+%%ROOFIT%%include/root/RooRealVarSharedProperties.h
+%%ROOFIT%%include/root/RooRecursiveFraction.h
+%%ROOFIT%%include/root/RooRefCountList.h
+%%ROOFIT%%include/root/RooResolutionModel.h
+%%ROOFIT%%include/root/RooSTLRefCountList.h
+%%ROOFIT%%include/root/RooSecondMoment.h
+%%ROOFIT%%include/root/RooSetProxy.h
+%%ROOFIT%%include/root/RooSharedProperties.h
+%%ROOFIT%%include/root/RooSimGenContext.h
+%%ROOFIT%%include/root/RooSimSplitGenContext.h
+%%ROOFIT%%include/root/RooSimWSTool.h
+%%ROOFIT%%include/root/RooSimultaneous.h
+%%MATHMORE%%%%ROOFIT%%include/root/RooSpHarmonic.h
+%%ROOFIT%%include/root/RooSpline.h
+%%ROOFIT%%include/root/RooStats/AsymptoticCalculator.h
+%%ROOFIT%%include/root/RooStats/BayesianCalculator.h
+%%ROOFIT%%include/root/RooStats/BernsteinCorrection.h
+%%ROOFIT%%include/root/RooStats/CombinedCalculator.h
+%%ROOFIT%%include/root/RooStats/ConfInterval.h
+%%ROOFIT%%include/root/RooStats/ConfidenceBelt.h
+%%ROOFIT%%include/root/RooStats/DebuggingSampler.h
+%%ROOFIT%%include/root/RooStats/DebuggingTestStat.h
+%%ROOFIT%%include/root/RooStats/DetailedOutputAggregator.h
+%%ROOFIT%%include/root/RooStats/FeldmanCousins.h
+%%ROOFIT%%include/root/RooStats/FrequentistCalculator.h
+%%ROOFIT%%include/root/RooStats/HLFactory.h
+%%ROOFIT%%include/root/RooStats/Heaviside.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Asimov.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Channel.h
+%%ROOFIT%%include/root/RooStats/HistFactory/ConfigParser.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Data.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Detail/HistFactoryImpl.h
+%%ROOFIT%%include/root/RooStats/HistFactory/FlexibleInterpVar.h
+%%ROOFIT%%include/root/RooStats/HistFactory/HistFactoryException.h
+%%ROOFIT%%include/root/RooStats/HistFactory/HistFactoryModelUtils.h
+%%ROOFIT%%include/root/RooStats/HistFactory/HistFactoryNavigation.h
+%%ROOFIT%%include/root/RooStats/HistFactory/HistRef.h
+%%ROOFIT%%include/root/RooStats/HistFactory/HistoToWorkspaceFactoryFast.h
+%%ROOFIT%%include/root/RooStats/HistFactory/LinInterpVar.h
+%%ROOFIT%%include/root/RooStats/HistFactory/MakeModelAndMeasurementsFast.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Measurement.h
+%%ROOFIT%%include/root/RooStats/HistFactory/ParamHistFunc.h
+%%ROOFIT%%include/root/RooStats/HistFactory/PiecewiseInterpolation.h
+%%ROOFIT%%include/root/RooStats/HistFactory/PreprocessFunction.h
+%%ROOFIT%%include/root/RooStats/HistFactory/RooBarlowBeestonLL.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Sample.h
+%%ROOFIT%%include/root/RooStats/HistFactory/Systematics.h
+%%ROOFIT%%include/root/RooStats/HybridCalculator.h
+%%ROOFIT%%include/root/RooStats/HybridPlot.h
+%%ROOFIT%%include/root/RooStats/HybridResult.h
+%%ROOFIT%%include/root/RooStats/HypoTestCalculator.h
+%%ROOFIT%%include/root/RooStats/HypoTestCalculatorGeneric.h
+%%ROOFIT%%include/root/RooStats/HypoTestInverter.h
+%%ROOFIT%%include/root/RooStats/HypoTestInverterPlot.h
+%%ROOFIT%%include/root/RooStats/HypoTestInverterResult.h
+%%ROOFIT%%include/root/RooStats/HypoTestPlot.h
+%%ROOFIT%%include/root/RooStats/HypoTestResult.h
+%%ROOFIT%%include/root/RooStats/IntervalCalculator.h
+%%ROOFIT%%include/root/RooStats/LikelihoodInterval.h
+%%ROOFIT%%include/root/RooStats/LikelihoodIntervalPlot.h
+%%ROOFIT%%include/root/RooStats/MCMCCalculator.h
+%%ROOFIT%%include/root/RooStats/MCMCInterval.h
+%%ROOFIT%%include/root/RooStats/MCMCIntervalPlot.h
+%%ROOFIT%%include/root/RooStats/MarkovChain.h
+%%ROOFIT%%include/root/RooStats/MaxLikelihoodEstimateTestStat.h
+%%ROOFIT%%include/root/RooStats/MetropolisHastings.h
+%%ROOFIT%%include/root/RooStats/MinNLLTestStat.h
+%%ROOFIT%%include/root/RooStats/ModelConfig.h
+%%ROOFIT%%include/root/RooStats/NeymanConstruction.h
+%%ROOFIT%%include/root/RooStats/NumEventsTestStat.h
+%%ROOFIT%%include/root/RooStats/NumberCountingPdfFactory.h
+%%ROOFIT%%include/root/RooStats/NumberCountingUtils.h
+%%ROOFIT%%include/root/RooStats/PdfProposal.h
+%%ROOFIT%%include/root/RooStats/PointSetInterval.h
+%%ROOFIT%%include/root/RooStats/ProfileInspector.h
+%%ROOFIT%%include/root/RooStats/ProfileLikelihoodCalculator.h
+%%ROOFIT%%include/root/RooStats/ProfileLikelihoodTestStat.h
+%%ROOFIT%%include/root/RooStats/ProofConfig.h
+%%ROOFIT%%include/root/RooStats/ProposalFunction.h
+%%ROOFIT%%include/root/RooStats/ProposalHelper.h
+%%ROOFIT%%include/root/RooStats/RatioOfProfiledLikelihoodsTestStat.h
+%%ROOFIT%%include/root/RooStats/RooStatsUtils.h
+%%ROOFIT%%include/root/RooStats/SPlot.h
+%%ROOFIT%%include/root/RooStats/SamplingDistPlot.h
+%%ROOFIT%%include/root/RooStats/SamplingDistribution.h
+%%ROOFIT%%include/root/RooStats/SequentialProposal.h
+%%ROOFIT%%include/root/RooStats/SimpleInterval.h
+%%ROOFIT%%include/root/RooStats/SimpleLikelihoodRatioTestStat.h
+%%ROOFIT%%include/root/RooStats/TestStatSampler.h
+%%ROOFIT%%include/root/RooStats/TestStatistic.h
+%%ROOFIT%%include/root/RooStats/ToyMCImportanceSampler.h
+%%ROOFIT%%include/root/RooStats/ToyMCSampler.h
+%%ROOFIT%%include/root/RooStats/ToyMCStudy.h
+%%ROOFIT%%include/root/RooStats/UniformProposal.h
+%%ROOFIT%%include/root/RooStats/UpperLimitMCSModule.h
+%%ROOFIT%%include/root/RooStepFunction.h
+%%ROOFIT%%include/root/RooStreamParser.h
+%%ROOFIT%%include/root/RooStringVar.h
+%%ROOFIT%%include/root/RooStringView.h
+%%ROOFIT%%include/root/RooStudyManager.h
+%%ROOFIT%%include/root/RooStudyPackage.h
+%%ROOFIT%%include/root/RooSuperCategory.h
+%%ROOFIT%%include/root/RooTFnBinding.h
+%%ROOFIT%%include/root/RooTFnPdfBinding.h
+%%ROOFIT%%include/root/RooTMathReg.h
+%%ROOFIT%%include/root/RooTObjWrap.h
+%%ROOFIT%%include/root/RooTable.h
+%%ROOFIT%%include/root/RooTemplateProxy.h
+%%ROOFIT%%include/root/RooThresholdCategory.h
+%%ROOFIT%%include/root/RooTrace.h
+%%ROOFIT%%include/root/RooTreeDataStore.h
+%%ROOFIT%%include/root/RooTruthModel.h
+%%ROOFIT%%include/root/RooUnblindCPAsymVar.h
+%%ROOFIT%%include/root/RooUnblindOffset.h
+%%ROOFIT%%include/root/RooUnblindPrecision.h
+%%ROOFIT%%include/root/RooUnblindUniform.h
+%%ROOFIT%%include/root/RooUniform.h
+%%ROOFIT%%include/root/RooUniformBinning.h
+%%ROOFIT%%include/root/RooVectorDataStore.h
+%%ROOFIT%%include/root/RooVoigtian.h
+%%ROOFIT%%include/root/RooWorkspace.h
+%%ROOFIT%%include/root/RooWorkspaceHandle.h
+%%ROOFIT%%include/root/RooWrapperPdf.h
+%%ROOFIT%%include/root/RooXYChi2Var.h
 include/root/RootMetaSelection.h
 include/root/Rpair.h
 include/root/Rstrstream.h
@@ -1654,10 +1522,10 @@ include/root/Rtypes.h
 include/root/RtypesCore.h
 include/root/RtypesImp.h
 include/root/Strlen.h
-%%X11%%include/root/TASImage.h
-%%X11%%include/root/TASImagePlugin.h
-%%X11%%include/root/TASPaletteEditor.h
-%%X11%%include/root/TASPluginGS.h
+%%ASIMAGE%%include/root/TASImage.h
+%%ASIMAGE%%include/root/TASImagePlugin.h
+%%ASIMAGE%%include/root/TASPaletteEditor.h
+%%ASIMAGE%%include/root/TASPluginGS.h
 include/root/TAdvancedGraphicsDialog.h
 include/root/TAnnotation.h
 include/root/TApplication.h
@@ -1665,7 +1533,7 @@ include/root/TApplicationImp.h
 include/root/TApplicationRemote.h
 include/root/TApplicationServer.h
 include/root/TArc.h
-%%X11%%include/root/TArcBall.h
+%%OPENGL%%include/root/TArcBall.h
 include/root/TArchiveFile.h
 include/root/TArray.h
 include/root/TArrayC.h
@@ -1766,7 +1634,6 @@ include/root/TColorWheel.h
 include/root/TComplex.h
 include/root/TCondition.h
 include/root/TConditionImp.h
-include/root/TCondor.h
 include/root/TConfidenceLevel.h
 include/root/TContainerConverters.h
 include/root/TContextMenu.h
@@ -1782,12 +1649,8 @@ include/root/TCurlyLine.h
 include/root/TCurlyLineEditor.h
 include/root/TCut.h
 include/root/TCutG.h
-include/root/TDOMParser.h
-include/root/TDSet.h
-include/root/TDSetProxy.h
+%%XML%%include/root/TDOMParser.h
 include/root/TDataMember.h
-include/root/TDataSetManager.h
-include/root/TDataSetManagerFile.h
 include/root/TDataType.h
 include/root/TDatabasePDG.h
 include/root/TDatime.h
@@ -1809,7 +1672,6 @@ include/root/TDocDirective.h
 include/root/TDocInfo.h
 include/root/TDocOutput.h
 include/root/TDocParser.h
-include/root/TDrawFeedback.h
 include/root/TELTU.h
 include/root/TEfficiency.h
 include/root/TEllipse.h
@@ -1823,107 +1685,106 @@ include/root/TEnum.h
 include/root/TEnumConstant.h
 include/root/TEnv.h
 include/root/TError.h
-%%X11%%include/root/TEveArrow.h
-%%X11%%include/root/TEveArrowEditor.h
-%%X11%%include/root/TEveArrowGL.h
-%%X11%%include/root/TEveBox.h
-%%X11%%include/root/TEveBoxGL.h
-%%X11%%include/root/TEveBoxSet.h
-%%X11%%include/root/TEveBoxSetGL.h
-%%X11%%include/root/TEveBrowser.h
-%%X11%%include/root/TEveCalo.h
-%%X11%%include/root/TEveCalo2DGL.h
-%%X11%%include/root/TEveCalo3DGL.h
-%%X11%%include/root/TEveCaloData.h
-%%X11%%include/root/TEveCaloLegoEditor.h
-%%X11%%include/root/TEveCaloLegoGL.h
-%%X11%%include/root/TEveCaloLegoOverlay.h
-%%X11%%include/root/TEveCaloVizEditor.h
-%%X11%%include/root/TEveChunkManager.h
-%%X11%%include/root/TEveCompound.h
-%%X11%%include/root/TEveDigitSet.h
-%%X11%%include/root/TEveDigitSetEditor.h
-%%X11%%include/root/TEveDigitSetGL.h
-%%X11%%include/root/TEveElement.h
-%%X11%%include/root/TEveElementEditor.h
-%%X11%%include/root/TEveEventManager.h
-%%X11%%include/root/TEveFrameBox.h
-%%X11%%include/root/TEveFrameBoxGL.h
-%%X11%%include/root/TEveGValuators.h
-%%X11%%include/root/TEveGedEditor.h
-%%X11%%include/root/TEveGeoNode.h
-%%X11%%include/root/TEveGeoNodeEditor.h
-%%X11%%include/root/TEveGeoPolyShape.h
-%%X11%%include/root/TEveGeoShape.h
-%%X11%%include/root/TEveGeoShapeExtract.h
-%%X11%%include/root/TEveGridStepper.h
-%%X11%%include/root/TEveGridStepperEditor.h
-%%X11%%include/root/TEveJetCone.h
-%%X11%%include/root/TEveJetConeEditor.h
-%%X11%%include/root/TEveJetConeGL.h
-%%X11%%include/root/TEveLegoEventHandler.h
-%%X11%%include/root/TEveLine.h
-%%X11%%include/root/TEveLineEditor.h
-%%X11%%include/root/TEveLineGL.h
-%%X11%%include/root/TEveMacro.h
-%%X11%%include/root/TEveManager.h
-%%X11%%include/root/TEvePad.h
-%%X11%%include/root/TEveParamList.h
-%%X11%%include/root/TEvePathMark.h
-%%X11%%include/root/TEvePlot3D.h
-%%X11%%include/root/TEvePlot3DGL.h
-%%X11%%include/root/TEvePointSet.h
-%%X11%%include/root/TEvePointSetArrayEditor.h
-%%X11%%include/root/TEvePolygonSetProjected.h
-%%X11%%include/root/TEvePolygonSetProjectedGL.h
-%%X11%%include/root/TEveProjectionAxes.h
-%%X11%%include/root/TEveProjectionAxesEditor.h
-%%X11%%include/root/TEveProjectionAxesGL.h
-%%X11%%include/root/TEveProjectionBases.h
-%%X11%%include/root/TEveProjectionManager.h
-%%X11%%include/root/TEveProjectionManagerEditor.h
-%%X11%%include/root/TEveProjections.h
-%%X11%%include/root/TEveQuadSet.h
-%%X11%%include/root/TEveQuadSetGL.h
-%%X11%%include/root/TEveRGBAPalette.h
-%%X11%%include/root/TEveRGBAPaletteEditor.h
-%%X11%%include/root/TEveRGBAPaletteOverlay.h
-%%X11%%include/root/TEveScalableStraightLineSet.h
-%%X11%%include/root/TEveScene.h
-%%X11%%include/root/TEveSceneInfo.h
-%%X11%%include/root/TEveSecondarySelectable.h
-%%X11%%include/root/TEveSelection.h
-%%X11%%include/root/TEveShape.h
-%%X11%%include/root/TEveShapeEditor.h
-%%X11%%include/root/TEveStraightLineSet.h
-%%X11%%include/root/TEveStraightLineSetEditor.h
-%%X11%%include/root/TEveStraightLineSetGL.h
-%%X11%%include/root/TEveText.h
-%%X11%%include/root/TEveTextEditor.h
-%%X11%%include/root/TEveTextGL.h
-%%X11%%include/root/TEveTrack.h
-%%X11%%include/root/TEveTrackEditor.h
-%%X11%%include/root/TEveTrackGL.h
-%%X11%%include/root/TEveTrackProjected.h
-%%X11%%include/root/TEveTrackProjectedGL.h
-%%X11%%include/root/TEveTrackPropagator.h
-%%X11%%include/root/TEveTrackPropagatorEditor.h
-%%X11%%include/root/TEveTrans.h
-%%X11%%include/root/TEveTransEditor.h
-%%X11%%include/root/TEveTreeTools.h
-%%X11%%include/root/TEveTriangleSet.h
-%%X11%%include/root/TEveTriangleSetEditor.h
-%%X11%%include/root/TEveTriangleSetGL.h
-%%X11%%include/root/TEveUtil.h
-%%X11%%include/root/TEveVSD.h
-%%X11%%include/root/TEveVSDStructs.h
-%%X11%%include/root/TEveVector.h
-%%X11%%include/root/TEveViewer.h
-%%X11%%include/root/TEveViewerListEditor.h
-%%X11%%include/root/TEveWindow.h
-%%X11%%include/root/TEveWindowEditor.h
-%%X11%%include/root/TEveWindowManager.h
-include/root/TEventIter.h
+%%OPENGL%%include/root/TEveArrow.h
+%%OPENGL%%include/root/TEveArrowEditor.h
+%%OPENGL%%include/root/TEveArrowGL.h
+%%OPENGL%%include/root/TEveBox.h
+%%OPENGL%%include/root/TEveBoxGL.h
+%%OPENGL%%include/root/TEveBoxSet.h
+%%OPENGL%%include/root/TEveBoxSetGL.h
+%%OPENGL%%include/root/TEveBrowser.h
+%%OPENGL%%include/root/TEveCalo.h
+%%OPENGL%%include/root/TEveCalo2DGL.h
+%%OPENGL%%include/root/TEveCalo3DGL.h
+%%OPENGL%%include/root/TEveCaloData.h
+%%OPENGL%%include/root/TEveCaloLegoEditor.h
+%%OPENGL%%include/root/TEveCaloLegoGL.h
+%%OPENGL%%include/root/TEveCaloLegoOverlay.h
+%%OPENGL%%include/root/TEveCaloVizEditor.h
+%%OPENGL%%include/root/TEveChunkManager.h
+%%OPENGL%%include/root/TEveCompound.h
+%%OPENGL%%include/root/TEveDigitSet.h
+%%OPENGL%%include/root/TEveDigitSetEditor.h
+%%OPENGL%%include/root/TEveDigitSetGL.h
+%%OPENGL%%include/root/TEveElement.h
+%%OPENGL%%include/root/TEveElementEditor.h
+%%OPENGL%%include/root/TEveEventManager.h
+%%OPENGL%%include/root/TEveFrameBox.h
+%%OPENGL%%include/root/TEveFrameBoxGL.h
+%%OPENGL%%include/root/TEveGValuators.h
+%%OPENGL%%include/root/TEveGedEditor.h
+%%OPENGL%%include/root/TEveGeoNode.h
+%%OPENGL%%include/root/TEveGeoNodeEditor.h
+%%OPENGL%%include/root/TEveGeoPolyShape.h
+%%OPENGL%%include/root/TEveGeoShape.h
+%%OPENGL%%include/root/TEveGeoShapeExtract.h
+%%OPENGL%%include/root/TEveGridStepper.h
+%%OPENGL%%include/root/TEveGridStepperEditor.h
+%%OPENGL%%include/root/TEveJetCone.h
+%%OPENGL%%include/root/TEveJetConeEditor.h
+%%OPENGL%%include/root/TEveJetConeGL.h
+%%OPENGL%%include/root/TEveLegoEventHandler.h
+%%OPENGL%%include/root/TEveLine.h
+%%OPENGL%%include/root/TEveLineEditor.h
+%%OPENGL%%include/root/TEveLineGL.h
+%%OPENGL%%include/root/TEveMacro.h
+%%OPENGL%%include/root/TEveManager.h
+%%OPENGL%%include/root/TEvePad.h
+%%OPENGL%%include/root/TEveParamList.h
+%%OPENGL%%include/root/TEvePathMark.h
+%%OPENGL%%include/root/TEvePlot3D.h
+%%OPENGL%%include/root/TEvePlot3DGL.h
+%%OPENGL%%include/root/TEvePointSet.h
+%%OPENGL%%include/root/TEvePointSetArrayEditor.h
+%%OPENGL%%include/root/TEvePolygonSetProjected.h
+%%OPENGL%%include/root/TEvePolygonSetProjectedGL.h
+%%OPENGL%%include/root/TEveProjectionAxes.h
+%%OPENGL%%include/root/TEveProjectionAxesEditor.h
+%%OPENGL%%include/root/TEveProjectionAxesGL.h
+%%OPENGL%%include/root/TEveProjectionBases.h
+%%OPENGL%%include/root/TEveProjectionManager.h
+%%OPENGL%%include/root/TEveProjectionManagerEditor.h
+%%OPENGL%%include/root/TEveProjections.h
+%%OPENGL%%include/root/TEveQuadSet.h
+%%OPENGL%%include/root/TEveQuadSetGL.h
+%%OPENGL%%include/root/TEveRGBAPalette.h
+%%OPENGL%%include/root/TEveRGBAPaletteEditor.h
+%%OPENGL%%include/root/TEveRGBAPaletteOverlay.h
+%%OPENGL%%include/root/TEveScalableStraightLineSet.h
+%%OPENGL%%include/root/TEveScene.h
+%%OPENGL%%include/root/TEveSceneInfo.h
+%%OPENGL%%include/root/TEveSecondarySelectable.h
+%%OPENGL%%include/root/TEveSelection.h
+%%OPENGL%%include/root/TEveShape.h
+%%OPENGL%%include/root/TEveShapeEditor.h
+%%OPENGL%%include/root/TEveStraightLineSet.h
+%%OPENGL%%include/root/TEveStraightLineSetEditor.h
+%%OPENGL%%include/root/TEveStraightLineSetGL.h
+%%OPENGL%%include/root/TEveText.h
+%%OPENGL%%include/root/TEveTextEditor.h
+%%OPENGL%%include/root/TEveTextGL.h
+%%OPENGL%%include/root/TEveTrack.h
+%%OPENGL%%include/root/TEveTrackEditor.h
+%%OPENGL%%include/root/TEveTrackGL.h
+%%OPENGL%%include/root/TEveTrackProjected.h
+%%OPENGL%%include/root/TEveTrackProjectedGL.h
+%%OPENGL%%include/root/TEveTrackPropagator.h
+%%OPENGL%%include/root/TEveTrackPropagatorEditor.h
+%%OPENGL%%include/root/TEveTrans.h
+%%OPENGL%%include/root/TEveTransEditor.h
+%%OPENGL%%include/root/TEveTreeTools.h
+%%OPENGL%%include/root/TEveTriangleSet.h
+%%OPENGL%%include/root/TEveTriangleSetEditor.h
+%%OPENGL%%include/root/TEveTriangleSetGL.h
+%%OPENGL%%include/root/TEveUtil.h
+%%OPENGL%%include/root/TEveVSD.h
+%%OPENGL%%include/root/TEveVSDStructs.h
+%%OPENGL%%include/root/TEveVector.h
+%%OPENGL%%include/root/TEveViewer.h
+%%OPENGL%%include/root/TEveViewerListEditor.h
+%%OPENGL%%include/root/TEveWindow.h
+%%OPENGL%%include/root/TEveWindowEditor.h
+%%OPENGL%%include/root/TEveWindowManager.h
 include/root/TEventList.h
 include/root/TExMap.h
 include/root/TException.h
@@ -1935,9 +1796,9 @@ include/root/TF1Convolution.h
 include/root/TF1Editor.h
 include/root/TF1NormSum.h
 include/root/TF2.h
-%%X11%%include/root/TF2GL.h
+%%OPENGL%%include/root/TF2GL.h
 include/root/TF3.h
-include/root/TFITS.h
+%%FITS%%include/root/TFITS.h
 include/root/TFPBlock.h
 include/root/TFTP.h
 include/root/TFeldmanCousins.h
@@ -1989,8 +1850,8 @@ include/root/TGColorSelect.h
 include/root/TGComboBox.h
 include/root/TGCommandPlugin.h
 include/root/TGDMLMatrix.h
-include/root/TGDMLParse.h
-include/root/TGDMLWrite.h
+%%GDML%%include/root/TGDMLParse.h
+%%GDML%%include/root/TGDMLWrite.h
 include/root/TGDNDManager.h
 include/root/TGDimension.h
 include/root/TGDockableFrame.h
@@ -2012,87 +1873,87 @@ include/root/TGIcon.h
 include/root/TGIdleHandler.h
 include/root/TGImageMap.h
 include/root/TGInputDialog.h
-%%X11%%include/root/TGL5D.h
-%%X11%%include/root/TGL5DDataSetEditor.h
-%%X11%%include/root/TGL5DPainter.h
-%%X11%%include/root/TGLAdapter.h
-%%X11%%include/root/TGLAnnotation.h
-%%X11%%include/root/TGLAutoRotator.h
-%%X11%%include/root/TGLAxis.h
-%%X11%%include/root/TGLAxisPainter.h
-%%X11%%include/root/TGLBoundingBox.h
-%%X11%%include/root/TGLBoxPainter.h
-%%X11%%include/root/TGLCamera.h
-%%X11%%include/root/TGLCameraGuide.h
-%%X11%%include/root/TGLCameraOverlay.h
-%%X11%%include/root/TGLClip.h
-%%X11%%include/root/TGLClipSetEditor.h
-%%X11%%include/root/TGLContext.h
-%%X11%%include/root/TGLCylinder.h
-%%X11%%include/root/TGLEmbeddedViewer.h
-%%X11%%include/root/TGLEventHandler.h
-%%X11%%include/root/TGLFBO.h
-%%X11%%include/root/TGLFaceSet.h
-%%X11%%include/root/TGLFontManager.h
-%%X11%%include/root/TGLFormat.h
-%%X11%%include/root/TGLH2PolyPainter.h
-%%X11%%include/root/TGLHistPainter.h
-%%X11%%include/root/TGLIncludes.h
-%%X11%%include/root/TGLIsoMesh.h
-%%X11%%include/root/TGLLegoPainter.h
-%%X11%%include/root/TGLLightSet.h
-%%X11%%include/root/TGLLightSetEditor.h
-%%X11%%include/root/TGLLockable.h
-%%X11%%include/root/TGLLogicalShape.h
-%%X11%%include/root/TGLManip.h
-%%X11%%include/root/TGLManipSet.h
-%%X11%%include/root/TGLMarchingCubes.h
-%%X11%%include/root/TGLObject.h
-%%X11%%include/root/TGLOrthoCamera.h
-%%X11%%include/root/TGLOutput.h
-%%X11%%include/root/TGLOverlay.h
-%%X11%%include/root/TGLOverlayButton.h
-%%X11%%include/root/TGLPShapeObj.h
-%%X11%%include/root/TGLPShapeObjEditor.h
-%%X11%%include/root/TGLPShapeRef.h
-%%X11%%include/root/TGLPadPainter.h
-%%X11%%include/root/TGLPadUtils.h
-%%X11%%include/root/TGLParametric.h
-%%X11%%include/root/TGLParametricEquationGL.h
-%%X11%%include/root/TGLPerspectiveCamera.h
-%%X11%%include/root/TGLPhysicalShape.h
-%%X11%%include/root/TGLPlot3D.h
-%%X11%%include/root/TGLPlotBox.h
-%%X11%%include/root/TGLPlotCamera.h
-%%X11%%include/root/TGLPlotPainter.h
-%%X11%%include/root/TGLPolyLine.h
-%%X11%%include/root/TGLPolyMarker.h
-%%X11%%include/root/TGLQuadric.h
-%%X11%%include/root/TGLRnrCtx.h
-%%X11%%include/root/TGLRotateManip.h
-%%X11%%include/root/TGLSAFrame.h
-%%X11%%include/root/TGLSAViewer.h
-%%X11%%include/root/TGLScaleManip.h
-%%X11%%include/root/TGLScene.h
-%%X11%%include/root/TGLSceneBase.h
-%%X11%%include/root/TGLSceneInfo.h
-%%X11%%include/root/TGLScenePad.h
-%%X11%%include/root/TGLSelectBuffer.h
-%%X11%%include/root/TGLSelectRecord.h
-%%X11%%include/root/TGLSphere.h
-%%X11%%include/root/TGLStopwatch.h
-%%X11%%include/root/TGLSurfacePainter.h
-%%X11%%include/root/TGLTF3Painter.h
-%%X11%%include/root/TGLTH3Composition.h
-%%X11%%include/root/TGLText.h
-%%X11%%include/root/TGLTransManip.h
-%%X11%%include/root/TGLUtil.h
-%%X11%%include/root/TGLViewer.h
-%%X11%%include/root/TGLViewerBase.h
-%%X11%%include/root/TGLViewerEditor.h
-%%X11%%include/root/TGLVoxelPainter.h
-%%X11%%include/root/TGLWSIncludes.h
-%%X11%%include/root/TGLWidget.h
+%%OPENGL%%include/root/TGL5D.h
+%%OPENGL%%include/root/TGL5DDataSetEditor.h
+%%OPENGL%%include/root/TGL5DPainter.h
+%%OPENGL%%include/root/TGLAdapter.h
+%%OPENGL%%include/root/TGLAnnotation.h
+%%OPENGL%%include/root/TGLAutoRotator.h
+%%OPENGL%%include/root/TGLAxis.h
+%%OPENGL%%include/root/TGLAxisPainter.h
+%%OPENGL%%include/root/TGLBoundingBox.h
+%%OPENGL%%include/root/TGLBoxPainter.h
+%%OPENGL%%include/root/TGLCamera.h
+%%OPENGL%%include/root/TGLCameraGuide.h
+%%OPENGL%%include/root/TGLCameraOverlay.h
+%%OPENGL%%include/root/TGLClip.h
+%%OPENGL%%include/root/TGLClipSetEditor.h
+%%OPENGL%%include/root/TGLContext.h
+%%OPENGL%%include/root/TGLCylinder.h
+%%OPENGL%%include/root/TGLEmbeddedViewer.h
+%%OPENGL%%include/root/TGLEventHandler.h
+%%OPENGL%%include/root/TGLFBO.h
+%%OPENGL%%include/root/TGLFaceSet.h
+%%OPENGL%%include/root/TGLFontManager.h
+%%OPENGL%%include/root/TGLFormat.h
+%%OPENGL%%include/root/TGLH2PolyPainter.h
+%%OPENGL%%include/root/TGLHistPainter.h
+%%OPENGL%%include/root/TGLIncludes.h
+%%OPENGL%%include/root/TGLIsoMesh.h
+%%OPENGL%%include/root/TGLLegoPainter.h
+%%OPENGL%%include/root/TGLLightSet.h
+%%OPENGL%%include/root/TGLLightSetEditor.h
+%%OPENGL%%include/root/TGLLockable.h
+%%OPENGL%%include/root/TGLLogicalShape.h
+%%OPENGL%%include/root/TGLManip.h
+%%OPENGL%%include/root/TGLManipSet.h
+%%OPENGL%%include/root/TGLMarchingCubes.h
+%%OPENGL%%include/root/TGLObject.h
+%%OPENGL%%include/root/TGLOrthoCamera.h
+%%OPENGL%%include/root/TGLOutput.h
+%%OPENGL%%include/root/TGLOverlay.h
+%%OPENGL%%include/root/TGLOverlayButton.h
+%%OPENGL%%include/root/TGLPShapeObj.h
+%%OPENGL%%include/root/TGLPShapeObjEditor.h
+%%OPENGL%%include/root/TGLPShapeRef.h
+%%OPENGL%%include/root/TGLPadPainter.h
+%%OPENGL%%include/root/TGLPadUtils.h
+%%OPENGL%%include/root/TGLParametric.h
+%%OPENGL%%include/root/TGLParametricEquationGL.h
+%%OPENGL%%include/root/TGLPerspectiveCamera.h
+%%OPENGL%%include/root/TGLPhysicalShape.h
+%%OPENGL%%include/root/TGLPlot3D.h
+%%OPENGL%%include/root/TGLPlotBox.h
+%%OPENGL%%include/root/TGLPlotCamera.h
+%%OPENGL%%include/root/TGLPlotPainter.h
+%%OPENGL%%include/root/TGLPolyLine.h
+%%OPENGL%%include/root/TGLPolyMarker.h
+%%OPENGL%%include/root/TGLQuadric.h
+%%OPENGL%%include/root/TGLRnrCtx.h
+%%OPENGL%%include/root/TGLRotateManip.h
+%%OPENGL%%include/root/TGLSAFrame.h
+%%OPENGL%%include/root/TGLSAViewer.h
+%%OPENGL%%include/root/TGLScaleManip.h
+%%OPENGL%%include/root/TGLScene.h
+%%OPENGL%%include/root/TGLSceneBase.h
+%%OPENGL%%include/root/TGLSceneInfo.h
+%%OPENGL%%include/root/TGLScenePad.h
+%%OPENGL%%include/root/TGLSelectBuffer.h
+%%OPENGL%%include/root/TGLSelectRecord.h
+%%OPENGL%%include/root/TGLSphere.h
+%%OPENGL%%include/root/TGLStopwatch.h
+%%OPENGL%%include/root/TGLSurfacePainter.h
+%%OPENGL%%include/root/TGLTF3Painter.h
+%%OPENGL%%include/root/TGLTH3Composition.h
+%%OPENGL%%include/root/TGLText.h
+%%OPENGL%%include/root/TGLTransManip.h
+%%OPENGL%%include/root/TGLUtil.h
+%%OPENGL%%include/root/TGLViewer.h
+%%OPENGL%%include/root/TGLViewerBase.h
+%%OPENGL%%include/root/TGLViewerEditor.h
+%%OPENGL%%include/root/TGLVoxelPainter.h
+%%OPENGL%%include/root/TGLWSIncludes.h
+%%OPENGL%%include/root/TGLWidget.h
 include/root/TGLabel.h
 include/root/TGLayout.h
 include/root/TGListBox.h
@@ -2282,28 +2143,35 @@ include/root/TH1Editor.h
 include/root/TH1F.h
 include/root/TH1I.h
 include/root/TH1K.h
+include/root/TH1L.h
 include/root/TH1S.h
 include/root/TH2.h
 include/root/TH2C.h
 include/root/TH2D.h
 include/root/TH2Editor.h
 include/root/TH2F.h
-%%X11%%include/root/TH2GL.h
+%%OPENGL%%include/root/TH2GL.h
 include/root/TH2I.h
+include/root/TH2L.h
 include/root/TH2Poly.h
 include/root/TH2S.h
 include/root/TH3.h
 include/root/TH3C.h
 include/root/TH3D.h
 include/root/TH3F.h
-%%X11%%include/root/TH3GL.h
+%%OPENGL%%include/root/TH3GL.h
 include/root/TH3I.h
+include/root/TH3L.h
 include/root/TH3S.h
 include/root/THLimitsFinder.h
 include/root/THStack.h
 include/root/THYPE.h
 include/root/THashList.h
 include/root/THashTable.h
+%%FORTRAN%%include/root/THbookBranch.h
+%%FORTRAN%%include/root/THbookFile.h
+%%FORTRAN%%include/root/THbookKey.h
+%%FORTRAN%%include/root/THbookTree.h
 include/root/THelix.h
 include/root/THistPainter.h
 include/root/THistRange.h
@@ -2314,10 +2182,10 @@ include/root/THnSparse.h
 include/root/THnSparse_Internal.h
 include/root/THostAuth.h
 include/root/THtml.h
-include/root/THttpCallArg.h
-include/root/THttpEngine.h
-include/root/THttpServer.h
-include/root/THttpWSHandler.h
+%%HTTP%%include/root/THttpCallArg.h
+%%HTTP%%include/root/THttpEngine.h
+%%HTTP%%include/root/THttpServer.h
+%%HTTP%%include/root/THttpWSHandler.h
 include/root/TImage.h
 include/root/TImageDump.h
 include/root/TImagePlugin.h
@@ -2330,8 +2198,8 @@ include/root/TInterpreterValue.h
 include/root/TIsAProxy.h
 include/root/TIterator.h
 include/root/TKDE.h
-%%X11%%include/root/TKDEAdapter.h
-%%X11%%include/root/TKDEFGT.h
+%%OPENGL%%include/root/TKDEAdapter.h
+%%OPENGL%%include/root/TKDEFGT.h
 include/root/TKDTree.h
 include/root/TKDTreeBinning.h
 include/root/TKey.h
@@ -2369,7 +2237,6 @@ include/root/TListOfEnumsWithLock.h
 include/root/TListOfFunctionTemplates.h
 include/root/TListOfFunctions.h
 include/root/TLockFile.h
-include/root/TLockPath.h
 include/root/TLorentzRotation.h
 include/root/TLorentzVector.h
 include/root/TMD5.h
@@ -2378,310 +2245,309 @@ include/root/TMPClient.h
 include/root/TMPWorker.h
 include/root/TMPWorkerExecutor.h
 include/root/TMPWorkerTree.h
-include/root/TMVA/BDT.h
-include/root/TMVA/BDTControlPlots.h
-include/root/TMVA/BDTEventWrapper.h
-include/root/TMVA/BDT_Reg.h
-include/root/TMVA/BinarySearchTree.h
-include/root/TMVA/BinarySearchTreeNode.h
-include/root/TMVA/BinaryTree.h
-include/root/TMVA/BoostControlPlots.h
-include/root/TMVA/CCPruner.h
-include/root/TMVA/CCTreeWrapper.h
-include/root/TMVA/ClassInfo.h
-include/root/TMVA/Classification.h
-include/root/TMVA/ClassifierFactory.h
-include/root/TMVA/Config.h
-include/root/TMVA/Configurable.h
-include/root/TMVA/ConvergenceTest.h
-include/root/TMVA/CorrGui.h
-include/root/TMVA/CorrGuiMultiClass.h
-include/root/TMVA/CostComplexityPruneTool.h
-include/root/TMVA/CrossEntropy.h
-include/root/TMVA/CrossValidation.h
-include/root/TMVA/CvSplit.h
-include/root/TMVA/DNN/Adadelta.h
-include/root/TMVA/DNN/Adagrad.h
-include/root/TMVA/DNN/Adam.h
-include/root/TMVA/DNN/Architectures/Cpu.h
-include/root/TMVA/DNN/Architectures/Cpu/Blas.h
-include/root/TMVA/DNN/Architectures/Cpu/CpuBuffer.h
-include/root/TMVA/DNN/Architectures/Cpu/CpuMatrix.h
-include/root/TMVA/DNN/Architectures/Cpu/CpuTensor.h
-include/root/TMVA/DNN/Architectures/Reference.h
-include/root/TMVA/DNN/Architectures/Reference/DataLoader.h
-include/root/TMVA/DNN/Architectures/Reference/TensorDataLoader.h
-include/root/TMVA/DNN/Architectures/TCudnn.h
-include/root/TMVA/DNN/BatchNormLayer.h
-include/root/TMVA/DNN/CNN/ContextHandles.h
-include/root/TMVA/DNN/CNN/ConvLayer.h
-include/root/TMVA/DNN/CNN/MaxPoolLayer.h
-include/root/TMVA/DNN/DLMinimizers.h
-include/root/TMVA/DNN/DataLoader.h
-include/root/TMVA/DNN/DeepNet.h
-include/root/TMVA/DNN/DenseLayer.h
-include/root/TMVA/DNN/Functions.h
-include/root/TMVA/DNN/GeneralLayer.h
-include/root/TMVA/DNN/Layer.h
-include/root/TMVA/DNN/Minimizers.h
-include/root/TMVA/DNN/Net.h
-include/root/TMVA/DNN/Optimizer.h
-include/root/TMVA/DNN/RMSProp.h
-include/root/TMVA/DNN/RNN/GRULayer.h
-include/root/TMVA/DNN/RNN/LSTMLayer.h
-include/root/TMVA/DNN/RNN/RNNLayer.h
-include/root/TMVA/DNN/ReshapeLayer.h
-include/root/TMVA/DNN/SGD.h
-include/root/TMVA/DNN/TensorDataLoader.h
-include/root/TMVA/DataInputHandler.h
-include/root/TMVA/DataLoader.h
-include/root/TMVA/DataSet.h
-include/root/TMVA/DataSetFactory.h
-include/root/TMVA/DataSetInfo.h
-include/root/TMVA/DataSetManager.h
-include/root/TMVA/DecisionTree.h
-include/root/TMVA/DecisionTreeNode.h
-include/root/TMVA/Envelope.h
-include/root/TMVA/Event.h
-include/root/TMVA/Executor.h
-include/root/TMVA/ExpectedErrorPruneTool.h
-include/root/TMVA/Factory.h
-include/root/TMVA/FitterBase.h
-include/root/TMVA/FunctionList.hxx
-include/root/TMVA/GeneticAlgorithm.h
-include/root/TMVA/GeneticFitter.h
-include/root/TMVA/GeneticGenes.h
-include/root/TMVA/GeneticPopulation.h
-include/root/TMVA/GeneticRange.h
-include/root/TMVA/GiniIndex.h
-include/root/TMVA/GiniIndexWithLaplace.h
-include/root/TMVA/HyperParameterOptimisation.h
-include/root/TMVA/IFitterTarget.h
-include/root/TMVA/IMethod.h
-include/root/TMVA/IPruneTool.h
-include/root/TMVA/Interval.h
-include/root/TMVA/KDEKernel.h
-include/root/TMVA/LDA.h
-include/root/TMVA/LogInterval.h
-include/root/TMVA/LossFunction.h
-include/root/TMVA/MCFitter.h
-include/root/TMVA/MethodANNBase.h
-include/root/TMVA/MethodBDT.h
-include/root/TMVA/MethodBase.h
-include/root/TMVA/MethodBayesClassifier.h
-include/root/TMVA/MethodBoost.h
-include/root/TMVA/MethodCFMlpANN.h
-include/root/TMVA/MethodCFMlpANN_Utils.h
-include/root/TMVA/MethodCFMlpANN_def.h
-include/root/TMVA/MethodCategory.h
-include/root/TMVA/MethodCompositeBase.h
-include/root/TMVA/MethodCrossValidation.h
-include/root/TMVA/MethodCuts.h
-include/root/TMVA/MethodDL.h
-include/root/TMVA/MethodDNN.h
-include/root/TMVA/MethodDT.h
-include/root/TMVA/MethodFDA.h
-include/root/TMVA/MethodFisher.h
-include/root/TMVA/MethodHMatrix.h
-include/root/TMVA/MethodKNN.h
-include/root/TMVA/MethodLD.h
-include/root/TMVA/MethodLikelihood.h
-include/root/TMVA/MethodMLP.h
-include/root/TMVA/MethodPDEFoam.h
-include/root/TMVA/MethodPDERS.h
-%%PYROOT%%include/root/TMVA/MethodPyAdaBoost.h
-%%PYROOT%%include/root/TMVA/MethodPyGTB.h
-%%PYROOT%%include/root/TMVA/MethodPyKeras.h
-%%PYROOT%%include/root/TMVA/MethodPyRandomForest.h
-%%PYROOT%%include/root/TMVA/MethodPyTorch.h
-include/root/TMVA/MethodRuleFit.h
-include/root/TMVA/MethodSVM.h
-include/root/TMVA/MethodTMlpANN.h
-include/root/TMVA/MinuitFitter.h
-include/root/TMVA/MinuitWrapper.h
-include/root/TMVA/MisClassificationError.h
-include/root/TMVA/ModulekNN.h
-include/root/TMVA/Monitoring.h
-include/root/TMVA/MovieMaker.h
-include/root/TMVA/MsgLogger.h
-include/root/TMVA/NeuralNet.h
-include/root/TMVA/NeuralNet.icc
-include/root/TMVA/Node.h
-include/root/TMVA/NodekNN.h
-include/root/TMVA/OperatorList.hxx
-include/root/TMVA/OptimizeConfigParameters.h
-include/root/TMVA/Option.h
-include/root/TMVA/OptionMap.h
-include/root/TMVA/PDEFoam.h
-include/root/TMVA/PDEFoamCell.h
-include/root/TMVA/PDEFoamDecisionTree.h
-include/root/TMVA/PDEFoamDecisionTreeDensity.h
-include/root/TMVA/PDEFoamDensityBase.h
-include/root/TMVA/PDEFoamDiscriminant.h
-include/root/TMVA/PDEFoamDiscriminantDensity.h
-include/root/TMVA/PDEFoamEvent.h
-include/root/TMVA/PDEFoamEventDensity.h
-include/root/TMVA/PDEFoamKernelBase.h
-include/root/TMVA/PDEFoamKernelGauss.h
-include/root/TMVA/PDEFoamKernelLinN.h
-include/root/TMVA/PDEFoamKernelTrivial.h
-include/root/TMVA/PDEFoamMultiTarget.h
-include/root/TMVA/PDEFoamTarget.h
-include/root/TMVA/PDEFoamTargetDensity.h
-include/root/TMVA/PDEFoamVect.h
-include/root/TMVA/PDF.h
-include/root/TMVA/Pattern.h
-include/root/TMVA/PlotFoams.h
-%%PYROOT%%include/root/TMVA/PyMethodBase.h
-include/root/TMVA/QuickMVAProbEstimator.h
-include/root/TMVA/RBDT.hxx
-include/root/TMVA/RBatchGenerator.hxx
-include/root/TMVA/RBatchLoader.hxx
-include/root/TMVA/RChunkLoader.hxx
-include/root/TMVA/RFunction.hxx
-include/root/TMVA/RFunction_MLP.hxx
-include/root/TMVA/RFunction_Mean.hxx
-include/root/TMVA/RFunction_Sum.hxx
-include/root/TMVA/RInferenceUtils.hxx
-include/root/TMVA/RModel.hxx
-%%PYROOT%%include/root/TMVA/RModelParser_Keras.h
-%%PYROOT%%include/root/TMVA/RModelParser_PyTorch.h
-include/root/TMVA/RModel_Base.hxx
-include/root/TMVA/RModel_GNN.hxx
-include/root/TMVA/RModel_GraphIndependent.hxx
-include/root/TMVA/ROCCalc.h
-include/root/TMVA/ROCCurve.h
-include/root/TMVA/ROperator.hxx
-include/root/TMVA/ROperator_BasicBinary.hxx
-include/root/TMVA/ROperator_BasicNary.hxx
-include/root/TMVA/ROperator_BasicUnary.hxx
-include/root/TMVA/ROperator_BatchNormalization.hxx
-include/root/TMVA/ROperator_Cast.hxx
-include/root/TMVA/ROperator_Concat.hxx
-include/root/TMVA/ROperator_Conv.hxx
-include/root/TMVA/ROperator_ConvTranspose.hxx
-include/root/TMVA/ROperator_ConvTranspose.icc
-include/root/TMVA/ROperator_Custom.hxx
-include/root/TMVA/ROperator_Erf.hxx
-include/root/TMVA/ROperator_Expand.hxx
-include/root/TMVA/ROperator_GRU.hxx
-include/root/TMVA/ROperator_GRU.icc
-include/root/TMVA/ROperator_Gather.hxx
-include/root/TMVA/ROperator_Gemm.hxx
-include/root/TMVA/ROperator_Identity.hxx
-include/root/TMVA/ROperator_LSTM.hxx
-include/root/TMVA/ROperator_LSTM.icc
-include/root/TMVA/ROperator_LayerNormalization.hxx
-include/root/TMVA/ROperator_LeakyRelu.hxx
-include/root/TMVA/ROperator_Pool.hxx
-include/root/TMVA/ROperator_RNN.hxx
-include/root/TMVA/ROperator_RNN.icc
-include/root/TMVA/ROperator_Reduce.hxx
-include/root/TMVA/ROperator_Relu.hxx
-include/root/TMVA/ROperator_Reshape.hxx
-include/root/TMVA/ROperator_Selu.hxx
-include/root/TMVA/ROperator_Shape.hxx
-include/root/TMVA/ROperator_Sigmoid.hxx
-include/root/TMVA/ROperator_Slice.hxx
-include/root/TMVA/ROperator_Softmax.hxx
-include/root/TMVA/ROperator_Swish.hxx
-include/root/TMVA/ROperator_Tanh.hxx
-include/root/TMVA/ROperator_Transpose.hxx
-include/root/TMVA/RReader.hxx
-include/root/TMVA/RSofieReader.hxx
-include/root/TMVA/RStandardScaler.hxx
-include/root/TMVA/RTensor.hxx
-include/root/TMVA/RTensorUtils.hxx
-include/root/TMVA/Ranking.h
-include/root/TMVA/Reader.h
-include/root/TMVA/RegressionVariance.h
-include/root/TMVA/Results.h
-include/root/TMVA/ResultsClassification.h
-include/root/TMVA/ResultsMulticlass.h
-include/root/TMVA/ResultsRegression.h
-include/root/TMVA/RootFinder.h
-include/root/TMVA/Rule.h
-include/root/TMVA/RuleCut.h
-include/root/TMVA/RuleEnsemble.h
-include/root/TMVA/RuleFit.h
-include/root/TMVA/RuleFitAPI.h
-include/root/TMVA/RuleFitParams.h
-include/root/TMVA/SOFIEHelpers.hxx
-include/root/TMVA/SOFIE_common.hxx
-include/root/TMVA/SVEvent.h
-include/root/TMVA/SVKernelFunction.h
-include/root/TMVA/SVKernelMatrix.h
-include/root/TMVA/SVWorkingSet.h
-include/root/TMVA/SdivSqrtSplusB.h
-include/root/TMVA/SeparationBase.h
-include/root/TMVA/SimulatedAnnealing.h
-include/root/TMVA/SimulatedAnnealingFitter.h
-include/root/TMVA/TActivation.h
-include/root/TMVA/TActivationChooser.h
-include/root/TMVA/TActivationIdentity.h
-include/root/TMVA/TActivationRadial.h
-include/root/TMVA/TActivationReLU.h
-include/root/TMVA/TActivationSigmoid.h
-include/root/TMVA/TActivationTanh.h
-include/root/TMVA/TMVAGui.h
-include/root/TMVA/TMVAMultiClassGui.h
-include/root/TMVA/TMVARegGui.h
-include/root/TMVA/TNeuron.h
-include/root/TMVA/TNeuronInput.h
-include/root/TMVA/TNeuronInputAbs.h
-include/root/TMVA/TNeuronInputChooser.h
-include/root/TMVA/TNeuronInputSqSum.h
-include/root/TMVA/TNeuronInputSum.h
-include/root/TMVA/TSpline1.h
-include/root/TMVA/TSpline2.h
-include/root/TMVA/TSynapse.h
-include/root/TMVA/Timer.h
-include/root/TMVA/Tools.h
-include/root/TMVA/TrainingHistory.h
-include/root/TMVA/TransformationHandler.h
-include/root/TMVA/TreeInference/BranchlessTree.hxx
-include/root/TMVA/TreeInference/Forest.hxx
-include/root/TMVA/TreeInference/Objectives.hxx
-include/root/TMVA/TreeInference/PythonHelpers.hxx
-include/root/TMVA/Types.h
-include/root/TMVA/VarTransformHandler.h
-include/root/TMVA/VariableDecorrTransform.h
-include/root/TMVA/VariableGaussTransform.h
-include/root/TMVA/VariableIdentityTransform.h
-include/root/TMVA/VariableImportance.h
-include/root/TMVA/VariableInfo.h
-include/root/TMVA/VariableNormalizeTransform.h
-include/root/TMVA/VariablePCATransform.h
-include/root/TMVA/VariableRearrangeTransform.h
-include/root/TMVA/VariableTransform.h
-include/root/TMVA/VariableTransformBase.h
-include/root/TMVA/Version.h
-include/root/TMVA/Volume.h
-include/root/TMVA/annconvergencetest.h
-include/root/TMVA/compareanapp.h
-include/root/TMVA/correlations.h
-include/root/TMVA/correlationsMultiClass.h
-include/root/TMVA/correlationscatters.h
-include/root/TMVA/correlationscattersMultiClass.h
-include/root/TMVA/deviations.h
-include/root/TMVA/efficiencies.h
-include/root/TMVA/efficienciesMulticlass.h
-include/root/TMVA/likelihoodrefs.h
-include/root/TMVA/mvaeffs.h
-include/root/TMVA/mvas.h
-include/root/TMVA/mvasMulticlass.h
-include/root/TMVA/mvaweights.h
-include/root/TMVA/network.h
-include/root/TMVA/paracoor.h
-include/root/TMVA/probas.h
-include/root/TMVA/regression_averagedevs.h
-include/root/TMVA/rulevis.h
-include/root/TMVA/rulevisCorr.h
-include/root/TMVA/rulevisHists.h
-include/root/TMVA/tmvaglob.h
-include/root/TMVA/training_history.h
-include/root/TMVA/variables.h
-include/root/TMVA/variablesMultiClass.h
+%%TMVAML%%include/root/TMVA/BDT.h
+%%TMVAML%%include/root/TMVA/BDTControlPlots.h
+%%TMVAML%%include/root/TMVA/BDTEventWrapper.h
+%%TMVAML%%include/root/TMVA/BDT_Reg.h
+%%TMVAML%%include/root/TMVA/BinarySearchTree.h
+%%TMVAML%%include/root/TMVA/BinarySearchTreeNode.h
+%%TMVAML%%include/root/TMVA/BinaryTree.h
+%%TMVAML%%include/root/TMVA/BoostControlPlots.h
+%%TMVAML%%include/root/TMVA/CCPruner.h
+%%TMVAML%%include/root/TMVA/CCTreeWrapper.h
+%%TMVAML%%include/root/TMVA/ClassInfo.h
+%%TMVAML%%include/root/TMVA/Classification.h
+%%TMVAML%%include/root/TMVA/ClassifierFactory.h
+%%TMVAML%%include/root/TMVA/Config.h
+%%TMVAML%%include/root/TMVA/Configurable.h
+%%TMVAML%%include/root/TMVA/ConvergenceTest.h
+%%TMVAML%%include/root/TMVA/CorrGui.h
+%%TMVAML%%include/root/TMVA/CorrGuiMultiClass.h
+%%TMVAML%%include/root/TMVA/CostComplexityPruneTool.h
+%%TMVAML%%include/root/TMVA/CrossEntropy.h
+%%TMVAML%%include/root/TMVA/CrossValidation.h
+%%TMVAML%%include/root/TMVA/CvSplit.h
+%%TMVAML%%include/root/TMVA/DNN/Adadelta.h
+%%TMVAML%%include/root/TMVA/DNN/Adagrad.h
+%%TMVAML%%include/root/TMVA/DNN/Adam.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Cpu.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Cpu/CpuBuffer.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Cpu/CpuMatrix.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Cpu/CpuTensor.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Reference.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Reference/DataLoader.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/Reference/TensorDataLoader.h
+%%TMVAML%%include/root/TMVA/DNN/Architectures/TCudnn.h
+%%TMVAML%%include/root/TMVA/DNN/BatchNormLayer.h
+%%TMVAML%%include/root/TMVA/DNN/CNN/ContextHandles.h
+%%TMVAML%%include/root/TMVA/DNN/CNN/ConvLayer.h
+%%TMVAML%%include/root/TMVA/DNN/CNN/MaxPoolLayer.h
+%%TMVAML%%include/root/TMVA/DNN/DLMinimizers.h
+%%TMVAML%%include/root/TMVA/DNN/DataLoader.h
+%%TMVAML%%include/root/TMVA/DNN/DeepNet.h
+%%TMVAML%%include/root/TMVA/DNN/DenseLayer.h
+%%TMVAML%%include/root/TMVA/DNN/Functions.h
+%%TMVAML%%include/root/TMVA/DNN/GeneralLayer.h
+%%TMVAML%%include/root/TMVA/DNN/Layer.h
+%%TMVAML%%include/root/TMVA/DNN/Minimizers.h
+%%TMVAML%%include/root/TMVA/DNN/Net.h
+%%TMVAML%%include/root/TMVA/DNN/Optimizer.h
+%%TMVAML%%include/root/TMVA/DNN/RMSProp.h
+%%TMVAML%%include/root/TMVA/DNN/RNN/GRULayer.h
+%%TMVAML%%include/root/TMVA/DNN/RNN/LSTMLayer.h
+%%TMVAML%%include/root/TMVA/DNN/RNN/RNNLayer.h
+%%TMVAML%%include/root/TMVA/DNN/ReshapeLayer.h
+%%TMVAML%%include/root/TMVA/DNN/SGD.h
+%%TMVAML%%include/root/TMVA/DNN/TensorDataLoader.h
+%%TMVAML%%include/root/TMVA/DataInputHandler.h
+%%TMVAML%%include/root/TMVA/DataLoader.h
+%%TMVAML%%include/root/TMVA/DataSet.h
+%%TMVAML%%include/root/TMVA/DataSetFactory.h
+%%TMVAML%%include/root/TMVA/DataSetInfo.h
+%%TMVAML%%include/root/TMVA/DataSetManager.h
+%%TMVAML%%include/root/TMVA/DecisionTree.h
+%%TMVAML%%include/root/TMVA/DecisionTreeNode.h
+%%TMVAML%%include/root/TMVA/Envelope.h
+%%TMVAML%%include/root/TMVA/Event.h
+%%TMVAML%%include/root/TMVA/Executor.h
+%%TMVAML%%include/root/TMVA/ExpectedErrorPruneTool.h
+%%TMVAML%%include/root/TMVA/Factory.h
+%%TMVAML%%include/root/TMVA/FitterBase.h
+%%TMVAML%%include/root/TMVA/FunctionList.hxx
+%%TMVAML%%include/root/TMVA/GeneticAlgorithm.h
+%%TMVAML%%include/root/TMVA/GeneticFitter.h
+%%TMVAML%%include/root/TMVA/GeneticGenes.h
+%%TMVAML%%include/root/TMVA/GeneticPopulation.h
+%%TMVAML%%include/root/TMVA/GeneticRange.h
+%%TMVAML%%include/root/TMVA/GiniIndex.h
+%%TMVAML%%include/root/TMVA/GiniIndexWithLaplace.h
+%%TMVAML%%include/root/TMVA/HyperParameterOptimisation.h
+%%TMVAML%%include/root/TMVA/IFitterTarget.h
+%%TMVAML%%include/root/TMVA/IMethod.h
+%%TMVAML%%include/root/TMVA/IPruneTool.h
+%%TMVAML%%include/root/TMVA/Interval.h
+%%TMVAML%%include/root/TMVA/KDEKernel.h
+%%TMVAML%%include/root/TMVA/LDA.h
+%%TMVAML%%include/root/TMVA/LogInterval.h
+%%TMVAML%%include/root/TMVA/LossFunction.h
+%%TMVAML%%include/root/TMVA/MCFitter.h
+%%TMVAML%%include/root/TMVA/MethodANNBase.h
+%%TMVAML%%include/root/TMVA/MethodBDT.h
+%%TMVAML%%include/root/TMVA/MethodBase.h
+%%TMVAML%%include/root/TMVA/MethodBayesClassifier.h
+%%TMVAML%%include/root/TMVA/MethodBoost.h
+%%TMVAML%%include/root/TMVA/MethodCFMlpANN.h
+%%TMVAML%%include/root/TMVA/MethodCFMlpANN_Utils.h
+%%TMVAML%%include/root/TMVA/MethodCFMlpANN_def.h
+%%TMVAML%%include/root/TMVA/MethodCategory.h
+%%TMVAML%%include/root/TMVA/MethodCompositeBase.h
+%%TMVAML%%include/root/TMVA/MethodCrossValidation.h
+%%TMVAML%%include/root/TMVA/MethodCuts.h
+%%TMVAML%%include/root/TMVA/MethodDL.h
+%%TMVAML%%include/root/TMVA/MethodDNN.h
+%%TMVAML%%include/root/TMVA/MethodDT.h
+%%TMVAML%%include/root/TMVA/MethodFDA.h
+%%TMVAML%%include/root/TMVA/MethodFisher.h
+%%TMVAML%%include/root/TMVA/MethodHMatrix.h
+%%TMVAML%%include/root/TMVA/MethodKNN.h
+%%TMVAML%%include/root/TMVA/MethodLD.h
+%%TMVAML%%include/root/TMVA/MethodLikelihood.h
+%%TMVAML%%include/root/TMVA/MethodMLP.h
+%%TMVAML%%include/root/TMVA/MethodPDEFoam.h
+%%TMVAML%%include/root/TMVA/MethodPDERS.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/MethodPyAdaBoost.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/MethodPyGTB.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/MethodPyKeras.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/MethodPyRandomForest.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/MethodPyTorch.h
+%%TMVAML%%include/root/TMVA/MethodRuleFit.h
+%%TMVAML%%include/root/TMVA/MethodSVM.h
+%%TMVAML%%include/root/TMVA/MethodTMlpANN.h
+%%TMVAML%%include/root/TMVA/MinuitFitter.h
+%%TMVAML%%include/root/TMVA/MinuitWrapper.h
+%%TMVAML%%include/root/TMVA/MisClassificationError.h
+%%TMVAML%%include/root/TMVA/ModulekNN.h
+%%TMVAML%%include/root/TMVA/Monitoring.h
+%%TMVAML%%include/root/TMVA/MovieMaker.h
+%%TMVAML%%include/root/TMVA/MsgLogger.h
+%%TMVAML%%include/root/TMVA/NeuralNet.h
+%%TMVAML%%include/root/TMVA/NeuralNet.icc
+%%TMVAML%%include/root/TMVA/Node.h
+%%TMVAML%%include/root/TMVA/NodekNN.h
+%%TMVAML%%include/root/TMVA/OperatorList.hxx
+%%TMVAML%%include/root/TMVA/OptimizeConfigParameters.h
+%%TMVAML%%include/root/TMVA/Option.h
+%%TMVAML%%include/root/TMVA/OptionMap.h
+%%TMVAML%%include/root/TMVA/PDEFoam.h
+%%TMVAML%%include/root/TMVA/PDEFoamCell.h
+%%TMVAML%%include/root/TMVA/PDEFoamDecisionTree.h
+%%TMVAML%%include/root/TMVA/PDEFoamDecisionTreeDensity.h
+%%TMVAML%%include/root/TMVA/PDEFoamDensityBase.h
+%%TMVAML%%include/root/TMVA/PDEFoamDiscriminant.h
+%%TMVAML%%include/root/TMVA/PDEFoamDiscriminantDensity.h
+%%TMVAML%%include/root/TMVA/PDEFoamEvent.h
+%%TMVAML%%include/root/TMVA/PDEFoamEventDensity.h
+%%TMVAML%%include/root/TMVA/PDEFoamKernelBase.h
+%%TMVAML%%include/root/TMVA/PDEFoamKernelGauss.h
+%%TMVAML%%include/root/TMVA/PDEFoamKernelLinN.h
+%%TMVAML%%include/root/TMVA/PDEFoamKernelTrivial.h
+%%TMVAML%%include/root/TMVA/PDEFoamMultiTarget.h
+%%TMVAML%%include/root/TMVA/PDEFoamTarget.h
+%%TMVAML%%include/root/TMVA/PDEFoamTargetDensity.h
+%%TMVAML%%include/root/TMVA/PDEFoamVect.h
+%%TMVAML%%include/root/TMVA/PDF.h
+%%TMVAML%%include/root/TMVA/Pattern.h
+%%TMVAML%%include/root/TMVA/PlotFoams.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/PyMethodBase.h
+%%TMVAML%%include/root/TMVA/QuickMVAProbEstimator.h
+%%TMVAML%%include/root/TMVA/RBDT.hxx
+%%TMVAML%%include/root/TMVA/RBatchGenerator.hxx
+%%TMVAML%%include/root/TMVA/RBatchLoader.hxx
+%%TMVAML%%include/root/TMVA/RChunkLoader.hxx
+%%TMVAML%%include/root/TMVA/RFunction.hxx
+%%TMVAML%%include/root/TMVA/RFunction_MLP.hxx
+%%TMVAML%%include/root/TMVA/RFunction_Mean.hxx
+%%TMVAML%%include/root/TMVA/RFunction_Sum.hxx
+%%TMVAML%%include/root/TMVA/RInferenceUtils.hxx
+%%TMVAML%%include/root/TMVA/RModel.hxx
+%%TMVAML%%%%PYROOT%%include/root/TMVA/RModelParser_Keras.h
+%%TMVAML%%%%PYROOT%%include/root/TMVA/RModelParser_PyTorch.h
+%%TMVAML%%include/root/TMVA/RModel_Base.hxx
+%%TMVAML%%include/root/TMVA/RModel_GNN.hxx
+%%TMVAML%%include/root/TMVA/RModel_GraphIndependent.hxx
+%%TMVAML%%include/root/TMVA/ROCCalc.h
+%%TMVAML%%include/root/TMVA/ROCCurve.h
+%%TMVAML%%include/root/TMVA/ROperator.hxx
+%%TMVAML%%include/root/TMVA/ROperator_BasicBinary.hxx
+%%TMVAML%%include/root/TMVA/ROperator_BasicNary.hxx
+%%TMVAML%%include/root/TMVA/ROperator_BasicUnary.hxx
+%%TMVAML%%include/root/TMVA/ROperator_BatchNormalization.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Cast.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Comparision.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Concat.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Conv.hxx
+%%TMVAML%%include/root/TMVA/ROperator_ConvTranspose.hxx
+%%TMVAML%%include/root/TMVA/ROperator_ConvTranspose.icc
+%%TMVAML%%include/root/TMVA/ROperator_Custom.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Elu.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Erf.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Expand.hxx
+%%TMVAML%%include/root/TMVA/ROperator_EyeLike.hxx
+%%TMVAML%%include/root/TMVA/ROperator_GRU.hxx
+%%TMVAML%%include/root/TMVA/ROperator_GRU.icc
+%%TMVAML%%include/root/TMVA/ROperator_Gather.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Gemm.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Identity.hxx
+%%TMVAML%%include/root/TMVA/ROperator_LSTM.hxx
+%%TMVAML%%include/root/TMVA/ROperator_LSTM.icc
+%%TMVAML%%include/root/TMVA/ROperator_LayerNormalization.hxx
+%%TMVAML%%include/root/TMVA/ROperator_LeakyRelu.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Pool.hxx
+%%TMVAML%%include/root/TMVA/ROperator_RNN.hxx
+%%TMVAML%%include/root/TMVA/ROperator_RNN.icc
+%%TMVAML%%include/root/TMVA/ROperator_Range.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Reduce.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Relu.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Reshape.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Selu.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Shape.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Sigmoid.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Slice.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Softmax.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Swish.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Tanh.hxx
+%%TMVAML%%include/root/TMVA/ROperator_Transpose.hxx
+%%TMVAML%%include/root/TMVA/RReader.hxx
+%%TMVAML%%include/root/TMVA/RSofieReader.hxx
+%%TMVAML%%include/root/TMVA/RStandardScaler.hxx
+%%TMVAML%%include/root/TMVA/RTensor.hxx
+%%TMVAML%%include/root/TMVA/RTensorUtils.hxx
+%%TMVAML%%include/root/TMVA/Ranking.h
+%%TMVAML%%include/root/TMVA/Reader.h
+%%TMVAML%%include/root/TMVA/RegressionVariance.h
+%%TMVAML%%include/root/TMVA/Results.h
+%%TMVAML%%include/root/TMVA/ResultsClassification.h
+%%TMVAML%%include/root/TMVA/ResultsMulticlass.h
+%%TMVAML%%include/root/TMVA/ResultsRegression.h
+%%TMVAML%%include/root/TMVA/RootFinder.h
+%%TMVAML%%include/root/TMVA/Rule.h
+%%TMVAML%%include/root/TMVA/RuleCut.h
+%%TMVAML%%include/root/TMVA/RuleEnsemble.h
+%%TMVAML%%include/root/TMVA/RuleFit.h
+%%TMVAML%%include/root/TMVA/RuleFitAPI.h
+%%TMVAML%%include/root/TMVA/RuleFitParams.h
+%%TMVAML%%include/root/TMVA/SOFIEHelpers.hxx
+%%TMVAML%%include/root/TMVA/SOFIE_common.hxx
+%%TMVAML%%include/root/TMVA/SVEvent.h
+%%TMVAML%%include/root/TMVA/SVKernelFunction.h
+%%TMVAML%%include/root/TMVA/SVKernelMatrix.h
+%%TMVAML%%include/root/TMVA/SVWorkingSet.h
+%%TMVAML%%include/root/TMVA/SdivSqrtSplusB.h
+%%TMVAML%%include/root/TMVA/SeparationBase.h
+%%TMVAML%%include/root/TMVA/SimulatedAnnealing.h
+%%TMVAML%%include/root/TMVA/SimulatedAnnealingFitter.h
+%%TMVAML%%include/root/TMVA/TActivation.h
+%%TMVAML%%include/root/TMVA/TActivationChooser.h
+%%TMVAML%%include/root/TMVA/TActivationIdentity.h
+%%TMVAML%%include/root/TMVA/TActivationRadial.h
+%%TMVAML%%include/root/TMVA/TActivationReLU.h
+%%TMVAML%%include/root/TMVA/TActivationSigmoid.h
+%%TMVAML%%include/root/TMVA/TActivationTanh.h
+%%TMVAML%%include/root/TMVA/TMVAGui.h
+%%TMVAML%%include/root/TMVA/TMVAMultiClassGui.h
+%%TMVAML%%include/root/TMVA/TMVARegGui.h
+%%TMVAML%%include/root/TMVA/TNeuron.h
+%%TMVAML%%include/root/TMVA/TNeuronInput.h
+%%TMVAML%%include/root/TMVA/TNeuronInputAbs.h
+%%TMVAML%%include/root/TMVA/TNeuronInputChooser.h
+%%TMVAML%%include/root/TMVA/TNeuronInputSqSum.h
+%%TMVAML%%include/root/TMVA/TNeuronInputSum.h
+%%TMVAML%%include/root/TMVA/TSpline1.h
+%%TMVAML%%include/root/TMVA/TSpline2.h
+%%TMVAML%%include/root/TMVA/TSynapse.h
+%%TMVAML%%include/root/TMVA/Timer.h
+%%TMVAML%%include/root/TMVA/Tools.h
+%%TMVAML%%include/root/TMVA/TrainingHistory.h
+%%TMVAML%%include/root/TMVA/TransformationHandler.h
+%%TMVAML%%include/root/TMVA/Types.h
+%%TMVAML%%include/root/TMVA/VarTransformHandler.h
+%%TMVAML%%include/root/TMVA/VariableDecorrTransform.h
+%%TMVAML%%include/root/TMVA/VariableGaussTransform.h
+%%TMVAML%%include/root/TMVA/VariableIdentityTransform.h
+%%TMVAML%%include/root/TMVA/VariableImportance.h
+%%TMVAML%%include/root/TMVA/VariableInfo.h
+%%TMVAML%%include/root/TMVA/VariableNormalizeTransform.h
+%%TMVAML%%include/root/TMVA/VariablePCATransform.h
+%%TMVAML%%include/root/TMVA/VariableRearrangeTransform.h
+%%TMVAML%%include/root/TMVA/VariableTransform.h
+%%TMVAML%%include/root/TMVA/VariableTransformBase.h
+%%TMVAML%%include/root/TMVA/Version.h
+%%TMVAML%%include/root/TMVA/Volume.h
+%%TMVAML%%include/root/TMVA/annconvergencetest.h
+%%TMVAML%%include/root/TMVA/compareanapp.h
+%%TMVAML%%include/root/TMVA/correlations.h
+%%TMVAML%%include/root/TMVA/correlationsMultiClass.h
+%%TMVAML%%include/root/TMVA/correlationscatters.h
+%%TMVAML%%include/root/TMVA/correlationscattersMultiClass.h
+%%TMVAML%%include/root/TMVA/deviations.h
+%%TMVAML%%include/root/TMVA/efficiencies.h
+%%TMVAML%%include/root/TMVA/efficienciesMulticlass.h
+%%TMVAML%%include/root/TMVA/likelihoodrefs.h
+%%TMVAML%%include/root/TMVA/mvaeffs.h
+%%TMVAML%%include/root/TMVA/mvas.h
+%%TMVAML%%include/root/TMVA/mvasMulticlass.h
+%%TMVAML%%include/root/TMVA/mvaweights.h
+%%TMVAML%%include/root/TMVA/network.h
+%%TMVAML%%include/root/TMVA/paracoor.h
+%%TMVAML%%include/root/TMVA/probas.h
+%%TMVAML%%include/root/TMVA/regression_averagedevs.h
+%%TMVAML%%include/root/TMVA/rulevis.h
+%%TMVAML%%include/root/TMVA/rulevisCorr.h
+%%TMVAML%%include/root/TMVA/rulevisHists.h
+%%TMVAML%%include/root/TMVA/tmvaglob.h
+%%TMVAML%%include/root/TMVA/training_history.h
+%%TMVAML%%include/root/TMVA/variables.h
+%%TMVAML%%include/root/TMVA/variablesMultiClass.h
 include/root/TMacro.h
 include/root/TMakeProject.h
 include/root/TMap.h
@@ -2752,9 +2618,9 @@ include/root/TNDArray.h
 include/root/TNamed.h
 include/root/TNetFile.h
 include/root/TNetFileStager.h
-include/root/TNetXNGFile.h
-include/root/TNetXNGFileStager.h
-include/root/TNetXNGSystem.h
+%%XROOTD%%include/root/TNetXNGFile.h
+%%XROOTD%%include/root/TNetXNGFileStager.h
+%%XROOTD%%include/root/TNetXNGSystem.h
 include/root/TNeuron.h
 include/root/TNode.h
 include/root/TNodeDiv.h
@@ -2767,7 +2633,6 @@ include/root/TObject.h
 include/root/TObjectSpy.h
 include/root/TObjectTable.h
 include/root/TOrdCollection.h
-include/root/TOutputListSelectorDataMap.h
 include/root/TPARA.h
 include/root/TPCON.h
 include/root/TPDF.h
@@ -2776,12 +2641,6 @@ include/root/TPGON.h
 include/root/TPRegexp.h
 include/root/TPServerSocket.h
 include/root/TPSocket.h
-include/root/TPackMgr.h
-include/root/TPacketizer.h
-include/root/TPacketizerAdaptive.h
-include/root/TPacketizerFile.h
-include/root/TPacketizerMulti.h
-include/root/TPacketizerUnit.h
 include/root/TPad.h
 include/root/TPadEditor.h
 include/root/TPadPainter.h
@@ -2802,7 +2661,6 @@ include/root/TPaveStats.h
 include/root/TPaveStatsEditor.h
 include/root/TPaveText.h
 include/root/TPavesText.h
-include/root/TPerfStats.h
 %%PGSQL%%include/root/TPgSQLResult.h
 %%PGSQL%%include/root/TPgSQLRow.h
 %%PGSQL%%include/root/TPgSQLServer.h
@@ -2814,7 +2672,7 @@ include/root/TPieSliceEditor.h
 include/root/TPluginManager.h
 include/root/TPoint.h
 include/root/TPointSet3D.h
-%%X11%%include/root/TPointSet3DGL.h
+%%OPENGL%%include/root/TPointSet3DGL.h
 include/root/TPoints.h
 include/root/TPoints3DABC.h
 include/root/TPolyLine.h
@@ -2835,42 +2693,6 @@ include/root/TProfile.h
 include/root/TProfile2D.h
 include/root/TProfile2Poly.h
 include/root/TProfile3D.h
-include/root/TProof.h
-include/root/TProofBench.h
-include/root/TProofBenchDataSet.h
-include/root/TProofBenchRun.h
-include/root/TProofBenchRunCPU.h
-include/root/TProofBenchRunDataRead.h
-include/root/TProofBenchTypes.h
-include/root/TProofChain.h
-include/root/TProofCondor.h
-include/root/TProofDebug.h
-include/root/TProofDraw.h
-include/root/TProofLimitsFinder.h
-include/root/TProofLite.h
-include/root/TProofLog.h
-include/root/TProofMgr.h
-include/root/TProofMgrLite.h
-include/root/TProofMonSender.h
-include/root/TProofMonSenderML.h
-include/root/TProofMonSenderSQL.h
-include/root/TProofNodeInfo.h
-include/root/TProofNodes.h
-include/root/TProofOutputFile.h
-include/root/TProofOutputList.h
-include/root/TProofPerfAnalysis.h
-include/root/TProofPlayer.h
-include/root/TProofPlayerLite.h
-include/root/TProofProgressDialog.h
-include/root/TProofProgressLog.h
-include/root/TProofProgressMemoryPlot.h
-include/root/TProofProgressStatus.h
-include/root/TProofQueryResult.h
-include/root/TProofResources.h
-include/root/TProofResourcesStatic.h
-include/root/TProofServ.h
-include/root/TProofServLite.h
-include/root/TProofSuperMaster.h
 include/root/TProtoClass.h
 %%PYROOT%%include/root/TPyArg.h
 %%PYROOT%%include/root/TPyClassGenerator.h
@@ -2894,7 +2716,6 @@ include/root/TQpSolverBase.h
 include/root/TQpVar.h
 include/root/TQuaternion.h
 include/root/TQueryResult.h
-include/root/TQueryResultManager.h
 include/root/TROOT.h
 include/root/TRWLock.h
 include/root/TRandom.h
@@ -2931,14 +2752,14 @@ include/root/TRootGuiFactory.h
 include/root/TRootHelpDialog.h
 include/root/TRootIOCtor.h
 include/root/TRootSecContext.h
-include/root/TRootSniffer.h
-include/root/TRootSnifferFull.h
-include/root/TRootSnifferStore.h
+%%HTTP%%include/root/TRootSniffer.h
+%%HTTP%%include/root/TRootSnifferFull.h
+%%HTTP%%include/root/TRootSnifferStore.h
 include/root/TRotMatrix.h
 include/root/TRotation.h
 include/root/TS3HTTPRequest.h
 include/root/TS3WebFile.h
-include/root/TSAXParser.h
+%%XML%%include/root/TSAXParser.h
 include/root/TSPHE.h
 include/root/TSPlot.h
 include/root/TSQLClassInfo.h
@@ -2964,7 +2785,6 @@ include/root/TSchemaHelper.h
 include/root/TSchemaRule.h
 include/root/TSchemaRuleSet.h
 include/root/TSecContext.h
-include/root/TSelVerifyDataSet.h
 include/root/TSelector.h
 include/root/TSelectorDraw.h
 include/root/TSelectorEntries.h
@@ -2973,31 +2793,24 @@ include/root/TSelectorScalar.h
 include/root/TSemaphore.h
 include/root/TSeqCollection.h
 include/root/TServerSocket.h
-include/root/TSessionDialogs.h
-include/root/TSessionLogView.h
-include/root/TSessionViewer.h
 include/root/TShape.h
 include/root/TSimpleAnalysis.h
-include/root/TSlave.h
-include/root/TSlaveLite.h
 include/root/TSlider.h
 include/root/TSliderBox.h
 include/root/TSocket.h
 include/root/TSortedList.h
-include/root/TSpectrum.h
-include/root/TSpectrum2.h
-include/root/TSpectrum2Fit.h
-include/root/TSpectrum2Painter.h
-include/root/TSpectrum2Transform.h
-include/root/TSpectrum3.h
-include/root/TSpectrumFit.h
-include/root/TSpectrumTransform.h
+%%SPECTRUM%%include/root/TSpectrum.h
+%%SPECTRUM%%include/root/TSpectrum2.h
+%%SPECTRUM%%include/root/TSpectrum2Fit.h
+%%SPECTRUM%%include/root/TSpectrum2Painter.h
+%%SPECTRUM%%include/root/TSpectrum2Transform.h
+%%SPECTRUM%%include/root/TSpectrum3.h
+%%SPECTRUM%%include/root/TSpectrumFit.h
+%%SPECTRUM%%include/root/TSpectrumTransform.h
 include/root/TSpider.h
 include/root/TSpiderEditor.h
 include/root/TSpline.h
 include/root/TStatistic.h
-include/root/TStatsFeedback.h
-include/root/TStatus.h
 include/root/TStatusBitsChecker.h
 include/root/TStopwatch.h
 include/root/TStorage.h
@@ -3007,11 +2820,11 @@ include/root/TStreamerInfo.h
 include/root/TStreamerInfoActions.h
 include/root/TString.h
 include/root/TStringLong.h
-%%X11%%include/root/TStructNode.h
-%%X11%%include/root/TStructNodeEditor.h
-%%X11%%include/root/TStructNodeProperty.h
-%%X11%%include/root/TStructViewer.h
-%%X11%%include/root/TStructViewerGUI.h
+%%OPENGL%%include/root/TStructNode.h
+%%OPENGL%%include/root/TStructNodeEditor.h
+%%OPENGL%%include/root/TStructNodeProperty.h
+%%OPENGL%%include/root/TStructViewer.h
+%%OPENGL%%include/root/TStructViewerGUI.h
 include/root/TStyle.h
 include/root/TStyleDialog.h
 include/root/TStyleManager.h
@@ -3103,17 +2916,16 @@ include/root/TVirtualIndex.h
 include/root/TVirtualIsAProxy.h
 include/root/TVirtualMCDecayer.h
 include/root/TVirtualMagField.h
+include/root/TVirtualMapFile.h
 include/root/TVirtualMonitoring.h
 include/root/TVirtualMutex.h
 include/root/TVirtualObject.h
 include/root/TVirtualPS.h
-include/root/TVirtualPacketizer.h
 include/root/TVirtualPad.h
 include/root/TVirtualPadEditor.h
 include/root/TVirtualPadPainter.h
 include/root/TVirtualPaveStats.h
 include/root/TVirtualPerfStats.h
-include/root/TVirtualProofPlayer.h
 include/root/TVirtualQConnection.h
 include/root/TVirtualRWMutex.h
 include/root/TVirtualRefProxy.h
@@ -3123,33 +2935,30 @@ include/root/TVirtualTreePlayer.h
 include/root/TVirtualViewer3D.h
 include/root/TVirtualX.h
 include/root/TWbox.h
-include/root/TWebCanvas.h
-include/root/TWebControlBar.h
+%%HTTP%%include/root/TWebCanvas.h
+%%HTTP%%include/root/TWebControlBar.h
 include/root/TWebFile.h
-include/root/TWebMenuItem.h
-include/root/TWebPS.h
-include/root/TWebPadOptions.h
-include/root/TWebPadPainter.h
-include/root/TWebPainting.h
-include/root/TWebSnapshot.h
+%%HTTP%%include/root/TWebMenuItem.h
+%%HTTP%%include/root/TWebPS.h
+%%HTTP%%include/root/TWebPadOptions.h
+%%HTTP%%include/root/TWebPadPainter.h
+%%HTTP%%include/root/TWebPainting.h
+%%HTTP%%include/root/TWebSnapshot.h
 include/root/TWin32AtomicCount.h
 include/root/TWin32Condition.h
 include/root/TWin32Mutex.h
 include/root/TWin32Thread.h
 include/root/TWin32ThreadFactory.h
-%%X11%%include/root/TX11GL.h
+%%OPENGL%%include/root/TX11GL.h
 %%X11%%include/root/TX3DFrame.h
-include/root/TXMLAttr.h
-include/root/TXMLDocument.h
+%%XML%%include/root/TXMLAttr.h
+%%XML%%include/root/TXMLDocument.h
 include/root/TXMLEngine.h
 include/root/TXMLFile.h
-include/root/TXMLNode.h
-include/root/TXMLParser.h
+%%XML%%include/root/TXMLNode.h
+%%XML%%include/root/TXMLParser.h
 include/root/TXMLPlayer.h
 include/root/TXMLSetup.h
-include/root/TXNetFile.h
-include/root/TXNetFileStager.h
-include/root/TXNetSystem.h
 include/root/TXTRU.h
 include/root/TZIPFile.h
 include/root/ThreadLocalStorage.h
@@ -3158,13 +2967,12 @@ include/root/Varargs.h
 include/root/VectorizedTMath.h
 include/root/WidgetMessageTypes.h
 include/root/X3DBuffer.h
-include/root/XRooFit.h
+%%ROOFIT%%include/root/XRooFit.h
 include/root/ZipLZ4.h
 include/root/ZipLZMA.h
 include/root/ZipZSTD.h
 include/root/cfortran.h
 include/root/compiledata.h
-include/root/module.modulemap
 include/root/root_std_complex.h
 include/root/snprintf.h
 include/root/strlcpy.h
@@ -3172,100 +2980,93 @@ include/root/strtok.h
 include/root/v5/TF1Data.h
 include/root/v5/TFormula.h
 include/root/v5/TFormulaPrimitive.h
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%ASImage%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%ASImageGui%%AARCH64_PCM_SUFFIX%%.pcm
+%%ASIMAGE%%lib/root/ASImage.pcm
+%%ASIMAGE%%lib/root/ASImageGui.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime_Extra.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Core.pcm
-%%PYROOT%%lib/root/DistRDF/Backends/Base.py
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/Backend.py
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/__init__.py
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/Backend.py
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/__init__.py
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/Utils.py
-%%PYROOT%%lib/root/DistRDF/Backends/__init__.py
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Base%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Base%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/ComputationGraphGenerator.py
-%%PYROOT%%lib/root/DistRDF/DataFrame.py
-%%PYROOT%%lib/root/DistRDF/HeadNode.py
-%%PYROOT%%lib/root/DistRDF/LiveVisualize.py
-%%PYROOT%%lib/root/DistRDF/Node.py
-%%PYROOT%%lib/root/DistRDF/Operation.py
-%%PYROOT%%lib/root/DistRDF/Proxy.py
-%%PYROOT%%lib/root/DistRDF/PythonMergeables.py
-%%PYROOT%%lib/root/DistRDF/Ranges.py
-%%PYROOT%%lib/root/DistRDF/__init__.py
-%%PYROOT%%lib/root/DistRDF/__pycache__/ComputationGraphGenerator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/ComputationGraphGenerator%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/DataFrame%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/DataFrame%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/HeadNode%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/HeadNode%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/LiveVisualize%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/LiveVisualize%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Node%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Node%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Operation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Operation%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/PythonMergeables%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/PythonMergeables%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Ranges%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/Ranges%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/DistRDF/_graph_cache.py
-lib/root/%%AARCH64_PCM_PREFIX%%EG%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%Eve%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%FITSIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%FitPanel%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Foam%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Fumili%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%GX11%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%GX11TTF%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Gdml%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Ged%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%GenVector%%AARCH64_PCM_SUFFIX%%.pcm
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%GenVector_G__GenVector32%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Genetic%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Geom%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%GeomBuilder%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%GeomPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Gpad%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Graf%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Graf3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Gui%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%GuiBld%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%GuiHtml%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%Gviz3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Hist%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%HistFactory%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%HistPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Html%%AARCH64_PCM_SUFFIX%%.pcm
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Base.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/Backend.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__init__.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/Backend.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/__init__.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Spark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Utils.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__init__.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Base%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Base%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/Utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/ComputationGraphGenerator.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/DataFrame.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/HeadNode.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/LiveVisualize.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Node.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Operation.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Proxy.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/PythonMergeables.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Ranges.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__init__.py
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/ComputationGraphGenerator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/ComputationGraphGenerator%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/DataFrame%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/DataFrame%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/HeadNode%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/HeadNode%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/LiveVisualize%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/LiveVisualize%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Node%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Node%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Operation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Operation%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/PythonMergeables%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/PythonMergeables%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Ranges%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/Ranges%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/_graph_cache.py
+lib/root/EG.pcm
+%%OPENGL%%lib/root/Eve.pcm
+%%FITS%%lib/root/FITSIO.pcm
+lib/root/FitPanel.pcm
+lib/root/Foam.pcm
+lib/root/Fumili.pcm
+%%X11%%lib/root/GX11.pcm
+%%X11%%lib/root/GX11TTF.pcm
+%%GDML%%lib/root/Gdml.pcm
+lib/root/Ged.pcm
+lib/root/GenVector.pcm
+%%TMVAML%%lib/root/Genetic.pcm
+lib/root/Geom.pcm
+lib/root/GeomBuilder.pcm
+lib/root/GeomPainter.pcm
+lib/root/Gpad.pcm
+lib/root/Graf.pcm
+lib/root/Graf3d.pcm
+lib/root/Gui.pcm
+lib/root/GuiBld.pcm
+lib/root/GuiHtml.pcm
+%%OPENGL%%lib/root/Gviz3d.pcm
+%%FORTRAN%%lib/root/Hbook.pcm
+lib/root/Hist.pcm
+%%ROOFIT%%lib/root/HistFactory.pcm
+lib/root/HistPainter.pcm
+lib/root/Html.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Imt.pcm
-%%PYROOT%%lib/root/JsMVA/DataLoader.py
-%%PYROOT%%lib/root/JsMVA/Factory.py
-%%PYROOT%%lib/root/JsMVA/JPyInterface.py
-%%PYROOT%%lib/root/JsMVA/JsMVAMagic.py
-%%PYROOT%%lib/root/JsMVA/OutputTransformer.py
-%%PYROOT%%lib/root/JsMVA/Utils.py
-%%PYROOT%%lib/root/JsMVA/__init__.py
 %%PYROOT%%lib/root/JupyROOT/__init__.py
 %%PYROOT%%lib/root/JupyROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/JupyROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -3314,31 +3115,44 @@ lib/root/%%AARCH64_PCM_PREFIX%%Html%%AARCH64_PCM_SUFFIX%%.pcm
 %%PYROOT%%lib/root/JupyROOT/magics/__pycache__/jsrootmagic%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/JupyROOT/magics/cppmagic.py
 %%PYROOT%%lib/root/JupyROOT/magics/jsrootmagic.py
-lib/root/%%AARCH64_PCM_PREFIX%%MLP%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%MathCore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%MathMore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Matrix%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Minuit%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/MLP.pcm
+lib/root/MathCore.pcm
+%%MATHMORE%%lib/root/MathMore.pcm
+lib/root/Matrix.pcm
+lib/root/Minuit.pcm
+lib/root/Minuit2.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
-%%PGSQL%%lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Postscript%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Proof%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ProofBench%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ProofDraw%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ProofPlayer%%AARCH64_PCM_SUFFIX%%.pcm
-%%PYROOT%%lib/root/%%AARCH64_PCM_PREFIX%%PyMVA%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Quadp%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RCsg%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%RGL%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RHTTP%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/Net.pcm
+%%XROOTD%%lib/root/NetxNG.pcm
+%%PGSQL%%lib/root/PgSQL.pcm
+lib/root/Physics.pcm
+lib/root/Postscript.pcm
+%%TMVAML%%%%PYROOT%%lib/root/PyMVA.pcm
+lib/root/Quadp.pcm
+lib/root/RCsg.pcm
+%%OPENGL%%lib/root/RGL.pcm
+%%HTTP%%lib/root/RHTTP.pcm
+%%HTTP%%lib/root/RHTTPSniff.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/RIO.pcm
-%%MYSQL%%lib/root/%%AARCH64_PCM_PREFIX%%RMySQL%%AARCH64_PCM_SUFFIX%%.pcm
+%%MYSQL%%lib/root/RMySQL.pcm
+%%PYROOT%%lib/root/ROOT/JsMVA/DataLoader.py
+%%PYROOT%%lib/root/ROOT/JsMVA/Factory.py
+%%PYROOT%%lib/root/ROOT/JsMVA/JPyInterface.py
+%%PYROOT%%lib/root/ROOT/JsMVA/JsMVAMagic.py
+%%PYROOT%%lib/root/ROOT/JsMVA/OutputTransformer.py
+%%PYROOT%%lib/root/ROOT/JsMVA/__init__.py
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/DataLoader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/DataLoader%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/Factory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/Factory%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/JPyInterface%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/JPyInterface%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/JsMVAMagic%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/JsMVAMagic%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/OutputTransformer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/OutputTransformer%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYROOT%%lib/root/ROOT/JsMVA/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/ROOT/__init__.py
 %%PYROOT%%lib/root/ROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/ROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -3365,16 +3179,16 @@ lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_generic%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_pyz_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_pyz_utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdataframe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdataframe%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_conversion_maps%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_conversion_maps%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_pyz%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_pyz%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdfdescription%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdfdescription%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdataframe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdataframe%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_conversion_maps%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_conversion_maps%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_pyz%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_pyz%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdf_utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdfdescription%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rdfdescription%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_runtime_error%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_runtime_error%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/ROOT/_pythonization/__pycache__/_rvec%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -3423,89 +3237,89 @@ lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
 %%PYROOT%%lib/root/ROOT/_pythonization/_drawables.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_generic.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_pyz_utils.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_rdataframe.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_conversion_maps.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_pyz.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_utils.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_rdfdescription.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__init__.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabscollection%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabscollection%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsdata%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsdata%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabspdf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabspdf%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreal%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreal%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreallvalue%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreallvalue%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooarglist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooarglist%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooargset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooargset%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roocategory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roocategory%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roochi2var%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roochi2var%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodatahist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodatahist%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodataset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodataset%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodecays%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodecays%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roogenfitstudy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roogenfitstudy%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooglobalfunc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooglobalfunc%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roojsonfactorywstool%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roojsonfactorywstool%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomcstudy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomcstudy%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomsgservice%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomsgservice%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roonllvar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roonllvar%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooprodpdf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooprodpdf%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roorealvar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roorealvar%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimultaneous%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimultaneous%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimwstool%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimwstool%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roovectordatastore%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roovectordatastore%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooworkspace%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooworkspace%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabscollection.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsdata.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabspdf.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsreal.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsreallvalue.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooarglist.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooargset.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roocategory.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roochi2var.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodatahist.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodataset.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodecays.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roogenfitstudy.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooglobalfunc.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roomcstudy.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roomsgservice.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roonllvar.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooprodpdf.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roorealvar.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roosimultaneous.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roosimwstool.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roovectordatastore.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooworkspace.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_utils.py
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/_rdataframe.py
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_conversion_maps.py
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_pyz.py
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/_rdf_utils.py
+%%DATAFRAME%%%%PYROOT%%lib/root/ROOT/_pythonization/_rdfdescription.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__init__.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabscollection%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabscollection%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsdata%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsdata%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabspdf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabspdf%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreal%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreal%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreallvalue%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooabsreallvalue%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooarglist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooarglist%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooargset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooargset%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roocategory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roocategory%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roochi2var%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roochi2var%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodatahist%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodatahist%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodataset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodecays%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roodecays%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roogenfitstudy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roogenfitstudy%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooglobalfunc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooglobalfunc%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roojsonfactorywstool%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roojsonfactorywstool%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomcstudy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomcstudy%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomsgservice%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roomsgservice%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roonllvar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roonllvar%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooprodpdf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooprodpdf%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roorealvar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roorealvar%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimultaneous%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimultaneous%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimwstool%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roosimwstool%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roovectordatastore%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_roovectordatastore%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooworkspace%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_rooworkspace%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabscollection.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsdata.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabspdf.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsreal.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooabsreallvalue.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooarglist.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooargset.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roocategory.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roochi2var.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodatahist.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodataset.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roodecays.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roogenfitstudy.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooglobalfunc.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roojsonfactorywstool.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roomcstudy.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roomsgservice.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roonllvar.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooprodpdf.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roorealvar.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roosimultaneous.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roosimwstool.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_roovectordatastore.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_rooworkspace.py
+%%ROOFIT%%%%PYROOT%%lib/root/ROOT/_pythonization/_roofit/_utils.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_runtime_error.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_rvec.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_stl_vector.py
@@ -3521,36 +3335,36 @@ lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
 %%PYROOT%%lib/root/ROOT/_pythonization/_tgraph.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_th1.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_titer.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__init__.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_batchgenerator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_batchgenerator%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_crossvalidation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_crossvalidation%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_dataloader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_dataloader%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_factory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_factory%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_gnn%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_gnn%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rbdt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rbdt%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rtensor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rtensor%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_tree_inference%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_tree_inference%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_batchgenerator.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_crossvalidation.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_dataloader.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_factory.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_gnn.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_rbdt.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_rtensor.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_tree_inference.py
-%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_utils.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__init__.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_batchgenerator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%DATAFRAME%%%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_batchgenerator%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_crossvalidation%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_crossvalidation%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_dataloader%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_dataloader%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_factory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_factory%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_gnn%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_gnn%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rbdt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rbdt%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rtensor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_rtensor%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_tree_inference%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_tree_inference%%PYTHON_EXT_SUFFIX%%.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/__pycache__/_utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATAFRAME%%%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_batchgenerator.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_crossvalidation.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_dataloader.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_factory.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_gnn.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_rbdt.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_rtensor.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_tree_inference.py
+%%TMVAML%%%%PYROOT%%lib/root/ROOT/_pythonization/_tmva/_utils.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tobject.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tobjstring.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tseqcollection.py
@@ -3558,57 +3372,55 @@ lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
 %%PYROOT%%lib/root/ROOT/_pythonization/_ttree.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tvector3.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tvectort.py
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTBrowsable%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTBrowserv7%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ROOTDataFrame%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTEve%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTFitPanelv7%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTGeomViewer%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTGpadv7%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTGraphicsPrimitives%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTHist%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTHistDraw%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTNTuple%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTNTupleUtil%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ROOTTMVASofie%%AARCH64_PCM_SUFFIX%%.pcm
-%%PYROOT%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTTPython%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ROOTTreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ROOTVecOps%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%ROOTWebDisplay%%AARCH64_PCM_SUFFIX%%.pcm
+%%HTTP%%%%ROOT7%%lib/root/ROOTBrowsable.pcm
+%%HTTP%%%%ROOT7%%lib/root/ROOTBrowserv7.pcm
+%%DATAFRAME%%lib/root/ROOTDataFrame.pcm
+%%HTTP%%%%ROOT7%%lib/root/ROOTEve.pcm
+%%HTTP%%%%ROOT7%%lib/root/ROOTFitPanelv7.pcm
+%%HTTP%%%%ROOT7%%lib/root/ROOTGeomViewer.pcm
+%%ROOT7%%lib/root/ROOTGpadv7.pcm
+%%ROOT7%%lib/root/ROOTGraphicsPrimitives.pcm
+%%ROOT7%%lib/root/ROOTHist.pcm
+%%ROOT7%%lib/root/ROOTHistDraw.pcm
+%%ROOT7%%lib/root/ROOTNTuple.pcm
+%%ROOT7%%lib/root/ROOTNTupleUtil.pcm
+%%TMVAML%%lib/root/ROOTTMVASofie.pcm
+%%PYROOT%%lib/root/ROOTTPython.pcm
+%%HTTP%%lib/root/ROOTTreeViewer.pcm
+lib/root/ROOTVecOps.pcm
+%%HTTP%%lib/root/ROOTWebDisplay.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Config.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_C.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_Stage1_NoRTTI.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Rtypes.pcm
-%%SQLITE%%lib/root/%%AARCH64_PCM_PREFIX%%RSQLite%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Recorder%%AARCH64_PCM_SUFFIX%%.pcm
+%%SQLITE%%lib/root/RSQLite.pcm
+lib/root/Recorder.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Rint.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFit%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFitCore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFitHS3%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFitJSONInterface%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFitMore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooFitRDataFrameHelpers%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%RooFitXRooFit%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RooStats%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%RootAuth%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%SPlot%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%SQLIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%SessionViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Smatrix%%AARCH64_PCM_SUFFIX%%.pcm
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%Smatrix_G__Smatrix32%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Spectrum%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%SpectrumPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%TMVA%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%TMVAGui%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%TMVAUtils%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOFIT%%lib/root/RooFit.pcm
+%%ROOFIT%%lib/root/RooFitCore.pcm
+%%ROOFIT%%lib/root/RooFitHS3.pcm
+%%ROOFIT%%lib/root/RooFitJSONInterface.pcm
+%%MATHMORE%%%%ROOFIT%%lib/root/RooFitMore.pcm
+%%ROOFIT%%%%DATAFRAME%%lib/root/RooFitRDataFrameHelpers.pcm
+%%ROOFIT%%%%ROOT7%%lib/root/RooFitXRooFit.pcm
+%%ROOFIT%%lib/root/RooStats.pcm
+lib/root/RootAuth.pcm
+lib/root/SPlot.pcm
+lib/root/SQLIO.pcm
+lib/root/Smatrix.pcm
+%%SPECTRUM%%lib/root/Spectrum.pcm
+%%SPECTRUM%%lib/root/SpectrumPainter.pcm
+%%TMVAML%%lib/root/TMVA.pcm
+%%TMVAML%%lib/root/TMVAGui.pcm
+%%TMVAML%%%%DATAFRAME%%lib/root/TMVAUtils.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/Thread.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%Tree%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%TreePlayer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%TreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%WebGui6%%AARCH64_PCM_SUFFIX%%.pcm
-%%X11%%lib/root/%%AARCH64_PCM_PREFIX%%X3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%XMLIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/%%AARCH64_PCM_PREFIX%%XMLParser%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/Tree.pcm
+lib/root/TreePlayer.pcm
+lib/root/TreeViewer.pcm
+%%HTTP%%lib/root/WebGui6.pcm
+%%X11%%lib/root/X3d.pcm
+lib/root/XMLIO.pcm
+%%XML%%lib/root/XMLParser.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_intrinsics.pcm
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_stddef_max_align_t.pcm
 lib/root/cmdLineUtils.py
@@ -3637,6 +3449,8 @@ lib/root/cmdLineUtils.py
 %%PYROOT%%lib/root/cppyy/__pycache__/reflex%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/cppyy/__pycache__/types%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/cppyy/__pycache__/types%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYROOT%%lib/root/cppyy/__pyinstaller/__init__.py
+%%PYROOT%%lib/root/cppyy/__pyinstaller/hook-cppyy.py
 %%PYROOT%%lib/root/cppyy/_cpython_cppyy.py
 %%PYROOT%%lib/root/cppyy/_pypy_cppyy.py
 %%PYROOT%%lib/root/cppyy/_pythonization.py
@@ -3672,489 +3486,372 @@ lib/root/cmdLineUtils.py
 %%PYROOT%%lib/root/cppyy_backend/_rootcling.py
 %%PYROOT%%lib/root/cppyy_backend/bindings_utils.py
 %%PYROOT%%lib/root/cppyy_backend/loader.py
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libASImage.rootmap
-%%X11%%lib/root/libASImage.so
-%%X11%%lib/root/libASImage.so.%%SHLIB_SHVER%%
-%%X11%%lib/root/libASImage.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libASImageGui.rootmap
-%%X11%%lib/root/libASImageGui.so
-%%X11%%lib/root/libASImageGui.so.%%SHLIB_SHVER%%
-%%X11%%lib/root/libASImageGui.so.%%SHLIB_VER%%
+%%ASIMAGE%%lib/root/libASImage.so
+%%ASIMAGE%%lib/root/libASImage.so.%%SHLIB_SHVER%%
+%%ASIMAGE%%lib/root/libASImage.so.%%SHLIB_VER%%
+%%ASIMAGE%%lib/root/libASImageGui.so
+%%ASIMAGE%%lib/root/libASImageGui.so.%%SHLIB_SHVER%%
+%%ASIMAGE%%lib/root/libASImageGui.so.%%SHLIB_VER%%
 lib/root/libCling.so
 lib/root/libCling.so.%%SHLIB_SHVER%%
 lib/root/libCling.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libCore.rootmap
 lib/root/libCore.so
 lib/root/libCore.so.%%SHLIB_SHVER%%
 lib/root/libCore.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libEG.rootmap
 lib/root/libEG.so
 lib/root/libEG.so.%%SHLIB_SHVER%%
 lib/root/libEG.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libEve.rootmap
-%%X11%%lib/root/libEve.so
-%%X11%%lib/root/libEve.so.%%SHLIB_SHVER%%
-%%X11%%lib/root/libEve.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libFITSIO.rootmap
-lib/root/libFITSIO.so
-lib/root/libFITSIO.so.%%SHLIB_SHVER%%
-lib/root/libFITSIO.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libFitPanel.rootmap
+%%OPENGL%%lib/root/libEve.so
+%%OPENGL%%lib/root/libEve.so.%%SHLIB_SHVER%%
+%%OPENGL%%lib/root/libEve.so.%%SHLIB_VER%%
+%%FITS%%lib/root/libFITSIO.so
+%%FITS%%lib/root/libFITSIO.so.%%SHLIB_SHVER%%
+%%FITS%%lib/root/libFITSIO.so.%%SHLIB_VER%%
 lib/root/libFitPanel.so
 lib/root/libFitPanel.so.%%SHLIB_SHVER%%
 lib/root/libFitPanel.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libFoam.rootmap
 lib/root/libFoam.so
 lib/root/libFoam.so.%%SHLIB_SHVER%%
 lib/root/libFoam.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libFumili.rootmap
 lib/root/libFumili.so
 lib/root/libFumili.so.%%SHLIB_SHVER%%
 lib/root/libFumili.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libGX11.rootmap
 %%X11%%lib/root/libGX11.so
 %%X11%%lib/root/libGX11.so.%%SHLIB_SHVER%%
 %%X11%%lib/root/libGX11.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libGX11TTF.rootmap
 %%X11%%lib/root/libGX11TTF.so
 %%X11%%lib/root/libGX11TTF.so.%%SHLIB_SHVER%%
 %%X11%%lib/root/libGX11TTF.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGdml.rootmap
-lib/root/libGdml.so
-lib/root/libGdml.so.%%SHLIB_SHVER%%
-lib/root/libGdml.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGed.rootmap
+%%GDML%%lib/root/libGdml.so
+%%GDML%%lib/root/libGdml.so.%%SHLIB_SHVER%%
+%%GDML%%lib/root/libGdml.so.%%SHLIB_VER%%
 lib/root/libGed.so
 lib/root/libGed.so.%%SHLIB_SHVER%%
 lib/root/libGed.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGenVector.rootmap
 lib/root/libGenVector.so
 lib/root/libGenVector.so.%%SHLIB_SHVER%%
 lib/root/libGenVector.so.%%SHLIB_VER%%
 lib/root/libGenVector32.rootmap
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGenetic.rootmap
-lib/root/libGenetic.so
-lib/root/libGenetic.so.%%SHLIB_SHVER%%
-lib/root/libGenetic.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGeom.rootmap
+%%TMVAML%%lib/root/libGenetic.so
+%%TMVAML%%lib/root/libGenetic.so.%%SHLIB_SHVER%%
+%%TMVAML%%lib/root/libGenetic.so.%%SHLIB_VER%%
 lib/root/libGeom.so
 lib/root/libGeom.so.%%SHLIB_SHVER%%
 lib/root/libGeom.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGeomBuilder.rootmap
 lib/root/libGeomBuilder.so
 lib/root/libGeomBuilder.so.%%SHLIB_SHVER%%
 lib/root/libGeomBuilder.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGeomPainter.rootmap
 lib/root/libGeomPainter.so
 lib/root/libGeomPainter.so.%%SHLIB_SHVER%%
 lib/root/libGeomPainter.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGpad.rootmap
 lib/root/libGpad.so
 lib/root/libGpad.so.%%SHLIB_SHVER%%
 lib/root/libGpad.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGraf.rootmap
 lib/root/libGraf.so
 lib/root/libGraf.so.%%SHLIB_SHVER%%
 lib/root/libGraf.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGraf3d.rootmap
 lib/root/libGraf3d.so
 lib/root/libGraf3d.so.%%SHLIB_SHVER%%
 lib/root/libGraf3d.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGui.rootmap
 lib/root/libGui.so
 lib/root/libGui.so.%%SHLIB_SHVER%%
 lib/root/libGui.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGuiBld.rootmap
 lib/root/libGuiBld.so
 lib/root/libGuiBld.so.%%SHLIB_SHVER%%
 lib/root/libGuiBld.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libGuiHtml.rootmap
 lib/root/libGuiHtml.so
 lib/root/libGuiHtml.so.%%SHLIB_SHVER%%
 lib/root/libGuiHtml.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libGviz3d.rootmap
-%%X11%%lib/root/libGviz3d.so
-%%X11%%lib/root/libGviz3d.so.%%SHLIB_SHVER%%
-%%X11%%lib/root/libGviz3d.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libHist.rootmap
+%%OPENGL%%lib/root/libGviz3d.so
+%%OPENGL%%lib/root/libGviz3d.so.%%SHLIB_SHVER%%
+%%OPENGL%%lib/root/libGviz3d.so.%%SHLIB_VER%%
+%%FORTRAN%%lib/root/libHbook.so
+%%FORTRAN%%lib/root/libHbook.so.%%SHLIB_SHVER%%
+%%FORTRAN%%lib/root/libHbook.so.%%SHLIB_VER%%
 lib/root/libHist.so
 lib/root/libHist.so.%%SHLIB_SHVER%%
 lib/root/libHist.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libHistFactory.rootmap
-lib/root/libHistFactory.so
-lib/root/libHistFactory.so.%%SHLIB_SHVER%%
-lib/root/libHistFactory.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libHistPainter.rootmap
+%%ROOFIT%%lib/root/libHistFactory.so
+%%ROOFIT%%lib/root/libHistFactory.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libHistFactory.so.%%SHLIB_VER%%
 lib/root/libHistPainter.so
 lib/root/libHistPainter.so.%%SHLIB_SHVER%%
 lib/root/libHistPainter.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libHtml.rootmap
 lib/root/libHtml.so
 lib/root/libHtml.so.%%SHLIB_SHVER%%
 lib/root/libHtml.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libImt.rootmap
 lib/root/libImt.so
 lib/root/libImt.so.%%SHLIB_SHVER%%
 lib/root/libImt.so.%%SHLIB_VER%%
-%%PYROOT%%lib/root/libJupyROOT3_9.so
-%%PYROOT%%lib/root/libJupyROOT3_9.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libJupyROOT3_9.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMLP.rootmap
 lib/root/libMLP.so
 lib/root/libMLP.so.%%SHLIB_SHVER%%
 lib/root/libMLP.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMathCore.rootmap
 lib/root/libMathCore.so
 lib/root/libMathCore.so.%%SHLIB_SHVER%%
 lib/root/libMathCore.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMathMore.rootmap
-lib/root/libMathMore.so
-lib/root/libMathMore.so.%%SHLIB_SHVER%%
-lib/root/libMathMore.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMatrix.rootmap
+%%MATHMORE%%lib/root/libMathMore.so
+%%MATHMORE%%lib/root/libMathMore.so.%%SHLIB_SHVER%%
+%%MATHMORE%%lib/root/libMathMore.so.%%SHLIB_VER%%
 lib/root/libMatrix.so
 lib/root/libMatrix.so.%%SHLIB_SHVER%%
 lib/root/libMatrix.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMinuit.rootmap
 lib/root/libMinuit.so
 lib/root/libMinuit.so.%%SHLIB_SHVER%%
 lib/root/libMinuit.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMinuit2.rootmap
 lib/root/libMinuit2.so
 lib/root/libMinuit2.so.%%SHLIB_SHVER%%
 lib/root/libMinuit2.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libMultiProc.rootmap
 lib/root/libMultiProc.so
 lib/root/libMultiProc.so.%%SHLIB_SHVER%%
 lib/root/libMultiProc.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNet.rootmap
 lib/root/libNet.so
 lib/root/libNet.so.%%SHLIB_SHVER%%
 lib/root/libNet.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetx.rootmap
-lib/root/libNetx.so
-lib/root/libNetx.so.%%SHLIB_SHVER%%
-lib/root/libNetx.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libNetxNG.rootmap
-lib/root/libNetxNG.so
-lib/root/libNetxNG.so.%%SHLIB_SHVER%%
-lib/root/libNetxNG.so.%%SHLIB_VER%%
+%%XROOTD%%lib/root/libNetxNG.so
+%%XROOTD%%lib/root/libNetxNG.so.%%SHLIB_SHVER%%
+%%XROOTD%%lib/root/libNetxNG.so.%%SHLIB_VER%%
 lib/root/libNew.so
 lib/root/libNew.so.%%SHLIB_SHVER%%
 lib/root/libNew.so.%%SHLIB_VER%%
 %%PGSQL%%lib/root/libPgSQL.so
 %%PGSQL%%lib/root/libPgSQL.so.%%SHLIB_SHVER%%
 %%PGSQL%%lib/root/libPgSQL.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libPhysics.rootmap
 lib/root/libPhysics.so
 lib/root/libPhysics.so.%%SHLIB_SHVER%%
 lib/root/libPhysics.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libPostscript.rootmap
 lib/root/libPostscript.so
 lib/root/libPostscript.so.%%SHLIB_SHVER%%
 lib/root/libPostscript.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libProof.rootmap
-lib/root/libProof.so
-lib/root/libProof.so.%%SHLIB_SHVER%%
-lib/root/libProof.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libProofBench.rootmap
-lib/root/libProofBench.so
-lib/root/libProofBench.so.%%SHLIB_SHVER%%
-lib/root/libProofBench.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libProofDraw.rootmap
-lib/root/libProofDraw.so
-lib/root/libProofDraw.so.%%SHLIB_SHVER%%
-lib/root/libProofDraw.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libProofPlayer.rootmap
-lib/root/libProofPlayer.so
-lib/root/libProofPlayer.so.%%SHLIB_SHVER%%
-lib/root/libProofPlayer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%PYROOT%%lib/root/libPyMVA.rootmap
-%%PYROOT%%lib/root/libPyMVA.so
-%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libQuadp.rootmap
+%%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so
+%%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_SHVER%%
+%%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_VER%%
 lib/root/libQuadp.so
 lib/root/libQuadp.so.%%SHLIB_SHVER%%
 lib/root/libQuadp.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRCsg.rootmap
 lib/root/libRCsg.so
 lib/root/libRCsg.so.%%SHLIB_SHVER%%
 lib/root/libRCsg.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libRGL.rootmap
-%%X11%%lib/root/libRGL.so
-%%X11%%lib/root/libRGL.so.%%SHLIB_SHVER%%
-%%X11%%lib/root/libRGL.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRHTTP.rootmap
-lib/root/libRHTTP.so
-lib/root/libRHTTP.so.%%SHLIB_SHVER%%
-lib/root/libRHTTP.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRHTTPSniff.rootmap
-lib/root/libRHTTPSniff.so
-lib/root/libRHTTPSniff.so.%%SHLIB_SHVER%%
-lib/root/libRHTTPSniff.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRIO.rootmap
+%%OPENGL%%lib/root/libRGL.so
+%%OPENGL%%lib/root/libRGL.so.%%SHLIB_SHVER%%
+%%OPENGL%%lib/root/libRGL.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libRHTTP.so
+%%HTTP%%lib/root/libRHTTP.so.%%SHLIB_SHVER%%
+%%HTTP%%lib/root/libRHTTP.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libRHTTPSniff.so
+%%HTTP%%lib/root/libRHTTPSniff.so.%%SHLIB_SHVER%%
+%%HTTP%%lib/root/libRHTTPSniff.so.%%SHLIB_VER%%
 lib/root/libRIO.so
 lib/root/libRIO.so.%%SHLIB_SHVER%%
 lib/root/libRIO.so.%%SHLIB_VER%%
 %%MYSQL%%lib/root/libRMySQL.so
 %%MYSQL%%lib/root/libRMySQL.so.%%SHLIB_SHVER%%
 %%MYSQL%%lib/root/libRMySQL.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so
-%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTBrowsable.rootmap
-%%ROOT7%%lib/root/libROOTBrowsable.so
-%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so
-%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so
-%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so
-%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so
-%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTBrowserWidgets.so
-%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTBrowserv7.rootmap
-%%ROOT7%%lib/root/libROOTBrowserv7.so
-%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTCanvasPainter.so
-%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libROOTDataFrame.rootmap
-lib/root/libROOTDataFrame.so
-lib/root/libROOTDataFrame.so.%%SHLIB_SHVER%%
-lib/root/libROOTDataFrame.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTEve.rootmap
-%%ROOT7%%lib/root/libROOTEve.so
-%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTFitPanelv7.rootmap
-%%ROOT7%%lib/root/libROOTFitPanelv7.so
-%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so
-%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTGeomViewer.rootmap
-%%ROOT7%%lib/root/libROOTGeomViewer.so
-%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTGpadv7.rootmap
+%%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserRCanvasWidget.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTCanvasWidget.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_VER%%
+%%DATAFRAME%%lib/root/libROOTDataFrame.so
+%%DATAFRAME%%lib/root/libROOTDataFrame.so.%%SHLIB_SHVER%%
+%%DATAFRAME%%lib/root/libROOTDataFrame.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTEve.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_VER%%
 %%ROOT7%%lib/root/libROOTGpadv7.so
 %%ROOT7%%lib/root/libROOTGpadv7.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTGpadv7.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTGraphicsPrimitives.rootmap
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTHist.rootmap
 %%ROOT7%%lib/root/libROOTHist.so
 %%ROOT7%%lib/root/libROOTHist.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTHist.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTHistDraw.rootmap
 %%ROOT7%%lib/root/libROOTHistDraw.so
 %%ROOT7%%lib/root/libROOTHistDraw.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTHistDraw.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTHistDrawProvider.so
-%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so
-%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so
-%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTNTuple.rootmap
+%%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw6Provider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_VER%%
 %%ROOT7%%lib/root/libROOTNTuple.so
 %%ROOT7%%lib/root/libROOTNTuple.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTNTuple.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so
-%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so
-%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so
-%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%ROOT7%%lib/root/libROOTNTupleUtil.rootmap
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleBrowseProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw6Provider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_VER%%
 %%ROOT7%%lib/root/libROOTNTupleUtil.so
 %%ROOT7%%lib/root/libROOTNTupleUtil.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTNTupleUtil.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so
-%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so
-%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_VER%%
-%%PYROOT%%lib/root/libROOTPythonizations3_9.so
-%%PYROOT%%lib/root/libROOTPythonizations3_9.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libROOTPythonizations3_9.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libROOTTMVASofie.rootmap
-lib/root/libROOTTMVASofie.so
-lib/root/libROOTTMVASofie.so.%%SHLIB_SHVER%%
-lib/root/libROOTTMVASofie.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%PYROOT%%lib/root/libROOTTPython.rootmap
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_SHVER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_VER%%
+%%PYROOT%%lib/root/libROOTPythonizations.so
+%%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_SHVER%%
+%%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libROOTTMVASofie.so
+%%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_SHVER%%
+%%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_VER%%
 %%PYROOT%%lib/root/libROOTTPython.so
 %%PYROOT%%lib/root/libROOTTPython.so.%%SHLIB_SHVER%%
 %%PYROOT%%lib/root/libROOTTPython.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libROOTTreeViewer.rootmap
-lib/root/libROOTTreeViewer.so
-lib/root/libROOTTreeViewer.so.%%SHLIB_SHVER%%
-lib/root/libROOTTreeViewer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libROOTVecOps.rootmap
+%%HTTP%%lib/root/libROOTTreeViewer.so
+%%HTTP%%lib/root/libROOTTreeViewer.so.%%SHLIB_SHVER%%
+%%HTTP%%lib/root/libROOTTreeViewer.so.%%SHLIB_VER%%
 lib/root/libROOTVecOps.so
 lib/root/libROOTVecOps.so.%%SHLIB_SHVER%%
 lib/root/libROOTVecOps.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libROOTWebDisplay.rootmap
-lib/root/libROOTWebDisplay.so
-lib/root/libROOTWebDisplay.so.%%SHLIB_SHVER%%
-lib/root/libROOTWebDisplay.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libROOTWebDisplay.so
+%%HTTP%%lib/root/libROOTWebDisplay.so.%%SHLIB_SHVER%%
+%%HTTP%%lib/root/libROOTWebDisplay.so.%%SHLIB_VER%%
 %%SQLITE%%lib/root/libRSQLite.so
 %%SQLITE%%lib/root/libRSQLite.so.%%SHLIB_SHVER%%
 %%SQLITE%%lib/root/libRSQLite.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRecorder.rootmap
 lib/root/libRecorder.so
 lib/root/libRecorder.so.%%SHLIB_SHVER%%
 lib/root/libRecorder.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRint.rootmap
 lib/root/libRint.so
 lib/root/libRint.so.%%SHLIB_SHVER%%
 lib/root/libRint.so.%%SHLIB_VER%%
-lib/root/libRooBatchCompute.so
-lib/root/libRooBatchCompute.so.%%SHLIB_SHVER%%
-lib/root/libRooBatchCompute.so.%%SHLIB_VER%%
-lib/root/libRooBatchCompute_GENERIC.so
-lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_SHVER%%
-lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFit.rootmap
-lib/root/libRooFit.so
-lib/root/libRooFit.so.%%SHLIB_SHVER%%
-lib/root/libRooFit.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitCore.rootmap
-lib/root/libRooFitCore.so
-lib/root/libRooFitCore.so.%%SHLIB_SHVER%%
-lib/root/libRooFitCore.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitHS3.rootmap
-lib/root/libRooFitHS3.so
-lib/root/libRooFitHS3.so.%%SHLIB_SHVER%%
-lib/root/libRooFitHS3.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitJSONInterface.rootmap
-lib/root/libRooFitJSONInterface.so
-lib/root/libRooFitJSONInterface.so.%%SHLIB_SHVER%%
-lib/root/libRooFitJSONInterface.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitMore.rootmap
-lib/root/libRooFitMore.so
-lib/root/libRooFitMore.so.%%SHLIB_SHVER%%
-lib/root/libRooFitMore.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitRDataFrameHelpers.rootmap
-lib/root/libRooFitRDataFrameHelpers.so
-lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_SHVER%%
-lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooFitXRooFit.rootmap
-%%ROOT7%%lib/root/libRooFitXRooFit.so
-%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_SHVER%%
-%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRooStats.rootmap
-lib/root/libRooStats.so
-lib/root/libRooStats.so.%%SHLIB_SHVER%%
-lib/root/libRooStats.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libRootAuth.rootmap
+%%ROOFIT%%lib/root/libRooBatchCompute.so
+%%ROOFIT%%lib/root/libRooBatchCompute.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooBatchCompute.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so
+%%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFit.so
+%%ROOFIT%%lib/root/libRooFit.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooFit.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitCore.so
+%%ROOFIT%%lib/root/libRooFitCore.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooFitCore.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitHS3.so
+%%ROOFIT%%lib/root/libRooFitHS3.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooFitHS3.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitJSONInterface.so
+%%ROOFIT%%lib/root/libRooFitJSONInterface.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooFitJSONInterface.so.%%SHLIB_VER%%
+%%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so
+%%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so.%%SHLIB_SHVER%%
+%%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so.%%SHLIB_VER%%
+%%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so
+%%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_SHVER%%
+%%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_VER%%
+%%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so
+%%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_SHVER%%
+%%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooStats.so
+%%ROOFIT%%lib/root/libRooStats.so.%%SHLIB_SHVER%%
+%%ROOFIT%%lib/root/libRooStats.so.%%SHLIB_VER%%
 lib/root/libRootAuth.so
 lib/root/libRootAuth.so.%%SHLIB_SHVER%%
 lib/root/libRootAuth.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSPlot.rootmap
 lib/root/libSPlot.so
 lib/root/libSPlot.so.%%SHLIB_SHVER%%
 lib/root/libSPlot.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSQLIO.rootmap
 lib/root/libSQLIO.so
 lib/root/libSQLIO.so.%%SHLIB_SHVER%%
 lib/root/libSQLIO.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSessionViewer.rootmap
-lib/root/libSessionViewer.so
-lib/root/libSessionViewer.so.%%SHLIB_SHVER%%
-lib/root/libSessionViewer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSmatrix.rootmap
 lib/root/libSmatrix.so
 lib/root/libSmatrix.so.%%SHLIB_SHVER%%
 lib/root/libSmatrix.so.%%SHLIB_VER%%
 lib/root/libSmatrix32.rootmap
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSpectrum.rootmap
-lib/root/libSpectrum.so
-lib/root/libSpectrum.so.%%SHLIB_SHVER%%
-lib/root/libSpectrum.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libSpectrumPainter.rootmap
-lib/root/libSpectrumPainter.so
-lib/root/libSpectrumPainter.so.%%SHLIB_SHVER%%
-lib/root/libSpectrumPainter.so.%%SHLIB_VER%%
-lib/root/libSrvAuth.so
-lib/root/libSrvAuth.so.%%SHLIB_SHVER%%
-lib/root/libSrvAuth.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTMVA.rootmap
-lib/root/libTMVA.so
-lib/root/libTMVA.so.%%SHLIB_SHVER%%
-lib/root/libTMVA.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTMVAGui.rootmap
-lib/root/libTMVAGui.so
-lib/root/libTMVAGui.so.%%SHLIB_SHVER%%
-lib/root/libTMVAGui.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTMVAUtils.rootmap
-lib/root/libTMVAUtils.so
-lib/root/libTMVAUtils.so.%%SHLIB_SHVER%%
-lib/root/libTMVAUtils.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libThread.rootmap
+%%SPECTRUM%%lib/root/libSpectrum.so
+%%SPECTRUM%%lib/root/libSpectrum.so.%%SHLIB_SHVER%%
+%%SPECTRUM%%lib/root/libSpectrum.so.%%SHLIB_VER%%
+%%SPECTRUM%%lib/root/libSpectrumPainter.so
+%%SPECTRUM%%lib/root/libSpectrumPainter.so.%%SHLIB_SHVER%%
+%%SPECTRUM%%lib/root/libSpectrumPainter.so.%%SHLIB_VER%%
+%%SSL%%lib/root/libSrvAuth.so
+%%SSL%%lib/root/libSrvAuth.so.%%SHLIB_SHVER%%
+%%SSL%%lib/root/libSrvAuth.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libTMVA.so
+%%TMVAML%%lib/root/libTMVA.so.%%SHLIB_SHVER%%
+%%TMVAML%%lib/root/libTMVA.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libTMVAGui.so
+%%TMVAML%%lib/root/libTMVAGui.so.%%SHLIB_SHVER%%
+%%TMVAML%%lib/root/libTMVAGui.so.%%SHLIB_VER%%
+%%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so
+%%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so.%%SHLIB_SHVER%%
+%%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so.%%SHLIB_VER%%
 lib/root/libThread.so
 lib/root/libThread.so.%%SHLIB_SHVER%%
 lib/root/libThread.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTree.rootmap
 lib/root/libTree.so
 lib/root/libTree.so.%%SHLIB_SHVER%%
 lib/root/libTree.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTreePlayer.rootmap
 lib/root/libTreePlayer.so
 lib/root/libTreePlayer.so.%%SHLIB_SHVER%%
 lib/root/libTreePlayer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libTreeViewer.rootmap
 lib/root/libTreeViewer.so
 lib/root/libTreeViewer.so.%%SHLIB_SHVER%%
 lib/root/libTreeViewer.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libWebGui6.rootmap
-lib/root/libWebGui6.so
-lib/root/libWebGui6.so.%%SHLIB_SHVER%%
-lib/root/libWebGui6.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%%%X11%%lib/root/libX3d.rootmap
+%%HTTP%%lib/root/libWebGui6.so
+%%HTTP%%lib/root/libWebGui6.so.%%SHLIB_SHVER%%
+%%HTTP%%lib/root/libWebGui6.so.%%SHLIB_VER%%
 %%X11%%lib/root/libX3d.so
 %%X11%%lib/root/libX3d.so.%%SHLIB_SHVER%%
 %%X11%%lib/root/libX3d.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libXMLIO.rootmap
 lib/root/libXMLIO.so
 lib/root/libXMLIO.so.%%SHLIB_SHVER%%
 lib/root/libXMLIO.so.%%SHLIB_VER%%
-%%ONLY_INSTALLED_ON_AARCH64%%lib/root/libXMLParser.rootmap
-lib/root/libXMLParser.so
-lib/root/libXMLParser.so.%%SHLIB_SHVER%%
-lib/root/libXMLParser.so.%%SHLIB_VER%%
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/libc.pcm
+%%XML%%lib/root/libXMLParser.so
+%%XML%%lib/root/libXMLParser.so.%%SHLIB_SHVER%%
+%%XML%%lib/root/libXMLParser.so.%%SHLIB_VER%%
 lib/root/libcomplexDict.rootmap
 lib/root/libcomplexDict.so
 lib/root/libcomplexDict.so.%%SHLIB_SHVER%%
 lib/root/libcomplexDict.so.%%SHLIB_VER%%
-%%PYROOT%%lib/root/libcppyy3_9.so
-%%PYROOT%%lib/root/libcppyy3_9.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libcppyy3_9.so.%%SHLIB_VER%%
-%%PYROOT%%lib/root/libcppyy_backend3_9.so
-%%PYROOT%%lib/root/libcppyy_backend3_9.so.%%SHLIB_SHVER%%
-%%PYROOT%%lib/root/libcppyy_backend3_9.so.%%SHLIB_VER%%
+%%PYROOT%%lib/root/libcppyy.so
+%%PYROOT%%lib/root/libcppyy.so.%%SHLIB_SHVER%%
+%%PYROOT%%lib/root/libcppyy.so.%%SHLIB_VER%%
+%%PYROOT%%lib/root/libcppyy_backend.so
+%%PYROOT%%lib/root/libcppyy_backend.so.%%SHLIB_SHVER%%
+%%PYROOT%%lib/root/libcppyy_backend.so.%%SHLIB_VER%%
 lib/root/libdequeDict.rootmap
 lib/root/libdequeDict.so
 lib/root/libdequeDict.so.%%SHLIB_SHVER%%
@@ -4175,6 +3872,7 @@ lib/root/libmapDict.rootmap
 lib/root/libmapDict.so
 lib/root/libmapDict.so.%%SHLIB_SHVER%%
 lib/root/libmapDict.so.%%SHLIB_VER%%
+%%FORTRAN%%lib/root/libminicern.a
 lib/root/libmultimap2Dict.rootmap
 lib/root/libmultimap2Dict.so
 lib/root/libmultimap2Dict.so.%%SHLIB_SHVER%%
@@ -4217,6 +3915,7 @@ lib/root/libvectorDict.so.%%SHLIB_SHVER%%
 lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
+%%ONLY_INSTALLED_ON_FBSD140%%%%NOT_INSTALLED_ON_AARCH64%%lib/root/std_config.pcm
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -4311,6 +4010,8 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/v628/TGraph2DAsymmErrors.png
 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/v628/index.md
 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/v630/index.md
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/v632/index.md
+%%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes/v632/reve-boxset-cones.png
 %%PORTDOCS%%%%DOCSDIR%%/cfortran.doc
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/.rootlogon.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/CMakeLists.txt
@@ -4380,6 +4081,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df033_Describe.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df034_SaveGraph.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df034_SaveGraph.py
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df035_RDFFromPandas.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df101_h1Analysis.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df102_NanoAODDimuonAnalysis.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/df102_NanoAODDimuonAnalysis.py
@@ -4397,6 +4099,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/distrdf001_spark_connection.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/distrdf002_dask_connection.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/distrdf003_live_visualization.py
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/distrdf004_dask_lxbatch.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/dataframe/index.md
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/demos.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/demoshelp.C
@@ -4465,6 +4168,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve/window_manager.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/box.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/boxset.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/boxset_cones.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/calorimeters.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/collection_proxies.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/eve7/compound.C
@@ -4581,7 +4285,6 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/geom/web_cms.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/geom/xtruDraw.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/geom/xtruSamples.C
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/gl/customcolorgl.h
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/gl/glViewerExercise.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/gl/glViewerLOD.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/gl/glbox.C
@@ -4632,6 +4335,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/graph_edit_playback.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/greyscale.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/gtime.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/inside.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/latex.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/latex2.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/graphics/latex3.C
@@ -4834,7 +4538,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/http/httpgeom.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/http/httpserver.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/http/httptextlog.C
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/http/httptextlog.js
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/http/httptextlog.mjs
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/http/ws.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/http/ws.htm
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/image/fore.xpm
@@ -4875,15 +4579,6 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/mlp/mlpHiggs.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/mlp/mlpHiggs.root
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/mlp/mlpRegression.C
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/benchmarks.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/fildir.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/file.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/first.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/framework.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/index.md
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/rootmarks.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/test.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/pyroot/tree.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/regexp/index.md
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/regexp/regexp.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/legacy/regexp/regexp_pme.C
@@ -4932,6 +4627,7 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/mathcoreVectorFloatIO.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/mathcoreVectorIO.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/mathmoreIntegration.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/math/mathmoreIntegrationMultidim.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/multidimSampling.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/multivarGaus.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/math/normalDist.C
@@ -5065,7 +4761,6 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/pyroot/tornado.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/pyroot/zdemo.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/pythia/pythia8.C
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/pythia/pythiaExample.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/quadp/Quad.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/quadp/Quad.h
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/quadp/portfolio.C
@@ -5308,14 +5003,14 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/FourBinInstructional.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/FourBinInstructional.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/HybridInstructional.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/HybridInstructional.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/HybridStandardForm.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/HybridStandardForm.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/IntervalExamples.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/IntervalExamples.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/ModelInspector.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/MultivariateGaussianTest.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/MultivariateGaussianTest.py
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/NuMuToNuE_Oscillation.cxx
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/NuMuToNuE_Oscillation.h
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/OneSidedFrequentistUpperLimitWithBands.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardBayesianMCMCDemo.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardBayesianNumericalDemo.C
@@ -5325,10 +5020,14 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardHypoTestDemo.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardHypoTestInvDemo.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardProfileInspectorDemo.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardProfileInspectorDemo.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardProfileLikelihoodDemo.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardProfileLikelihoodDemo.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/StandardTestStatDistributionDemo.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/TestNonCentral.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/TestNonCentral.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/TwoSidedFrequentistUpperLimitWithBands.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/TwoSidedFrequentistUpperLimitWithBands.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/Zbi_Zgamma.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/Zbi_Zgamma.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/roostats/rs101_limitexample.C
@@ -5428,6 +5127,8 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_RNN_Classification.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_RNN_Classification.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_GNN.py
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_GNN_Application.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_GNN_Parser.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_Inference.py
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_Keras.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/tmva/TMVA_SOFIE_Keras_HiggsModel.C
@@ -5554,7 +5255,6 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/filedialog.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/fitpanel.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/fitpanel6.cxx
-%%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/global_temperatures.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/histops.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/index.md
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/index.md
@@ -5566,6 +5266,9 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl006_friends.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl007_mtFill.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl008_import.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl009_parallelWriter.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl010_skim.C
+%%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/ntuple/ntpl011_global_temperatures.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/perf.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/perfcomp.cxx
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/v7/simple.cxx
@@ -5612,9 +5315,11 @@ lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/xml/xmlmodifyfile.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/xml/xmlnewfile.C
 %%PORTDOCS%%%%DOCSDIR%%/tutorials/xml/xmlreadfile.C
+%%FORTRAN%%share/man/man1/g2root.1.gz
+%%FORTRAN%%share/man/man1/h2root.1.gz
 share/man/man1/hadd.1.gz
-share/man/man1/hist2workspace.1.gz
-share/man/man1/prepareHistFactory.1.gz
+%%ROOFIT%%share/man/man1/hist2workspace.1.gz
+%%ROOFIT%%share/man/man1/prepareHistFactory.1.gz
 share/man/man1/proofserv.1.gz
 share/man/man1/rmkdepend.1.gz
 share/man/man1/root-config.1.gz
@@ -5648,6 +5353,7 @@ share/man/man1/xpdtest.1.gz
 %%DATADIR%%/fonts/FreeSerifBoldItalic.otf
 %%DATADIR%%/fonts/FreeSerifItalic.otf
 %%DATADIR%%/fonts/LICENSE
+%%DATADIR%%/fonts/MANIFEST-TeX-Gyre-Heros.txt
 %%DATADIR%%/fonts/STIXGeneral.otf
 %%DATADIR%%/fonts/STIXGeneralBol.otf
 %%DATADIR%%/fonts/STIXGeneralBolIta.otf
@@ -5679,6 +5385,10 @@ share/man/man1/xpdtest.1.gz
 %%DATADIR%%/fonts/impact.ttf
 %%DATADIR%%/fonts/monotype.ttf
 %%DATADIR%%/fonts/symbol.ttf
+%%DATADIR%%/fonts/texgyreheros-bold.otf
+%%DATADIR%%/fonts/texgyreheros-bolditalic.otf
+%%DATADIR%%/fonts/texgyreheros-italic.otf
+%%DATADIR%%/fonts/texgyreheros-regular.otf
 %%DATADIR%%/fonts/times.ttf
 %%DATADIR%%/fonts/timesbd.ttf
 %%DATADIR%%/fonts/timesbi.ttf
@@ -6138,1270 +5848,1282 @@ share/man/man1/xpdtest.1.gz
 %%DATADIR%%/icons/x_pic.xpm
 %%DATADIR%%/icons/y_pic.xpm
 %%DATADIR%%/icons/z_pic.xpm
-%%DATADIR%%/js/LICENSE
-%%DATADIR%%/js/build/jsroot.js
-%%DATADIR%%/js/changes.md
-%%DATADIR%%/js/files/canv_batch.htm
-%%DATADIR%%/js/files/draw.htm
-%%DATADIR%%/js/files/geom_batch.htm
-%%DATADIR%%/js/files/online.htm
-%%DATADIR%%/js/files/web.config
-%%DATADIR%%/js/files/wslist.htm
-%%DATADIR%%/js/img/RootIcon.ico
-%%DATADIR%%/js/index.htm
-%%DATADIR%%/js/modules/base/BasePainter.mjs
-%%DATADIR%%/js/modules/base/FontHandler.mjs
-%%DATADIR%%/js/modules/base/ObjectPainter.mjs
-%%DATADIR%%/js/modules/base/RObjectPainter.mjs
-%%DATADIR%%/js/modules/base/TAttFillHandler.mjs
-%%DATADIR%%/js/modules/base/TAttLineHandler.mjs
-%%DATADIR%%/js/modules/base/TAttMarkerHandler.mjs
-%%DATADIR%%/js/modules/base/TAttTextHandler.mjs
-%%DATADIR%%/js/modules/base/base3d.mjs
-%%DATADIR%%/js/modules/base/colors.mjs
-%%DATADIR%%/js/modules/base/latex.mjs
-%%DATADIR%%/js/modules/base/math.mjs
-%%DATADIR%%/js/modules/core.mjs
-%%DATADIR%%/js/modules/d3.mjs
-%%DATADIR%%/js/modules/draw.mjs
-%%DATADIR%%/js/modules/draw/TASImagePainter.mjs
-%%DATADIR%%/js/modules/draw/TArrowPainter.mjs
-%%DATADIR%%/js/modules/draw/TGaxisPainter.mjs
-%%DATADIR%%/js/modules/draw/TGraphPolarPainter.mjs
-%%DATADIR%%/js/modules/draw/TLinePainter.mjs
-%%DATADIR%%/js/modules/draw/TPolyMarker3D.mjs
-%%DATADIR%%/js/modules/draw/TRatioPlotPainter.mjs
-%%DATADIR%%/js/modules/draw/TSplinePainter.mjs
-%%DATADIR%%/js/modules/draw/TTree.mjs
-%%DATADIR%%/js/modules/draw/TWebPaintingPainter.mjs
-%%DATADIR%%/js/modules/draw/draw3d.mjs
-%%DATADIR%%/js/modules/draw/more.mjs
-%%DATADIR%%/js/modules/draw/v7more.mjs
-%%DATADIR%%/js/modules/geom/TGeoPainter.mjs
-%%DATADIR%%/js/modules/geom/bundle.mjs
-%%DATADIR%%/js/modules/geom/csg.mjs
-%%DATADIR%%/js/modules/geom/geobase.mjs
-%%DATADIR%%/js/modules/gpad/RAxisPainter.mjs
-%%DATADIR%%/js/modules/gpad/RCanvasPainter.mjs
-%%DATADIR%%/js/modules/gpad/RFramePainter.mjs
-%%DATADIR%%/js/modules/gpad/RPadPainter.mjs
-%%DATADIR%%/js/modules/gpad/TAxisPainter.mjs
-%%DATADIR%%/js/modules/gpad/TCanvasPainter.mjs
-%%DATADIR%%/js/modules/gpad/TFramePainter.mjs
-%%DATADIR%%/js/modules/gpad/TPadPainter.mjs
-%%DATADIR%%/js/modules/gui.mjs
-%%DATADIR%%/js/modules/gui/HierarchyPainter.mjs
-%%DATADIR%%/js/modules/gui/display.mjs
-%%DATADIR%%/js/modules/gui/lil-gui.mjs
-%%DATADIR%%/js/modules/gui/menu.mjs
-%%DATADIR%%/js/modules/gui/utils.mjs
-%%DATADIR%%/js/modules/hist/RH1Painter.mjs
-%%DATADIR%%/js/modules/hist/RH2Painter.mjs
-%%DATADIR%%/js/modules/hist/RH3Painter.mjs
-%%DATADIR%%/js/modules/hist/RPavePainter.mjs
-%%DATADIR%%/js/modules/hist/TEfficiencyPainter.mjs
-%%DATADIR%%/js/modules/hist/TF1Painter.mjs
-%%DATADIR%%/js/modules/hist/TF2Painter.mjs
-%%DATADIR%%/js/modules/hist/TGraph2DPainter.mjs
-%%DATADIR%%/js/modules/hist/TGraphPainter.mjs
-%%DATADIR%%/js/modules/hist/TGraphTimePainter.mjs
-%%DATADIR%%/js/modules/hist/TH1Painter.mjs
-%%DATADIR%%/js/modules/hist/TH2Painter.mjs
-%%DATADIR%%/js/modules/hist/TH3Painter.mjs
-%%DATADIR%%/js/modules/hist/THStackPainter.mjs
-%%DATADIR%%/js/modules/hist/TMultiGraphPainter.mjs
-%%DATADIR%%/js/modules/hist/TPavePainter.mjs
-%%DATADIR%%/js/modules/hist/bundle.mjs
-%%DATADIR%%/js/modules/hist/hist3d.mjs
-%%DATADIR%%/js/modules/hist2d/RH1Painter.mjs
-%%DATADIR%%/js/modules/hist2d/RH2Painter.mjs
-%%DATADIR%%/js/modules/hist2d/RHistPainter.mjs
-%%DATADIR%%/js/modules/hist2d/TGraphPainter.mjs
-%%DATADIR%%/js/modules/hist2d/TH1Painter.mjs
-%%DATADIR%%/js/modules/hist2d/TH2Painter.mjs
-%%DATADIR%%/js/modules/hist2d/THistPainter.mjs
-%%DATADIR%%/js/modules/hist2d/TMultiGraphPainter.mjs
-%%DATADIR%%/js/modules/hist2d/TScatterPainter.mjs
-%%DATADIR%%/js/modules/hist2d/bundle.mjs
-%%DATADIR%%/js/modules/io.mjs
-%%DATADIR%%/js/modules/main.mjs
-%%DATADIR%%/js/modules/three.mjs
-%%DATADIR%%/js/modules/tree.mjs
-%%DATADIR%%/js/modules/webwindow.mjs
-%%DATADIR%%/js/scripts/JSRoot.core.js
-%%DATADIR%%/js/scripts/geoworker.js
+%%HTTP%%%%DATADIR%%/js/LICENSE
+%%HTTP%%%%DATADIR%%/js/build/jsroot.js
+%%HTTP%%%%DATADIR%%/js/changes.md
+%%HTTP%%%%DATADIR%%/js/files/canv_batch.htm
+%%HTTP%%%%DATADIR%%/js/files/draw.htm
+%%HTTP%%%%DATADIR%%/js/files/geom_batch.htm
+%%HTTP%%%%DATADIR%%/js/files/online.htm
+%%HTTP%%%%DATADIR%%/js/files/web.config
+%%HTTP%%%%DATADIR%%/js/files/wslist.htm
+%%HTTP%%%%DATADIR%%/js/img/RootIcon.ico
+%%HTTP%%%%DATADIR%%/js/index.htm
+%%HTTP%%%%DATADIR%%/js/modules/base/BasePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/FontHandler.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/ObjectPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/RObjectPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/TAttFillHandler.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/TAttLineHandler.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/TAttMarkerHandler.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/TAttTextHandler.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/base3d.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/colors.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/func.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/latex.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/lzma.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/math.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/md5.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/sha256.mjs
+%%HTTP%%%%DATADIR%%/js/modules/base/zstd.mjs
+%%HTTP%%%%DATADIR%%/js/modules/core.mjs
+%%HTTP%%%%DATADIR%%/js/modules/d3.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TASImagePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TArrowPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TGaxisPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TGraphPolarPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TLinePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TPolyMarker3D.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TRatioPlotPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TSplinePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TTree.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/TWebPaintingPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/draw3d.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/more.mjs
+%%HTTP%%%%DATADIR%%/js/modules/draw/v7more.mjs
+%%HTTP%%%%DATADIR%%/js/modules/geom/TGeoPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/geom/bundle.mjs
+%%HTTP%%%%DATADIR%%/js/modules/geom/csg.mjs
+%%HTTP%%%%DATADIR%%/js/modules/geom/geobase.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/RAxisPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/RCanvasPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/RFramePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/RPadPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/TAxisPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/TCanvasPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/TFramePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gpad/TPadPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui/HierarchyPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui/display.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui/lil-gui.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui/menu.mjs
+%%HTTP%%%%DATADIR%%/js/modules/gui/utils.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/RH1Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/RH2Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/RH3Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/RPavePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TEfficiencyPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TF1Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TF2Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TF3Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TGraph2DPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TGraphPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TGraphTimePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TH1Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TH2Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TH3Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/THStackPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TMultiGraphPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/TPavePainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/bundle.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist/hist3d.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/RH1Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/RH2Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/RHistPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/TGraphPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/TH1Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/TH2Painter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/THistPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/TMultiGraphPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/TScatterPainter.mjs
+%%HTTP%%%%DATADIR%%/js/modules/hist2d/bundle.mjs
+%%HTTP%%%%DATADIR%%/js/modules/io.mjs
+%%HTTP%%%%DATADIR%%/js/modules/main.mjs
+%%HTTP%%%%DATADIR%%/js/modules/three.mjs
+%%HTTP%%%%DATADIR%%/js/modules/three_addons.mjs
+%%HTTP%%%%DATADIR%%/js/modules/tree.mjs
+%%HTTP%%%%DATADIR%%/js/modules/webwindow.mjs
+%%HTTP%%%%DATADIR%%/js/scripts/JSRoot.core.js
+%%HTTP%%%%DATADIR%%/js/scripts/geoworker.js
+%%HTTP%%%%DATADIR%%/js/scripts/jspdf.umd.min.js
+%%HTTP%%%%DATADIR%%/js/scripts/svg2pdf.umd.min.js
 %%DATADIR%%/macros/Dialogs.C
 %%DATADIR%%/macros/fileopen.C
-%%DATADIR%%/ui5/browser/Component.js
-%%DATADIR%%/ui5/browser/browser.html
-%%DATADIR%%/ui5/browser/controller/Browser.controller.js
-%%DATADIR%%/ui5/browser/controller/FileDialog.controller.js
-%%DATADIR%%/ui5/browser/logo.png
-%%DATADIR%%/ui5/browser/manifest.json
-%%DATADIR%%/ui5/browser/model/BrowserListBinding.js
-%%DATADIR%%/ui5/browser/model/BrowserModel.js
-%%DATADIR%%/ui5/browser/style.css
-%%DATADIR%%/ui5/browser/view/Browser.view.xml
-%%DATADIR%%/ui5/browser/view/FileDialog.view.xml
-%%DATADIR%%/ui5/browser/view/filedialog.fragment.xml
-%%DATADIR%%/ui5/browser/view/settingsmenu.fragment.xml
-%%DATADIR%%/ui5/browser/view/tabsmenu.fragment.xml
-%%DATADIR%%/ui5/canv/Component.js
-%%DATADIR%%/ui5/canv/canvas.html
-%%DATADIR%%/ui5/canv/canvas6.html
-%%DATADIR%%/ui5/canv/controller/Canvas.controller.js
-%%DATADIR%%/ui5/canv/controller/CanvasPanel.controller.js
-%%DATADIR%%/ui5/canv/controller/ColorButton.js
-%%DATADIR%%/ui5/canv/controller/Ged.controller.js
-%%DATADIR%%/ui5/canv/controller/Panel.controller.js
-%%DATADIR%%/ui5/canv/controller/SVGSample.js
-%%DATADIR%%/ui5/canv/ctrlbar.html
-%%DATADIR%%/ui5/canv/manifest.json
-%%DATADIR%%/ui5/canv/view/Axis.fragment.xml
-%%DATADIR%%/ui5/canv/view/Canvas.view.xml
-%%DATADIR%%/ui5/canv/view/CanvasPanel.view.xml
-%%DATADIR%%/ui5/canv/view/Ged.view.xml
-%%DATADIR%%/ui5/canv/view/Hist.fragment.xml
-%%DATADIR%%/ui5/canv/view/Inspector.fragment.xml
-%%DATADIR%%/ui5/canv/view/Panel.view.xml
-%%DATADIR%%/ui5/canv/view/RAxis.fragment.xml
-%%DATADIR%%/ui5/canv/view/TAttFill.fragment.xml
-%%DATADIR%%/ui5/canv/view/TAttLine.fragment.xml
-%%DATADIR%%/ui5/canv/view/TAttMarker.fragment.xml
-%%DATADIR%%/ui5/canv/view/TAttText.fragment.xml
-%%DATADIR%%/ui5/canv/view/TNamed.fragment.xml
-%%DATADIR%%/ui5/distribution/LICENSE.txt
-%%DATADIR%%/ui5/distribution/NOTICE.txt
-%%DATADIR%%/ui5/distribution/README.txt
-%%DATADIR%%/ui5/distribution/THIRDPARTY.txt
-%%DATADIR%%/ui5/distribution/resources/sap-ui-core.js
-%%DATADIR%%/ui5/distribution/resources/sap-ui-core.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/f/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/f/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/f/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/f/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/f/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/m/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/m/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/m/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/m/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-AddColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-AddPeople.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-BalloonSky.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-BeforeSearch.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-Connection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyPlanningCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ErrorScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-FilterTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-GroupTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NewMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoActivities.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoData.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoEntries.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoFilterResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoMail_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoNotifications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSavedItems_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSearchResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoTasks.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoTasks_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-PageNotFound.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ReloadScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ResizeColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SearchEarth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SearchFolder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleBalloon.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleCheckmark.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleConnection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleEmptyDoc.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleEmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleError.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleNoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleNotFoundMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleReload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleTask.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SleepingBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SortColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SuccessScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-Tent.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UnableToLoad.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UnableToUpload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UploadCollection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Patterns.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-AddColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-AddPeople.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-BalloonSky.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-BeforeSearch.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-Connection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyPlanningCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ErrorScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-FilterTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-GroupTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NewMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoActivities.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoData.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoEntries.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoFilterResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoMail_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoNotifications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSavedItems_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSearchResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoTasks.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoTasks_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-PageNotFound.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ReloadScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ResizeColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SearchEarth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SearchFolder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleBalloon.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleCheckmark.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleConnection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleEmptyDoc.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleEmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleError.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleNoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleNotFoundMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleReload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleTask.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SleepingBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SortColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SuccessScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-Tent.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UnableToLoad.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UnableToUpload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UploadCollection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-AddColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-AddPeople.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-BalloonSky.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-BeforeSearch.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-Connection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyPlanningCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ErrorScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-FilterTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-GroupTable.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NewMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoActivities.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoData.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoEntries.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoFilterResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoMail_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoNotifications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSavedItems_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSearchResults.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoTasks.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoTasks_v1.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-PageNotFound.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ReloadScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ResizeColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SearchEarth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SearchFolder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleBalloon.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleCalendar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleCheckmark.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleConnection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleEmptyDoc.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleEmptyList.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleError.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleMail.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleNoSavedItems.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleNotFoundMagnifier.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleReload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleTask.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SleepingBell.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SortColumn.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SuccessScreen.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-Tent.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UnableToLoad.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UnableToUpload.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UploadCollection.svg
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/fonts/SAP-icons-TNT.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/fonts/SAP-icons-TNT.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/metadata.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-CodePlaceholder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Company.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-ExternalLink.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-FaceID.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Fingerprint.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Lock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Mission.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoApplications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoFlows.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoUsers.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Radar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Services.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SessionExpired.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SessionExpiring.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Success.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Unlock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-UnsuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-CodePlaceholder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Company.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-ExternalLink.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-FaceID.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Fingerprint.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Lock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Mission.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoApplications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoFlows.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoUsers.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Radar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Services.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SessionExpired.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SessionExpiring.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Success.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Unlock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-UnsuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-CodePlaceholder.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Company.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-ExternalLink.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-FaceID.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Fingerprint.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Lock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Mission.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoApplications.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoFlows.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoUsers.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Radar.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Services.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SessionExpired.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SessionExpiring.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Success.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Unlock.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-UnsuccessfulAuth.svg
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/global.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ace.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ace.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ambiance-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ambiance-2.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/chrome-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/clouds-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/clouds_midnight-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/cobalt-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/crimson_editor-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dawn-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dracula-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dreamweaver-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/eclipse-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/github-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/gob-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/gruvbox-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/idle_fingers-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/iplastic-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/iplastic-2.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/kr_theme-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-10.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-11.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-12.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-13.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-14.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-15.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-16.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-2.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-3.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-4.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-5.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-6.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-7.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-8.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-9.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/merbivore-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/merbivore_soft-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/mono_industrial-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/monokai-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/one_dark-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/pastel_on_dark-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/solarized_dark-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/solarized_light-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/sqlserver-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/terminal-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/textmate-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/ambiance.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/chaos.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/chrome.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/clouds.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/clouds_midnight.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/cobalt.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/crimson_editor.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dawn.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dracula.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dreamweaver.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/eclipse.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/github.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/gob.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/gruvbox.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/idle_fingers.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/iplastic.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/katzenmilch.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/kr_theme.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/kuroir.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/merbivore.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/merbivore_soft.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/mono_industrial.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/monokai.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/nord_dark.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/one_dark.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/pastel_on_dark.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/solarized_dark.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/solarized_light.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/sqlserver.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/terminal.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/textmate.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_blue.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_bright.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_eighties.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/twilight.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/vibrant_ink.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/xcode.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_blue-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_bright-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_eighties-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/twilight-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/vibrant_ink-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/xcode-1.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ext-beautify.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ext-language_tools.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-c_cpp.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-css.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-fortran.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-html.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-javascript.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-json.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-latex.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-markdown.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-plain_text.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-python.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-sh.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-xml.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/c_cpp.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/css.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/fortran.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/html.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/javascript.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/json.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/latex.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/markdown.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/plain_text.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/python.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/sh.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/xml.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-eclipse.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-github.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-tomorrow.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-css.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-html.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-javascript.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-json.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-xml.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/ColorBar.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/GradientBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/TriStateCheckBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/accordion/collapsed.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/accordion/expanded.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/applicationheader/SAPLogo.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_first.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_last.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_next.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_previous.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/search/search.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/toolbar/overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/ColorBar.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/GradientBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/TriStateCheckBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/accordion/collapsed.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/accordion/expanded.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/applicationheader/SAPLogo.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/datepicker/icon_cal.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/datepicker/icon_cal_disabled.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_flat_0_aaaaaa_40x100.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_flat_75_ffffff_40x100.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_55_fbf9ee_1x400.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_65_ffffff_1x400.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_75_dadada_1x400.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_75_e6e6e6_1x400.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_95_fef1ec_1x400.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_highlight-soft_75_cccccc_1x100.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_222222_256x240.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_2e83ff_256x240.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_454545_256x240.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_888888_256x240.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_cd0a0a_256x240.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationLarge.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationMedium.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationSmall.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/collapsed.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/collapsedRTL.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/expanded.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/float_backgr.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconError.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconSuccess.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconWarning.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/re-dock.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/re-dockRTL.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Error.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Success.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Warning.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_multi.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/critical.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/error.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/information.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/question.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/success.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/warning.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_first.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_last.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_next.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_previous.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/panel/collapsed.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/panel/expanded.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_selected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_unselected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Error.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Warning.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/search/search.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/checkerboard.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/resize_horizontal.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/resize_vertical.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/splitter_horiz_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/splitter_vert_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/toolbar/overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/TriStateCheckBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/arrow_up.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/checkbox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/menu/bar-overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/paginator/paginator.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/tree/TreeNode_Coll.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/applicationheader/Header_bg.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/applicationheader/SAPLogo.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_down.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_down_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_left.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_left_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_right.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_right_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_up.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_up_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_accept_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_regular_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_reject_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/checkbox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close-act.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close-hov.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menu/bar-overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Disabled.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Error.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Success.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Warning.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_multi.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/error.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/information.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/question.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/warning.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/paginator/paginator.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Maximize.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Maximize_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Minimize.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Minimize_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/radiobutton.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_selected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_unselected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_unselected2.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/clear.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/clear_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_unclickable.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/splitter/splitter_horiz_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/splitter/splitter_vert_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tab-close-sel.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tab-close.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/CollapseAll.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/CollapseAll_pressed.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/ExpandAll.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/ExpandAll_pressed.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode-inverted.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode_Coll.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode_Exp.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/TriStateCheckBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/arrow_up.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/checkbox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/menu/bar-overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/information.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/question.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/paginator/paginator.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/tree/TreeNode_Coll-inverted.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/tree/TreeNode_Coll.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/applicationheader/Header_bg.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/applicationheader/SAPLogo.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_down.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_down_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_left.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_left_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_right.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_right_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_up.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_up_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_accept_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_regular_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_reject_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/checkbox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close-act.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close-hov.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menu/bar-overflow.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Disabled.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Regular.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Error.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Success.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Warning.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_multi.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/error.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/information.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/question.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/warning.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/paginator/paginator.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Maximize.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Maximize_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Minimize.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Minimize_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/radiobutton.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_selected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_unselected.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_unselected2.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start_dsbl.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start_hov.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/clear.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/clear_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_dsbl.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_hover.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_unclickable.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/splitter/splitter_horiz_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/splitter/splitter_vert_grip.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tab-close-sel.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tab-close.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/CollapseAll.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/CollapseAll_pressed.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/ExpandAll.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/ExpandAll_pressed.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode-inverted.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Coll-inverted.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Coll.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Exp-inverted.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Exp.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/cldr/en.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/base.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/fonts/SAP-icons.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/global.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img-RTL/Busy.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/1x1.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/Busy.gif
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Error.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Information.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Warning.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Error.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Information.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Success.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Warning.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/.theme
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/base.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Bold-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Bold.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Light-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Light.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Regular-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Regular.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Bold-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Bold.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Regular-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Regular.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/global.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/.theme
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/base.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Bold-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Bold.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Regular-full.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Regular.woff2
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/global.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/img/create.txt
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/thirdparty/jquery-compat.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/img/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img-RTL/create.txt
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/ColorBar.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/GradientBox.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/PickingCursor-Default.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Swatch_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Unified_Swatch_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/create.txt
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/ColorPicker/Swatch_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/ColorPicker/Alphaslider_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/ColorPicker/Swatch_BG.png
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/library-preload.js
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/library-preload.js.map
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/library.js
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/messagebundle.properties
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/messagebundle_en.properties
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/resources.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/.theming
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library-parameters.json
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.source.less
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library_skeleton-RTL.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library_skeleton.css
-%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/resources.json
-%%DATADIR%%/ui5/eve7/Component.js
-%%DATADIR%%/ui5/eve7/controller/ClientLog.controller.js
-%%DATADIR%%/ui5/eve7/controller/EveTable.controller.js
-%%DATADIR%%/ui5/eve7/controller/GL.controller.js
-%%DATADIR%%/ui5/eve7/controller/Ged.controller.js
-%%DATADIR%%/ui5/eve7/controller/Lego.controller.js
-%%DATADIR%%/ui5/eve7/controller/Main.controller.js
-%%DATADIR%%/ui5/eve7/controller/Summary.controller.js
-%%DATADIR%%/ui5/eve7/css/eve.css
-%%DATADIR%%/ui5/eve7/eve.mjs
-%%DATADIR%%/ui5/eve7/index.html
-%%DATADIR%%/ui5/eve7/lib/EveElements.js
-%%DATADIR%%/ui5/eve7/lib/EveElementsRCore.js
-%%DATADIR%%/ui5/eve7/lib/EveManager.js
-%%DATADIR%%/ui5/eve7/lib/EveScene.js
-%%DATADIR%%/ui5/eve7/lib/FXAAShader.js
-%%DATADIR%%/ui5/eve7/lib/GlViewer.js
-%%DATADIR%%/ui5/eve7/lib/GlViewerJSRoot.js
-%%DATADIR%%/ui5/eve7/lib/GlViewerRCore.js
-%%DATADIR%%/ui5/eve7/lib/GlViewerThree.js
-%%DATADIR%%/ui5/eve7/lib/OutlinePassEve.js
-%%DATADIR%%/ui5/eve7/lib/RenderCore.js
-%%DATADIR%%/ui5/eve7/manifest.json
-%%DATADIR%%/ui5/eve7/rcore/REveRenderCore-min.mjs
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_stripes_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_stripes_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zsprite_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zsprite_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_stripes.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_stripes.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/blending/additive.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/blending/additive.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copyDepthToRed.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copyDepthToRed.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copy_texture_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copy_texture_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/ToneMapping.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/ToneMapping.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/gaussBlur.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/gaussBlur.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/outline.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/outline.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/text/text2D.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/custom/text/text2D.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/phong/phong_template.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/phong/phong_template.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_POINTS.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_POINTS.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_TRIANGLES.frag
-%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_TRIANGLES.vert
-%%DATADIR%%/ui5/eve7/rcore/shaders/programs.json
-%%DATADIR%%/ui5/eve7/textures/dot-32a.png
-%%DATADIR%%/ui5/eve7/textures/font2.png
-%%DATADIR%%/ui5/eve7/textures/square-32a.png
-%%DATADIR%%/ui5/eve7/textures/star5-32a.png
-%%DATADIR%%/ui5/eve7/view/ClientLog.view.xml
-%%DATADIR%%/ui5/eve7/view/EveTable.view.xml
-%%DATADIR%%/ui5/eve7/view/GL.view.xml
-%%DATADIR%%/ui5/eve7/view/Ged.view.xml
-%%DATADIR%%/ui5/eve7/view/Lego.view.xml
-%%DATADIR%%/ui5/eve7/view/Main.view.xml
-%%DATADIR%%/ui5/eve7/view/MainMain.view.xml
-%%DATADIR%%/ui5/eve7/view/Summary.view.xml
-%%DATADIR%%/ui5/fitpanel/controller/ColorButton.js
-%%DATADIR%%/ui5/fitpanel/controller/FitPanel.controller.js
-%%DATADIR%%/ui5/fitpanel/style/style.css
-%%DATADIR%%/ui5/fitpanel/view/FitPanel.view.xml
-%%DATADIR%%/ui5/geom/controller/GeomHierarchy.controller.js
-%%DATADIR%%/ui5/geom/controller/GeomViewer.controller.js
-%%DATADIR%%/ui5/geom/index.html
-%%DATADIR%%/ui5/geom/lib/ColorBox.js
-%%DATADIR%%/ui5/geom/lib/GeomDrawing.js
-%%DATADIR%%/ui5/geom/model/GeomBrowserModel.js
-%%DATADIR%%/ui5/geom/view/GeomHierarchy.view.xml
-%%DATADIR%%/ui5/geom/view/GeomViewer.view.xml
-%%DATADIR%%/ui5/panel/Controller.js
-%%DATADIR%%/ui5/panel/panel.html
-%%DATADIR%%/ui5/tree/Component.js
-%%DATADIR%%/ui5/tree/controller/TreeViewer.controller.js
-%%DATADIR%%/ui5/tree/index.html
-%%DATADIR%%/ui5/tree/manifest.json
-%%DATADIR%%/ui5/tree/view/BranchHelpDialog.fragment.xml
-%%DATADIR%%/ui5/tree/view/TreeViewer.view.xml
+%%HTTP%%%%DATADIR%%/ui5/browser/Component.js
+%%HTTP%%%%DATADIR%%/ui5/browser/browser.html
+%%HTTP%%%%DATADIR%%/ui5/browser/controller/Browser.controller.js
+%%HTTP%%%%DATADIR%%/ui5/browser/controller/FileDialog.controller.js
+%%HTTP%%%%DATADIR%%/ui5/browser/logo.png
+%%HTTP%%%%DATADIR%%/ui5/browser/manifest.json
+%%HTTP%%%%DATADIR%%/ui5/browser/model/BrowserListBinding.js
+%%HTTP%%%%DATADIR%%/ui5/browser/model/BrowserModel.js
+%%HTTP%%%%DATADIR%%/ui5/browser/style.css
+%%HTTP%%%%DATADIR%%/ui5/browser/view/Browser.view.xml
+%%HTTP%%%%DATADIR%%/ui5/browser/view/FileDialog.view.xml
+%%HTTP%%%%DATADIR%%/ui5/browser/view/filedialog.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/browser/view/settingsmenu.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/browser/view/tabsmenu.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/Component.js
+%%HTTP%%%%DATADIR%%/ui5/canv/canvas.html
+%%HTTP%%%%DATADIR%%/ui5/canv/canvas6.html
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/Canvas.controller.js
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/CanvasPanel.controller.js
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/ColorButton.js
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/Ged.controller.js
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/Panel.controller.js
+%%HTTP%%%%DATADIR%%/ui5/canv/controller/SVGSample.js
+%%HTTP%%%%DATADIR%%/ui5/canv/ctrlbar.html
+%%HTTP%%%%DATADIR%%/ui5/canv/manifest.json
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Axis.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Canvas.view.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/CanvasPanel.view.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Ged.view.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Hist.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Inspector.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/Panel.view.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/RAxis.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/TAttFill.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/TAttLine.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/TAttMarker.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/TAttText.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/canv/view/TNamed.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/distribution/LICENSE.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/NOTICE.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/README.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/THIRDPARTY.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap-ui-core.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap-ui-core.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/f/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-AddColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-AddPeople.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-BalloonSky.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-BeforeSearch.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-Connection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-EmptyPlanningCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ErrorScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-FilterTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-GroupTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NewMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoActivities.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoData.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoEntries.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoFilterResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoMail_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoNotifications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSavedItems_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoSearchResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoTasks.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-NoTasks_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-PageNotFound.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ReloadScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-ResizeColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SearchEarth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SearchFolder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleBalloon.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleCheckmark.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleConnection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleEmptyDoc.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleEmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleError.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleNoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleNotFoundMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleReload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SimpleTask.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SleepingBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SortColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-SuccessScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-Tent.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UnableToLoad.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UnableToUpload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Dialog-UploadCollection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Patterns.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-AddColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-AddPeople.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-BalloonSky.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-BeforeSearch.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-Connection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-EmptyPlanningCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ErrorScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-FilterTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-GroupTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NewMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoActivities.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoData.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoEntries.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoFilterResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoMail_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoNotifications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSavedItems_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoSearchResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoTasks.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-NoTasks_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-PageNotFound.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ReloadScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-ResizeColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SearchEarth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SearchFolder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleBalloon.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleCheckmark.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleConnection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleEmptyDoc.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleEmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleError.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleNoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleNotFoundMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleReload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SimpleTask.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SleepingBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SortColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-SuccessScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-Tent.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UnableToLoad.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UnableToUpload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Scene-UploadCollection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-AddColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-AddPeople.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-BalloonSky.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-BeforeSearch.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-Connection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-EmptyPlanningCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ErrorScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-FilterTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-GroupTable.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NewMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoActivities.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoData.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoEntries.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoFilterResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoMail_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoNotifications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSavedItems_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoSearchResults.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoTasks.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-NoTasks_v1.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-PageNotFound.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ReloadScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-ResizeColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SearchEarth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SearchFolder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleBalloon.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleCalendar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleCheckmark.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleConnection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleEmptyDoc.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleEmptyList.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleError.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleMail.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleNoSavedItems.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleNotFoundMagnifier.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleReload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SimpleTask.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SleepingBell.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SortColumn.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-SuccessScreen.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-Tent.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UnableToLoad.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UnableToUpload.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/illustrations/sapIllus-Spot-UploadCollection.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/m/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/fonts/SAP-icons-TNT.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/fonts/SAP-icons-TNT.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/metadata.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-CodePlaceholder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Company.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-ExternalLink.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-FaceID.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Fingerprint.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Lock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Mission.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoApplications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoFlows.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-NoUsers.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Radar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Services.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SessionExpired.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SessionExpiring.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Success.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-SuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-Unlock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Dialog-UnsuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-CodePlaceholder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Company.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-ExternalLink.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-FaceID.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Fingerprint.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Lock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Mission.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoApplications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoFlows.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-NoUsers.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Radar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Services.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SessionExpired.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SessionExpiring.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Success.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-SuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-Unlock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Scene-UnsuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-CodePlaceholder.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Company.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-ExternalLink.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-FaceID.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Fingerprint.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Lock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Mission.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoApplications.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoFlows.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-NoUsers.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Radar.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Services.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SessionExpired.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SessionExpiring.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Success.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-SuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-Unlock.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/illustrations/tnt-Spot-UnsuccessfulAuth.svg
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/global.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/tnt/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ace.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ace.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ambiance-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/ambiance-2.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/chrome-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/clouds-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/clouds_midnight-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/cobalt-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/crimson_editor-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dawn-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dracula-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/dreamweaver-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/eclipse-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/github-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/gob-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/gruvbox-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/idle_fingers-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/iplastic-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/iplastic-2.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/kr_theme-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-10.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-11.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-12.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-13.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-14.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-15.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-16.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-2.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-3.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-4.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-5.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-6.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-7.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-8.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/main-9.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/merbivore-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/merbivore_soft-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/mono_industrial-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/monokai-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/one_dark-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/pastel_on_dark-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/solarized_dark-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/solarized_light-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/sqlserver-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/terminal-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/textmate-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/ambiance.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/chaos.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/chrome.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/clouds.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/clouds_midnight.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/cobalt.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/crimson_editor.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dawn.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dracula.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/dreamweaver.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/eclipse.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/github.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/gob.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/gruvbox.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/idle_fingers.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/iplastic.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/katzenmilch.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/kr_theme.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/kuroir.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/merbivore.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/merbivore_soft.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/mono_industrial.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/monokai.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/nord_dark.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/one_dark.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/pastel_on_dark.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/solarized_dark.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/solarized_light.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/sqlserver.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/terminal.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/textmate.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_blue.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_bright.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/tomorrow_night_eighties.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/twilight.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/vibrant_ink.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/theme/xcode.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_blue-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_bright-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/tomorrow_night_eighties-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/twilight-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/vibrant_ink-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/css/xcode-1.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ext-beautify.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/ext-language_tools.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-c_cpp.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-css.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-fortran.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-html.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-javascript.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-json.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-latex.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-markdown.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-plain_text.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-python.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-sh.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/mode-xml.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/c_cpp.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/css.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/fortran.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/html.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/javascript.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/json.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/latex.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/markdown.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/plain_text.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/python.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/sh.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/snippets/xml.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-eclipse.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-github.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/theme-tomorrow.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-css.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-html.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-javascript.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-json.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/js/ace/worker-xml.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/codeeditor/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/ColorBar.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/ColorPicker/GradientBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/TriStateCheckBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/accordion/collapsed.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/accordion/expanded.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/applicationheader/SAPLogo.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_first.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_last.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_next.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/paginator/arrow_previous.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/search/search.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img-RTL/toolbar/overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/ColorBar.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/ColorPicker/GradientBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/TriStateCheckBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/accordion/collapsed.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/accordion/expanded.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/applicationheader/SAPLogo.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/datepicker/icon_cal.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/datepicker/icon_cal_disabled.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_flat_0_aaaaaa_40x100.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_flat_75_ffffff_40x100.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_55_fbf9ee_1x400.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_65_ffffff_1x400.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_75_dadada_1x400.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_75_e6e6e6_1x400.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_glass_95_fef1ec_1x400.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_222222_256x240.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_2e83ff_256x240.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_454545_256x240.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_888888_256x240.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/jQuery/ui-icons_cd0a0a_256x240.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationLarge.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationMedium.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/layout/separationSmall.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/collapsed.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/collapsedRTL.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/expanded.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/float_backgr.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconError.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconSuccess.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/iconWarning.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/re-dock.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/re-dockRTL.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Error.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Success.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_Warning.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebar/toastarrow_multi.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/critical.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/error.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/information.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/question.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/success.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/messagebox/warning.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_first.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_last.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_next.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/paginator/arrow_previous.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/panel/collapsed.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/panel/expanded.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_selected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/rating/star_unselected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Error.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/richtooltip/ValueState_Warning.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/search/search.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/checkerboard.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/resize_horizontal.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/resize_vertical.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/splitter_horiz_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/splitter/splitter_vert_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/img/toolbar/overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/TriStateCheckBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/arrow_up.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/checkbox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/menu/bar-overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/paginator/paginator.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/tree/TreeNode_Coll.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/applicationheader/Header_bg.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/applicationheader/SAPLogo.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_down.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_down_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_left.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_left_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_right.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_right_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_up.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/arrow_up_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_accept_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_regular_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/button/EmphButton_reject_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/checkbox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/combobox/ComboBoxArrow_regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/datepicker/Calendar_regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close-act.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close-hov.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/dlg-close.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menu/bar-overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Disabled.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/menubutton/Menu_Regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Error.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Success.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_Warning.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebar/toastarrow_multi.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/error.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/information.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/question.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/messagebox/32x32/warning.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/paginator/paginator.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Maximize.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Maximize_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Minimize.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/panel_container/Minimize_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/radiobutton.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_selected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_unselected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/rating/star_unselected2.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_end_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/roadmap/roundtrip_start_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/clear.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/clear_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/search/search_unclickable.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/splitter/splitter_horiz_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/splitter/splitter_vert_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tab-close-sel.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tab-close.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/CollapseAll.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/CollapseAll_pressed.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/ExpandAll.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/ExpandAll_pressed.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode-inverted.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode_Coll.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img/tree/TreeNode_Exp.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/TriStateCheckBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/arrow_up.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/checkbox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/menu/bar-overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/information.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/question.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/messagebox/32x32/success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/paginator/paginator.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/tree/TreeNode_Coll-inverted.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/tree/TreeNode_Coll.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/applicationheader/Header_bg.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/applicationheader/SAPLogo.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_down.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_down_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_left.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_left_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_right.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_right_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_up.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/arrow_up_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_accept_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_regular_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/button/EmphButton_reject_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/checkbox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/combobox/ComboBoxArrow_regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/datepicker/Calendar_regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close-act.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close-hov.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/dlg-close.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menu/bar-overflow.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Disabled.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/menubutton/Menu_Regular.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Error.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Success.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_Warning.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebar/toastarrow_multi.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/error.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/information.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/question.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/messagebox/32x32/warning.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/paginator/paginator.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Maximize.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Maximize_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Minimize.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/panel_container/Minimize_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/radiobutton.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_selected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_unselected.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/rating/star_unselected2.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_end_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start_dsbl.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/roadmap/roundtrip_start_hov.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/clear.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/clear_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_dsbl.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_hover.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/search/search_unclickable.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/splitter/splitter_horiz_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/splitter/splitter_vert_grip.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tab-close-sel.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tab-close.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/CollapseAll.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/CollapseAll_pressed.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/ExpandAll.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/ExpandAll_pressed.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode-inverted.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Coll-inverted.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Coll.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Exp-inverted.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img/tree/TreeNode_Exp.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/cldr/en.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/base.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/fonts/SAP-icons.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/global.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img-RTL/Busy.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/1x1.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/Busy.gif
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Error.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Information.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/16x16/Message_Icon_Warning.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Error.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Information.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Success.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/img/message/32x32/Message_Icon_Warning.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/.theme
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/base.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Bold-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Bold.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Light-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Light.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Regular-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72-Regular.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Bold-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Bold.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Regular-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/fonts/72Mono-Regular.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/global.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/.theme
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/base.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Bold.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Light.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72-Regular.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Bold-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Bold.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Regular-full.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/fonts/72Mono-Regular.woff2
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/global.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/core/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/img/create.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/layout/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/table/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/thirdparty/jquery-compat.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/img/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img-RTL/create.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/ColorBar.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/GradientBox.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/PickingCursor-Default.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Swatch_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/ColorPicker/Unified_Swatch_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/img/create.txt
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/ColorPicker/Swatch_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/ColorPicker/Alphaslider_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/ColorPicker/Swatch_BG.png
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/ui/unified/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/library-preload.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/library-preload.js.map
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/library.js
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/messagebundle.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/messagebundle_en.properties
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/base/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_belize/resources.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/.theming
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/css_variables.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library-parameters.json
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library.source.less
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library_skeleton-RTL.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/library_skeleton.css
+%%HTTP%%%%DATADIR%%/ui5/distribution/resources/sap/uxap/themes/sap_fiori_3/resources.json
+%%HTTP%%%%DATADIR%%/ui5/eve7/Component.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/ClientLog.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/EveTable.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/GL.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/Ged.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/Lego.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/Main.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/controller/Summary.controller.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/css/eve.css
+%%HTTP%%%%DATADIR%%/ui5/eve7/eve.mjs
+%%HTTP%%%%DATADIR%%/ui5/eve7/index.html
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/EveElements.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/EveElementsRCore.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/EveManager.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/EveScene.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/FXAAShader.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/GlViewer.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/GlViewerJSRoot.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/GlViewerRCore.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/GlViewerThree.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/OutlinePassEve.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/lib/RenderCore.js
+%%HTTP%%%%DATADIR%%/ui5/eve7/manifest.json
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/LICENSE
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/REveRenderCore-min.mjs
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_stripes_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_stripes_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zshape_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zshape_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zsprite_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/basic/basic_zsprite_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_stripes.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_stripes.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/GBuffer/GBufferMini_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/blending/additive.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/blending/additive.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copyDepthToRed.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copyDepthToRed.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copy_texture_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/drawToTexture/copy_texture_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/ToneMapping.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/ToneMapping.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/gaussBlur.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/gaussBlur.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/outline.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/post_process/outline.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/text/text2D.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/custom/text/text2D.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/phong/phong_template.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/phong/phong_template.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_POINTS.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_POINTS.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_TRIANGLES.frag
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/picker/picker_TRIANGLES.vert
+%%HTTP%%%%DATADIR%%/ui5/eve7/rcore/shaders/programs.json
+%%HTTP%%%%DATADIR%%/ui5/eve7/textures/dot-32a.png
+%%HTTP%%%%DATADIR%%/ui5/eve7/textures/font2.png
+%%HTTP%%%%DATADIR%%/ui5/eve7/textures/square-32a.png
+%%HTTP%%%%DATADIR%%/ui5/eve7/textures/star5-32a.png
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/ClientLog.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/EveTable.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/GL.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/Ged.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/Lego.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/Main.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/MainMain.view.xml
+%%HTTP%%%%DATADIR%%/ui5/eve7/view/Summary.view.xml
+%%HTTP%%%%DATADIR%%/ui5/fitpanel/controller/ColorButton.js
+%%HTTP%%%%DATADIR%%/ui5/fitpanel/controller/FitPanel.controller.js
+%%HTTP%%%%DATADIR%%/ui5/fitpanel/style/style.css
+%%HTTP%%%%DATADIR%%/ui5/fitpanel/view/FitPanel.view.xml
+%%HTTP%%%%DATADIR%%/ui5/geom/controller/GeomHierarchy.controller.js
+%%HTTP%%%%DATADIR%%/ui5/geom/controller/GeomViewer.controller.js
+%%HTTP%%%%DATADIR%%/ui5/geom/index.html
+%%HTTP%%%%DATADIR%%/ui5/geom/lib/ColorBox.js
+%%HTTP%%%%DATADIR%%/ui5/geom/lib/GeomDrawing.js
+%%HTTP%%%%DATADIR%%/ui5/geom/model/GeomBrowserModel.js
+%%HTTP%%%%DATADIR%%/ui5/geom/view/GeomHierarchy.view.xml
+%%HTTP%%%%DATADIR%%/ui5/geom/view/GeomViewer.view.xml
+%%HTTP%%%%DATADIR%%/ui5/panel/Controller.js
+%%HTTP%%%%DATADIR%%/ui5/panel/panel.html
+%%HTTP%%%%DATADIR%%/ui5/tree/Component.js
+%%HTTP%%%%DATADIR%%/ui5/tree/controller/TreeViewer.controller.js
+%%HTTP%%%%DATADIR%%/ui5/tree/index.html
+%%HTTP%%%%DATADIR%%/ui5/tree/manifest.json
+%%HTTP%%%%DATADIR%%/ui5/tree/view/BranchHelpDialog.fragment.xml
+%%HTTP%%%%DATADIR%%/ui5/tree/view/TreeViewer.view.xml
diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile
index ee83f3ee0582..ab961ff6d4a2 100644
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ruby-build
-PORTVERSION=	20240501
+PORTVERSION=	20240702
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby
 
diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo
index 4c560fc1e3a9..d1d6750f9f4b 100644
--- a/devel/ruby-build/distinfo
+++ b/devel/ruby-build/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714659892
-SHA256 (rbenv-ruby-build-v20240501_GH0.tar.gz) = 03601991e0e99ae5e75b1047e77498e329c3f8253cd3de5adabab56c05886079
-SIZE (rbenv-ruby-build-v20240501_GH0.tar.gz) = 89667
+TIMESTAMP = 1719933055
+SHA256 (rbenv-ruby-build-v20240702_GH0.tar.gz) = 21b34a653ddbe29a4a5f3e9f71d3a634816295a549569899c6d1148a821b2273
+SIZE (rbenv-ruby-build-v20240702_GH0.tar.gz) = 89950
diff --git a/devel/rubygem-actionview61/Makefile b/devel/rubygem-actionview61/Makefile
index 94ffa0e44cfd..68388e91db27 100644
--- a/devel/rubygem-actionview61/Makefile
+++ b/devel/rubygem-actionview61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionview
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/devel/rubygem-actionview61/distinfo b/devel/rubygem-actionview61/distinfo
index 2a1c78033d74..16a06369a641 100644
--- a/devel/rubygem-actionview61/distinfo
+++ b/devel/rubygem-actionview61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709390998
-SHA256 (rubygem/actionview-6.1.7.7.gem) = 93af42d85af51ace6f6c1df908f0c3f92e36cf7076befbf65ba8b79484c36dc2
-SIZE (rubygem/actionview-6.1.7.7.gem) = 172544
+TIMESTAMP = 1717568524
+SHA256 (rubygem/actionview-6.1.7.8.gem) = e09d8b9d46ff63b67b7cba7c149c0c7446ef3f36041a46c0a43def9cd5e1b199
+SIZE (rubygem/actionview-6.1.7.8.gem) = 172544
diff --git a/devel/rubygem-actionview70/Makefile b/devel/rubygem-actionview70/Makefile
index e5b7dbb4778e..b98b7ec01967 100644
--- a/devel/rubygem-actionview70/Makefile
+++ b/devel/rubygem-actionview70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionview
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/devel/rubygem-actionview70/distinfo b/devel/rubygem-actionview70/distinfo
index d1ce738f5edd..94e86863a468 100644
--- a/devel/rubygem-actionview70/distinfo
+++ b/devel/rubygem-actionview70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391024
-SHA256 (rubygem/actionview-7.0.8.1.gem) = 4a01b36c605dc89a5e1dd3866e6db05132387827411fb7fb62cdb9e1ca79f7f9
-SIZE (rubygem/actionview-7.0.8.1.gem) = 180224
+TIMESTAMP = 1717568550
+SHA256 (rubygem/actionview-7.0.8.4.gem) = 45c1d33730073bb6f34b10abd81c5967ac0faff28cd4097103470022a1f52e0f
+SIZE (rubygem/actionview-7.0.8.4.gem) = 180224
diff --git a/devel/rubygem-actionview71/Makefile b/devel/rubygem-actionview71/Makefile
index 839af4d17ee7..4882cdcf77c9 100644
--- a/devel/rubygem-actionview71/Makefile
+++ b/devel/rubygem-actionview71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionview
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/devel/rubygem-actionview71/distinfo b/devel/rubygem-actionview71/distinfo
index 2d1fcff92d5e..1efae064df27 100644
--- a/devel/rubygem-actionview71/distinfo
+++ b/devel/rubygem-actionview71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391050
-SHA256 (rubygem/actionview-7.1.3.2.gem) = 369b1a33764017d017623622a33b6be007c7c0de3d1a4f1e9676466e3b5909cf
-SIZE (rubygem/actionview-7.1.3.2.gem) = 188416
+TIMESTAMP = 1717568576
+SHA256 (rubygem/actionview-7.1.3.4.gem) = 41fcf5242dec11e100a0ba3d3717612c6534e8571c8a290a5b2a950aa58b615b
+SIZE (rubygem/actionview-7.1.3.4.gem) = 194048
diff --git a/devel/rubygem-activejob61/Makefile b/devel/rubygem-activejob61/Makefile
index 4c085ef48c28..170376079761 100644
--- a/devel/rubygem-activejob61/Makefile
+++ b/devel/rubygem-activejob61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activejob
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/devel/rubygem-activejob61/distinfo b/devel/rubygem-activejob61/distinfo
index 9614c646d09c..b37571b8e132 100644
--- a/devel/rubygem-activejob61/distinfo
+++ b/devel/rubygem-activejob61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391000
-SHA256 (rubygem/activejob-6.1.7.7.gem) = 752d89c85d09421c5b8d5298c6a39667843701f488c5bc4b61990ba1e73c371b
-SIZE (rubygem/activejob-6.1.7.7.gem) = 32768
+TIMESTAMP = 1717568526
+SHA256 (rubygem/activejob-6.1.7.8.gem) = e1e876662f41988a8068afaccd48b4341ca32ec5f8242fb5d914fbb59f1e291b
+SIZE (rubygem/activejob-6.1.7.8.gem) = 32768
diff --git a/devel/rubygem-activejob70/Makefile b/devel/rubygem-activejob70/Makefile
index 1096424643ba..4945345c7f0d 100644
--- a/devel/rubygem-activejob70/Makefile
+++ b/devel/rubygem-activejob70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activejob
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/devel/rubygem-activejob70/distinfo b/devel/rubygem-activejob70/distinfo
index ffb8883c3247..fcf86a1b3ec5 100644
--- a/devel/rubygem-activejob70/distinfo
+++ b/devel/rubygem-activejob70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391026
-SHA256 (rubygem/activejob-7.0.8.1.gem) = 8f4ee9288480b9fddc5aece947bcd846546d14d96c38faedc3ab87c6c84e147b
-SIZE (rubygem/activejob-7.0.8.1.gem) = 33792
+TIMESTAMP = 1717568552
+SHA256 (rubygem/activejob-7.0.8.4.gem) = 21eb13e3279eb6dcf8c9bfe90c0f78879f04ffd55c62302c47b73ccd5b6ca4ac
+SIZE (rubygem/activejob-7.0.8.4.gem) = 33792
diff --git a/devel/rubygem-activejob71/Makefile b/devel/rubygem-activejob71/Makefile
index c73f2c9278d6..c6e11aa577fa 100644
--- a/devel/rubygem-activejob71/Makefile
+++ b/devel/rubygem-activejob71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activejob
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/devel/rubygem-activejob71/distinfo b/devel/rubygem-activejob71/distinfo
index ceb3517b972b..47db61402a43 100644
--- a/devel/rubygem-activejob71/distinfo
+++ b/devel/rubygem-activejob71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391052
-SHA256 (rubygem/activejob-7.1.3.2.gem) = d2a90501e8b8697eac541c1cf9aa23ac330d40dc4f5b7fb87cdf17d336f7f221
-SIZE (rubygem/activejob-7.1.3.2.gem) = 37376
+TIMESTAMP = 1717568578
+SHA256 (rubygem/activejob-7.1.3.4.gem) = 3f8aeef0fdfb2dd65f9a663828dbcc8ca187e70ef0c5a773c5fe4dd67e040f62
+SIZE (rubygem/activejob-7.1.3.4.gem) = 37376
diff --git a/devel/rubygem-activesupport61/Makefile b/devel/rubygem-activesupport61/Makefile
index a2a0d276c1d3..f494e6b800d1 100644
--- a/devel/rubygem-activesupport61/Makefile
+++ b/devel/rubygem-activesupport61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activesupport
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/devel/rubygem-activesupport61/distinfo b/devel/rubygem-activesupport61/distinfo
index e27240895383..df4a53ee32ca 100644
--- a/devel/rubygem-activesupport61/distinfo
+++ b/devel/rubygem-activesupport61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391002
-SHA256 (rubygem/activesupport-6.1.7.7.gem) = f7b9861d6e7fc5e97311688f82bd650bb8f382a67e1ee6906f61817ac14a5164
-SIZE (rubygem/activesupport-6.1.7.7.gem) = 220672
+TIMESTAMP = 1717568528
+SHA256 (rubygem/activesupport-6.1.7.8.gem) = 3e9353d87b521224fa3f71593de351a54b56b5065e838a91419e98e3b6577926
+SIZE (rubygem/activesupport-6.1.7.8.gem) = 220672
diff --git a/devel/rubygem-activesupport70/Makefile b/devel/rubygem-activesupport70/Makefile
index 973d863c2749..5447fd3800ed 100644
--- a/devel/rubygem-activesupport70/Makefile
+++ b/devel/rubygem-activesupport70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activesupport
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/devel/rubygem-activesupport70/distinfo b/devel/rubygem-activesupport70/distinfo
index 4a640430e4ec..ea534cbc9e85 100644
--- a/devel/rubygem-activesupport70/distinfo
+++ b/devel/rubygem-activesupport70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391028
-SHA256 (rubygem/activesupport-7.0.8.1.gem) = b0aff5023a6f84e2fefadee80c0e1c0156ee3eea318c402bfcd40140f0e9c339
-SIZE (rubygem/activesupport-7.0.8.1.gem) = 226816
+TIMESTAMP = 1717568554
+SHA256 (rubygem/activesupport-7.0.8.4.gem) = 69047070402b20fbaeebbeb56d21238db457c54c7e66f356dcba683e500ae197
+SIZE (rubygem/activesupport-7.0.8.4.gem) = 226816
diff --git a/devel/rubygem-activesupport71/Makefile b/devel/rubygem-activesupport71/Makefile
index 4adce3c23ff0..0e26dcee2073 100644
--- a/devel/rubygem-activesupport71/Makefile
+++ b/devel/rubygem-activesupport71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activesupport
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/devel/rubygem-activesupport71/distinfo b/devel/rubygem-activesupport71/distinfo
index 99789ff9f024..18b69849348a 100644
--- a/devel/rubygem-activesupport71/distinfo
+++ b/devel/rubygem-activesupport71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391054
-SHA256 (rubygem/activesupport-7.1.3.2.gem) = ad8445b7ae4a6d3acc5f88c8c5f437eb0b54062032aaf44856c7b6d3855b8b2e
-SIZE (rubygem/activesupport-7.1.3.2.gem) = 257536
+TIMESTAMP = 1717568580
+SHA256 (rubygem/activesupport-7.1.3.4.gem) = 455bbc43d82e5ba20daa25f0888b80c9f7e2d80ca0cc96cea3e6acfec3e40309
+SIZE (rubygem/activesupport-7.1.3.4.gem) = 257536
diff --git a/devel/scc/Makefile b/devel/scc/Makefile
index d47f912d206e..d94065f86b01 100644
--- a/devel/scc/Makefile
+++ b/devel/scc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	scc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
diff --git a/devel/shfmt/Makefile b/devel/shfmt/Makefile
index b2ffe11c4238..b584e9aa42e3 100644
--- a/devel/shfmt/Makefile
+++ b/devel/shfmt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	shfmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	adamw@FreeBSD.org
diff --git a/devel/shiboken2/distinfo b/devel/shiboken2/distinfo
index 68e263563016..0ca94a433119 100644
--- a/devel/shiboken2/distinfo
+++ b/devel/shiboken2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711882465
-SHA256 (pyside-setup-opensource-src-5.15.13.tar.xz) = 7a57797b20268d6ebcb39deba48c754a69abf9221aee03e1f3dca6f6565b7da9
-SIZE (pyside-setup-opensource-src-5.15.13.tar.xz) = 3585684
+TIMESTAMP = 1716932537
+SHA256 (pyside-setup-opensource-src-5.15.14.tar.xz) = 32651194f6a6b7bce42f04e68b1401ad2087e4789a4c8f3fb8649e86189c6372
+SIZE (pyside-setup-opensource-src-5.15.14.tar.xz) = 3586520
diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile
index 2e6cad8d62d9..cc180355b098 100644
--- a/devel/shiboken6/Makefile
+++ b/devel/shiboken6/Makefile
@@ -14,25 +14,25 @@ LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
-USES=		cmake compiler:c++17-lang gnome llvm:lib pathfix python qt:6 \
-		tar:xz
+USES=		cmake compiler:c++17-lang gnome llvm:lib,noexport pathfix \
+		python qt:6 tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		base
 
+CONFIGURE_ENV=	LLVM_INSTALL_DIR="${LLVM_PREFIX}/lib/cmake/llvm"
 CMAKE_ARGS=	-DClang_DIR:PATH="${LLVM_PREFIX}/lib/cmake/clang" \
 		-DLLVM_DIR:PATH="${LLVM_PREFIX}/lib/cmake/llvm" \
-		-DCMAKE_CXX_FLAGS=-lexecinfo \
-		-DCMAKE_STANDARD_LIBRARIES=-lexecinfo \
 		-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo \
 		-DUSE_PYTHON_VERSION=${PYTHON_VER} \
 		-DBUILD_TESTS:BOOL=false
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/shiboken6
+WRKSRC_SUBDIR=	sources/shiboken6
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DOCS NUMPY
+OPTIONS_DEFAULT=	NUMPY
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
@@ -42,6 +42,10 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR}
 DOCS_ALL_TARGET=	all doc
 DOCS_PORTDOCS=		*
 
+NUMPY_BUILD_DEPENDS=	${PYNUMPY}
+NUMPY_RUN_DEPENDS=	${PYNUMPY}
+NUMPY_CMAKE_ON=		-DNUMPY_INCLUDE_DIR:PATH="${PYTHON_SITELIBDIR}/numpy/core/include"
+
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
diff --git a/devel/shiboken6/distinfo b/devel/shiboken6/distinfo
index 1e9558b3237e..7f37a195ca1f 100644
--- a/devel/shiboken6/distinfo
+++ b/devel/shiboken6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708228666
-SHA256 (pyside-setup-everywhere-src-6.6.2.tar.xz) = 14620b694d7af4c978443016292d3d2108ba5dc105f4170e3b71eadcaf04c9f0
-SIZE (pyside-setup-everywhere-src-6.6.2.tar.xz) = 13975896
+TIMESTAMP = 1718779285
+SHA256 (pyside-setup-everywhere-src-6.7.2.tar.xz) = 3a2b0d0d6e78c9aa5ddc7f06ca4b6f11a3fe14560baeb148eea53b5d98e368c7
+SIZE (pyside-setup-everywhere-src-6.7.2.tar.xz) = 14402156
diff --git a/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake
index 4f4be866326a..1bf82a17406c 100644
--- a/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake
+++ b/devel/shiboken6/files/patch-cmake_ShibokenHelpers.cmake
@@ -1,8 +1,8 @@
 We don't need bash for a simple export command.
 
---- cmake/ShibokenHelpers.cmake.orig	2023-10-14 09:37:51 UTC
+--- cmake/ShibokenHelpers.cmake.orig	2024-04-05 12:14:13 UTC
 +++ cmake/ShibokenHelpers.cmake
-@@ -772,7 +772,7 @@ $@")
+@@ -769,7 +769,7 @@ $@")
  $@")
      else()
          string(REPLACE ";" ":" path_dirs_native "${path_dirs_native}")
diff --git a/devel/shiboken6/files/patch-data_shiboken6.pc.in b/devel/shiboken6/files/patch-data_shiboken6.pc.in
index 2830d8e58633..6079806aa457 100644
--- a/devel/shiboken6/files/patch-data_shiboken6.pc.in
+++ b/devel/shiboken6/files/patch-data_shiboken6.pc.in
@@ -1,4 +1,4 @@
---- data/shiboken6.pc.in.orig	2023-10-14 09:37:51 UTC
+--- data/shiboken6.pc.in.orig	2024-04-05 12:14:13 UTC
 +++ data/shiboken6.pc.in
 @@ -8,5 +8,5 @@ Version: @shiboken6_VERSION@
  Name: shiboken6
@@ -6,4 +6,4 @@
  Version: @shiboken6_VERSION@
 -Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken6@shiboken6_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
 +Libs: @SHIBOKEN_PYTHON_LIBRARIES@ -L${libdir} -lshiboken6@shiboken6_SUFFIX@@PYTHON_SHARED_LIBRARY_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ -lexecinfo
- Cflags: -I@PYTHON_INCLUDE_DIRS@ -I${includedir}/@shiboken6_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
+ Cflags: -I@Python_INCLUDE_DIRS@ -I${includedir}/@shiboken6_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
diff --git a/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp b/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp
new file mode 100644
index 000000000000..0dae95aec43f
--- /dev/null
+++ b/devel/shiboken6/files/patch-libshiboken_signature_signature__globals.cpp
@@ -0,0 +1,29 @@
+--- libshiboken/signature/signature_globals.cpp.orig	2024-04-29 02:02:21 UTC
++++ libshiboken/signature/signature_globals.cpp
+@@ -210,7 +210,7 @@ static int init_phase_2(safe_globals_struc *p, PyMetho
+ ////////////////////////////////////////////////////////////////////////////
+ // a stack trace for linux-like platforms
+ #include <cstdio>
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+ #  include <execinfo.h>
+ #endif
+ #include <signal.h>
+@@ -218,7 +218,7 @@ static void handler(int sig) {
+ #include <unistd.h>
+ 
+ static void handler(int sig) {
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+     void *array[30];
+     size_t size;
+ 
+@@ -228,7 +228,7 @@ static void handler(int sig) {
+     // print out all the frames to stderr
+ #endif
+     std::fprintf(stderr, "Error: signal %d:\n", sig);
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+     backtrace_symbols_fd(array, size, STDERR_FILENO);
+ #endif
+     exit(1);
diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist
index cbc90f9f6ac1..579d15768358 100644
--- a/devel/shiboken6/pkg-plist
+++ b/devel/shiboken6/pkg-plist
@@ -6,7 +6,9 @@ include/shiboken6/bindingmanager.h
 include/shiboken6/bufferprocs_py37.h
 include/shiboken6/gilstate.h
 include/shiboken6/helper.h
+include/shiboken6/pep384ext.h
 include/shiboken6/pep384impl.h
+include/shiboken6/pyobjectholder.h
 include/shiboken6/sbkarrayconverter.h
 include/shiboken6/sbkcontainer.h
 include/shiboken6/sbkconverter.h
@@ -43,7 +45,7 @@ lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake
 lib/libshiboken6.abi3.so
-lib/libshiboken6.abi3.so.6.6
+lib/libshiboken6.abi3.so.6.7
 lib/libshiboken6.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi3.so
 %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.pyi
diff --git a/devel/soft-serve/Makefile b/devel/soft-serve/Makefile
index 06c022b29134..7845c72f4bd8 100644
--- a/devel/soft-serve/Makefile
+++ b/devel/soft-serve/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	soft-serve
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.4
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/devel/statik/Makefile b/devel/statik/Makefile
index cd25cb58b99f..b28af82840cc 100644
--- a/devel/statik/Makefile
+++ b/devel/statik/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	statik
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.2
-PORTREVISION=	19
+PORTREVISION=	21
 PORTEPOCH=	1
 CATEGORIES=	devel
 
diff --git a/devel/stuffbin/Makefile b/devel/stuffbin/Makefile
index 651a226780b4..935654b3ea80 100644
--- a/devel/stuffbin/Makefile
+++ b/devel/stuffbin/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	stuffbin
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/devel/taskctl/Makefile b/devel/taskctl/Makefile
index 7bc33aa5ee68..c2b50803cf04 100644
--- a/devel/taskctl/Makefile
+++ b/devel/taskctl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	taskctl
 PORTVERSION=	1.4.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	devel
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/devel/tinygo/Makefile b/devel/tinygo/Makefile
index 5cd72d49c66e..a11381012853 100644
--- a/devel/tinygo/Makefile
+++ b/devel/tinygo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tinygo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/venom/Makefile b/devel/venom/Makefile
index e0ec3e8955e5..3e78a40d242d 100644
--- a/devel/venom/Makefile
+++ b/devel/venom/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	venom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/devel/yaegi/Makefile b/devel/yaegi/Makefile
index e0056eecedca..7f8ee54d80da 100644
--- a/devel/yaegi/Makefile
+++ b/devel/yaegi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yaegi
 DISTVERSION=	0.15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	devel
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/dns/acme-dns/Makefile b/dns/acme-dns/Makefile
index 321afb75856d..9fc22baff687 100644
--- a/dns/acme-dns/Makefile
+++ b/dns/acme-dns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		acme-dns
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.0
-PORTREVISION=	15
+PORTREVISION=	17
 PORTEPOCH=		1
 CATEGORIES=		dns
 
diff --git a/dns/amass/Makefile b/dns/amass/Makefile
index 179978d705b1..5188c44c39a3 100644
--- a/dns/amass/Makefile
+++ b/dns/amass/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	amass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.2.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index ac953e9d63f3..a0c701233113 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -10,6 +10,7 @@ bin/dnssec-revoke
 bin/dnssec-settime
 bin/dnssec-signzone
 bin/dnssec-verify
+%%DNSTAP%%bin/dnstap-read
 bin/host
 bin/mdig
 bin/named-rrchecker
@@ -42,7 +43,7 @@ share/man/man1/dnssec-revoke.1.gz
 share/man/man1/dnssec-settime.1.gz
 share/man/man1/dnssec-signzone.1.gz
 share/man/man1/dnssec-verify.1.gz
-@comment share/man/man1/dnstap-read.1.gz
+%%DNSTAP%%share/man/man1/dnstap-read.1.gz
 share/man/man1/host.1.gz
 share/man/man1/mdig.1.gz
 @comment share/man/man1/named-checkconf.1.gz
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index d093babefdc6..85755f92817e 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	bind
 DISTVERSION=	9.18.26
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # dns/bind918 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
@@ -87,7 +87,7 @@ OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
 .if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	DNSTAP DOCS GEOIP LMDB \
+OPTIONS_EXCLUDE=	DOCS GEOIP LMDB \
 			OVERRIDECACHE QUERYTRACE START_LATE \
 			TCP_FASTOPEN
 .endif	# BIND_TOOLS_SLAVE
diff --git a/dns/bind918/files/extrapatch-no-bind-tools b/dns/bind918/files/extrapatch-no-bind-tools
index d53088bec0f4..a79c4832e4de 100644
--- a/dns/bind918/files/extrapatch-no-bind-tools
+++ b/dns/bind918/files/extrapatch-no-bind-tools
@@ -20,3 +20,25 @@ Exclude the "tools" from building and installing.
  
  arpaname_LDADD =		\
  	$(LIBISC_LIBS)
+@@ -27,21 +23,6 @@
+ 	$(LIBISCCFG_LIBS)	\
+ 	$(LIBDNS_LIBS)		\
+ 	$(LIBISC_LIBS)
+-
+-if HAVE_DNSTAP
+-bin_PROGRAMS +=			\
+-	dnstap-read
+-
+-dnstap_read_CPPFLAGS =		\
+-	$(AM_CPPFLAGS)		\
+-	$(DNSTAP_CFLAGS)	\
+-	-I$(top_builddir)/lib/dns
+-
+-dnstap_read_LDADD =		\
+-	$(LIBDNS_LIBS)		\
+-	$(LIBISC_LIBS)		\
+-	$(DNSTAP_LIBS)
+-endif
+ 
+ if HAVE_LMDB
+ bin_PROGRAMS +=			\
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 21deb99a906d..34e29aa1c516 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -1,4 +1,3 @@
-%%DNSTAP%%bin/dnstap-read
 bin/named-checkconf
 bin/named-checkzone
 bin/named-compilezone
@@ -266,7 +265,7 @@ lib/libns-9.18.26.so
 @comment share/man/man1/dnssec-settime.1.gz
 @comment share/man/man1/dnssec-signzone.1.gz
 @comment share/man/man1/dnssec-verify.1.gz
-%%DNSTAP%%share/man/man1/dnstap-read.1.gz
+@comment share/man/man1/dnstap-read.1.gz
 @comment share/man/man1/host.1.gz
 @comment share/man/man1/mdig.1.gz
 share/man/man1/named-checkconf.1.gz
diff --git a/dns/blocky/Makefile b/dns/blocky/Makefile
index 53533c611345..cfc126973594 100644
--- a/dns/blocky/Makefile
+++ b/dns/blocky/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	blocky
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	dns
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=	go.mod:gomod
diff --git a/dns/cli53/Makefile b/dns/cli53/Makefile
index 144721d771a8..f452648e45d2 100644
--- a/dns/cli53/Makefile
+++ b/dns/cli53/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cli53
 DISTVERSION=	0.8.22
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	dns
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/dns/coredns/Makefile b/dns/coredns/Makefile
index 030ff145dd34..9fc5b559e6b4 100644
--- a/dns/coredns/Makefile
+++ b/dns/coredns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	coredns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.11.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/dns/dnscontrol/Makefile b/dns/dnscontrol/Makefile
index 0e02b16c006c..3e47ebfe8493 100644
--- a/dns/dnscontrol/Makefile
+++ b/dns/dnscontrol/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dnscontrol
 DISTVERSIONPREFIX=v
 DISTVERSION=	4.8.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	dns
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/dns/dnscrypt-proxy2/Makefile b/dns/dnscrypt-proxy2/Makefile
index 758935c5f0d0..9e368df0a85a 100644
--- a/dns/dnscrypt-proxy2/Makefile
+++ b/dns/dnscrypt-proxy2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	dnscrypt-proxy
 PORTVERSION=	2.1.5
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	dns security
 PKGNAMESUFFIX=	2
 
diff --git a/dns/dnsdist/Makefile b/dns/dnsdist/Makefile
index 1c3dee8e4206..c1ddecd5e4d2 100644
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dnsdist
-DISTVERSION=	1.9.3
+DISTVERSION=	1.9.4
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 
diff --git a/dns/dnsdist/distinfo b/dns/dnsdist/distinfo
index 656cd642f775..724d6806d1a7 100644
--- a/dns/dnsdist/distinfo
+++ b/dns/dnsdist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712317299
-SHA256 (dnsdist-1.9.3.tar.bz2) = f05b68806dc6c4d207b1fadb7ec715c3e0d28d893a8b3b92d58297c4ceb56c3f
-SIZE (dnsdist-1.9.3.tar.bz2) = 1577027
+TIMESTAMP = 1715595818
+SHA256 (dnsdist-1.9.4.tar.bz2) = 297d3a3751af4650665c9d3890a1d5a7a0467175f2c8607d0d5980e3fd67ef14
+SIZE (dnsdist-1.9.4.tar.bz2) = 1591994
diff --git a/dns/dnsx/Makefile b/dns/dnsx/Makefile
index b67c7076574d..fabda5378474 100644
--- a/dns/dnsx/Makefile
+++ b/dns/dnsx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dnsx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	dns
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/dns/doggo/Makefile b/dns/doggo/Makefile
index 8e24ec3db7c1..49d3444c8762 100644
--- a/dns/doggo/Makefile
+++ b/dns/doggo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	doggo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.7
-PORTREVISION=	4
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	dns
 
diff --git a/dns/godns/Makefile b/dns/godns/Makefile
index 2def06950add..f60fa0bfe710 100644
--- a/dns/godns/Makefile
+++ b/dns/godns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	godns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.7
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	dns
 
 MAINTAINER=	diizzy@FreeBSD.org
diff --git a/dns/mosdns/Makefile b/dns/mosdns/Makefile
index c1cf9f792d25..6467eb49c06b 100644
--- a/dns/mosdns/Makefile
+++ b/dns/mosdns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mosdns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.3.1
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/dns/nextdns/Makefile b/dns/nextdns/Makefile
index a8c4167b9bfa..cda292282e64 100644
--- a/dns/nextdns/Makefile
+++ b/dns/nextdns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nextdns
 PORTVERSION=	1.42.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	dns security
 
 MAINTAINER=	rs@nextdns.io
diff --git a/dns/prometheus-dnssec-exporter/Makefile b/dns/prometheus-dnssec-exporter/Makefile
index 275d3461b50a..ed4f2bc713da 100644
--- a/dns/prometheus-dnssec-exporter/Makefile
+++ b/dns/prometheus-dnssec-exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		prometheus-dnssec-exporter
 DISTVERSION=		g20220925
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=		dns
 
 MAINTAINER=		philip@FreeBSD.org
diff --git a/dns/q-dns/Makefile b/dns/q-dns/Makefile
index 15c999e6eb56..31204a3538f1 100644
--- a/dns/q-dns/Makefile
+++ b/dns/q-dns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	q-dns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/dns/rdap/Makefile b/dns/rdap/Makefile
index 85426109a2d8..fdf2a82227fc 100644
--- a/dns/rdap/Makefile
+++ b/dns/rdap/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rdap
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	dns
 
 MAINTAINER=	pi@FreeBSD.org
diff --git a/dns/subfinder/Makefile b/dns/subfinder/Makefile
index d3bf6e37935e..9ccb8b20398f 100644
--- a/dns/subfinder/Makefile
+++ b/dns/subfinder/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	subfinder
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index d44f32a56335..f375207090bf 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	unbound
-DISTVERSION=	1.19.3
+DISTVERSION=	1.20.0
 CATEGORIES=	dns
 MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/
 
diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo
index e562c6066e68..7a61b168b589 100644
--- a/dns/unbound/distinfo
+++ b/dns/unbound/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710413556
-SHA256 (unbound-1.19.3.tar.gz) = 3ae322be7dc2f831603e4b0391435533ad5861c2322e34a76006a9fb65eb56b9
-SIZE (unbound-1.19.3.tar.gz) = 6338685
+TIMESTAMP = 1715159567
+SHA256 (unbound-1.20.0.tar.gz) = 56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf
+SIZE (unbound-1.20.0.tar.gz) = 6550938
diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist
index d4ba63f60c07..bbe22da63634 100644
--- a/dns/unbound/pkg-plist
+++ b/dns/unbound/pkg-plist
@@ -5,7 +5,7 @@ libdata/pkgconfig/libunbound.pc
 lib/libunbound.a
 lib/libunbound.so
 lib/libunbound.so.8
-lib/libunbound.so.8.1.26
+lib/libunbound.so.8.1.27
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
diff --git a/dns/yandex-ddns/Makefile b/dns/yandex-ddns/Makefile
index 18987f6e1d0c..21a9d5b04711 100644
--- a/dns/yandex-ddns/Makefile
+++ b/dns/yandex-ddns/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yandex-ddns
 DISTVERSION=	g20200613
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	dns
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/dns/zdns/Makefile b/dns/zdns/Makefile
index 084a7d56db64..9e12de897c78 100644
--- a/dns/zdns/Makefile
+++ b/dns/zdns/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zdns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	dns
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 18a34b43aaed..84538e645e1f 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	emacs
 DISTVERSION=	30.0.50.20240330
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -9,6 +10,9 @@ COMMENT=	GNU editing macros ${COMMENT_${FLAVOR}}
 WWW=		https://www.gnu.org/software/emacs/
 COMMENT_nox=	(No X flavor)
 
+PATCH_SITES+=  https://github.com/emacs-mirror/emacs/commit/
+PATCHFILES+=   c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch:-p1
+
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index c0bd4fd5928d..8c5bcb44820c 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1711843126
 SHA256 (emacs-mirror-emacs-30.0.50.20240330-8bee4060ea4_GH0.tar.gz) = 05a9074fdc3add49ed793a7feaf4515c9f1fe3ce4c7b9623bbd749e1393cabed
 SIZE (emacs-mirror-emacs-30.0.50.20240330-8bee4060ea4_GH0.tar.gz) = 50102340
+SHA256 (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = fa7978109a164a894479c2827b297228566bfdf46d1a3def00975a35595ba0bf
+SIZE (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = 2873
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index f88af1d29735..ef9afeaea555 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	emacs
 DISTVERSION=	29.3
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	GNU
@@ -9,6 +10,9 @@ PATCH_SITES+=	https://www.gentei.org/~yuuji/software/emacs29canna/:canna
 PATCHFILES+=	emacs29.1-canna-20230730.diff.xz:-p1:canna
 .endif
 
+PATCH_SITES+=	https://github.com/emacs-mirror/emacs/commit/
+PATCHFILES+=	c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch:-p1
+
 MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros ${COMMENT_${FLAVOR}}
 WWW=		https://www.gnu.org/software/emacs/
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index bd1540f5bfa5..d2e160ad5e4f 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1711330409
+TIMESTAMP = 1719177422
 SHA256 (emacs-29.3.tar.xz) = c34c05d3ace666ed9c7f7a0faf070fea3217ff1910d004499bd5453233d742a0
 SIZE (emacs-29.3.tar.xz) = 52203168
 SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125
 SIZE (emacs29.1-canna-20230730.diff.xz) = 26852
+SHA256 (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = fa7978109a164a894479c2827b297228566bfdf46d1a3def00975a35595ba0bf
+SIZE (c645e1d8205f0f0663ec4a2d27575b238c646c7c.patch) = 2873
diff --git a/editors/gomate/Makefile b/editors/gomate/Makefile
index 24e0fc290c8a..ec748d4a48f6 100644
--- a/editors/gomate/Makefile
+++ b/editors/gomate/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gomate
 DISTVERSION=	g20170711
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	editors
 
 MAINTAINER=	fabian.freyer@physik.tu-berlin.de
diff --git a/editors/lazarus-qt6/Makefile b/editors/lazarus-qt6/Makefile
index 6004f9f2910e..73dcdd87498c 100644
--- a/editors/lazarus-qt6/Makefile
+++ b/editors/lazarus-qt6/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 
 PKGNAMESUFFIX?=  -qt6
 
diff --git a/editors/micro/Makefile b/editors/micro/Makefile
index a813c05f303f..cd6d362e5d5b 100644
--- a/editors/micro/Makefile
+++ b/editors/micro/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	micro
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.13
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	editors
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/editors/orbiton/Makefile b/editors/orbiton/Makefile
index c12b004ad509..7417ee8b63b8 100644
--- a/editors/orbiton/Makefile
+++ b/editors/orbiton/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	orbiton
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.65.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/editors/vscode/files/node_modules/patch-remote_node__modules_kerberos_src_kerberos.h b/editors/vscode/files/node_modules/patch-remote_node__modules_kerberos_src_kerberos.h
new file mode 100644
index 000000000000..2e5f9846f935
--- /dev/null
+++ b/editors/vscode/files/node_modules/patch-remote_node__modules_kerberos_src_kerberos.h
@@ -0,0 +1,10 @@
+--- remote/node_modules/kerberos/src/kerberos.h.orig	2024-04-17 09:20:40 UTC
++++ remote/node_modules/kerberos/src/kerberos.h
+@@ -7,6 +7,7 @@
+ #define NAPI_VERSION 6
+ // as an experimental feature (that has not been changed since then).
+ #define NAPI_EXPERIMENTAL
++#define NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT
+ 
+ #include <napi.h>
+ #include "kerberos_common.h"
diff --git a/emulators/magia/Makefile b/emulators/magia/Makefile
index 8fb0f7a3b1e3..41371907f51d 100644
--- a/emulators/magia/Makefile
+++ b/emulators/magia/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	magia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/fabric/Makefile b/finance/fabric/Makefile
index 61e1d28b67fc..c00f510c623a 100644
--- a/finance/fabric/Makefile
+++ b/finance/fabric/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fabric
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.5
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	finance
 PKGNAMESUFFIX=	-hyperledger
 
diff --git a/finance/fixc/Makefile b/finance/fixc/Makefile
index cbfb0bc75826..192ea8f18623 100644
--- a/finance/fixc/Makefile
+++ b/finance/fixc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		fixc
 PORTVERSION=		1.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		finance
 
 MAINTAINER=		blttll@gmail.com
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index 9cd874021447..3baa3bf7b3a9 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ktoblzcheck
 PORTVERSION=	1.57
+PORTREVISION=	1
 CATEGORIES=	finance german
 MASTER_SITES=	SF/${PORTNAME} \
 		LOCAL/jhale/${PORTNAME}:bankdata
@@ -25,7 +26,7 @@ CMAKE_OFF=	ENABLE_BANKDATA_DOWNLOAD \
 
 PORTDOCS=	README.md
 
-BANKDATA_DATE=	20240108
+BANKDATA_DATE=	20240603
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_SUB=	yes
diff --git a/finance/ktoblzcheck/distinfo b/finance/ktoblzcheck/distinfo
index 571dbedc4375..ca702d44e6b9 100644
--- a/finance/ktoblzcheck/distinfo
+++ b/finance/ktoblzcheck/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705083248
+TIMESTAMP = 1719119708
 SHA256 (ktoblzcheck-1.57.tar.gz) = 4c3b782e5d8e31e219c3e2ece0c6e84a93929ae0b2f36080d4c183a644d05672
 SIZE (ktoblzcheck-1.57.tar.gz) = 96788
-SHA256 (ktoblzcheck-bankdata-20240108.tar.gz) = ce039f989ef7ac7b12de5ea57fa58991e98cecf0ce7ba2b75d567ca5c4db43e5
-SIZE (ktoblzcheck-bankdata-20240108.tar.gz) = 534789
+SHA256 (ktoblzcheck-bankdata-20240603.tar.gz) = e21c16b00ce9a20cd4e1bf1dc2f008d6eea56f318f768c48e1ff3754df4b095e
+SIZE (ktoblzcheck-bankdata-20240603.tar.gz) = 517478
diff --git a/finance/lnd/Makefile b/finance/lnd/Makefile
index 444dedd61757..5cb48a75d35a 100644
--- a/finance/lnd/Makefile
+++ b/finance/lnd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lnd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.3-beta
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	finance
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/finance/ticker/Makefile b/finance/ticker/Makefile
index 004f71545287..b2585317f8fa 100644
--- a/finance/ticker/Makefile
+++ b/finance/ticker/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ticker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.5.14
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	finance
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/ftp/curlie/Makefile b/ftp/curlie/Makefile
index 59e758ab41f8..1a3286439bb2 100644
--- a/ftp/curlie/Makefile
+++ b/ftp/curlie/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	curlie
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.7
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	ftp net www
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/ftp/pget/Makefile b/ftp/pget/Makefile
index d7cfd2f38bbc..c3da556e8236 100644
--- a/ftp/pget/Makefile
+++ b/ftp/pget/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pget
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	ftp net www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/ftp/sftpgo/Makefile b/ftp/sftpgo/Makefile
index 3bffde565122..af39036843a4 100644
--- a/ftp/sftpgo/Makefile
+++ b/ftp/sftpgo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sftpgo
 PORTVERSION=	2.5.5
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	ftp www
 MASTER_SITES=	https://github.com/drakkan/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}_src_with_deps
diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile
index 2fbf79b0ff3f..a66c1e731041 100644
--- a/games/allacrost/Makefile
+++ b/games/allacrost/Makefile
@@ -12,6 +12,8 @@ WWW=		https://web.archive.org/web/20201126135328/http://allacrost.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN=		uses incompatible C++ features from different C++ standards that can't be built together due to feature deprecation restrictions
+
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
diff --git a/games/anki/Makefile b/games/anki/Makefile
index cf51d407314a..eaa527480d40 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	anki
-DISTVERSION=	24.04.1
+DISTVERSION=	24.06.2
 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes
 CATEGORIES=	games education python
 MASTER_SITES=	LOCAL/kai/:yarncache
@@ -44,12 +44,12 @@ USES=		cargo desktop-file-utils ninja nodejs:build pyqt:6 python:3.9+ \
 USE_GITHUB=	yes
 GH_ACCOUNT=	ankitects
 # Translation files
-GH_TUPLE=	ankitects:anki-core-i18n:e3af3c9:ftlrslib \
-		ankitects:anki-desktop-ftl:4515531:ftlextra
+GH_TUPLE=	ankitects:anki-core-i18n:50fdc91:ftlrslib \
+		ankitects:anki-desktop-ftl:e747f9e:ftlextra
 
 USE_PYQT=	pyqt6 sip:build webengine
 
-SHEBANG_FILES=	qt/tools/runanki.system.in
+SHEBANG_FILES=	yarn qt/tools/runanki.system.in
 
 CARGO_CARGOTOML=	${WRKSRC}/Cargo.toml
 
@@ -84,7 +84,7 @@ MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 # Should contain the most recent commit that reflects ${DISTVERSION} and must
 # be exactly 8 digits otherwise the check for newer versions won't work as
 # expected.
-_MY_BUILDHASH= ccd9ca1a
+_MY_BUILDHASH= 33a92379
 # Remove ${CARGO_BUILD_TARGET} from ${CARGO_ENV} to avoid problems with
 # hardcoded paths as the "runner" build system expects its components
 # in ${WRKSRC}/out/rust/debug
@@ -157,6 +157,14 @@ do-install:
 		&& ${INSTALL_SCRIPT} runanki.system.in ${STAGEDIR}${PREFIX}/bin/anki
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/anki/_rsbridge.so
 
+# Autogenerate some parts of the plist file as several *.css and *.mjs files
+# have a computed filename.  As it is user-specific it is impossible to know
+# their filename in advance.
+post-install:
+	@${FIND} ${STAGEDIR}${DATADIR}/_aqt/data/web/sveltekit/_app/immutable/ -type f -name "*.css" -o -name "*.mjs" | \
+		${SORT} | ${SED} -e 's|${STAGEDIR}||' \
+		>> ${TMPPLIST}
+
 # Helper target to make the generation of the yarn cache easier
 make-yarn-cache: patch
 	@${RM} -r ${_MY_YARNCACHE}
diff --git a/games/anki/Makefile.crates b/games/anki/Makefile.crates
index dd6d02fa4964..238eaf870b19 100644
--- a/games/anki/Makefile.crates
+++ b/games/anki/Makefile.crates
@@ -23,7 +23,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		async-compression-0.4.6 \
 		async-stream-0.3.5 \
 		async-stream-impl-0.3.5 \
-		async-trait-0.1.77 \
+		async-trait-0.1.80 \
 		autocfg-1.1.0 \
 		axum-0.6.20 \
 		axum-client-ip-0.4.2 \
@@ -32,6 +32,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		backtrace-0.3.69 \
 		base64-0.13.1 \
 		base64-0.21.7 \
+		base64-0.22.1 \
 		base64ct-1.6.0 \
 		bincode-2.0.0-rc.3 \
 		bit-set-0.5.3 \
@@ -45,20 +46,21 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		block-padding-0.3.3 \
 		bstr-1.9.1 \
 		bumpalo-3.15.3 \
-		burn-0.12.1 \
-		burn-autodiff-0.12.1 \
-		burn-candle-0.12.1 \
-		burn-common-0.12.1 \
-		burn-compute-0.12.1 \
-		burn-core-0.12.1 \
-		burn-dataset-0.12.1 \
-		burn-derive-0.12.1 \
-		burn-fusion-0.12.1 \
-		burn-ndarray-0.12.1 \
-		burn-tch-0.12.1 \
-		burn-tensor-0.12.1 \
-		burn-train-0.12.1 \
-		burn-wgpu-0.12.1 \
+		burn-0.13.1 \
+		burn-autodiff-0.13.1 \
+		burn-candle-0.13.1 \
+		burn-common-0.13.1 \
+		burn-compute-0.13.1 \
+		burn-core-0.13.1 \
+		burn-dataset-0.13.1 \
+		burn-derive-0.13.1 \
+		burn-fusion-0.13.1 \
+		burn-jit-0.13.1 \
+		burn-ndarray-0.13.1 \
+		burn-tch-0.13.1 \
+		burn-tensor-0.13.1 \
+		burn-train-0.13.1 \
+		burn-wgpu-0.13.1 \
 		bytemuck-1.14.3 \
 		bytemuck_derive-1.5.0 \
 		byteorder-1.5.0 \
@@ -66,11 +68,12 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		bzip2-0.4.4 \
 		bzip2-sys-0.1.11+1.0.8 \
 		camino-1.1.6 \
-		candle-core-0.3.3 \
+		candle-core-0.4.1 \
 		cast-0.3.0 \
 		cbc-0.1.2 \
 		cc-1.0.88 \
 		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
 		chrono-0.4.34 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
@@ -86,7 +89,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		codespan-reporting-0.11.1 \
 		color_quant-1.1.0 \
 		colorchoice-1.0.0 \
-		com-rs-0.2.1 \
+		com-0.6.0 \
+		com_macros-0.6.0 \
+		com_macros_support-0.6.0 \
 		concurrent-queue-2.4.0 \
 		constant_time_eq-0.1.5 \
 		constant_time_eq-0.3.0 \
@@ -106,7 +111,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		crypto-common-0.1.6 \
 		csv-1.3.0 \
 		csv-core-0.1.11 \
-		d3d12-0.7.0 \
+		d3d12-0.19.0 \
 		dashmap-5.5.3 \
 		data-encoding-2.5.0 \
 		deadpool-0.9.5 \
@@ -158,7 +163,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		forwarded-header-value-0.1.1 \
 		fs2-0.4.3 \
 		fsevent-sys-4.1.0 \
-		fsrs-0.5.5 \
+		fsrs-0.6.4 \
 		futf-0.1.5 \
 		futures-0.3.30 \
 		futures-channel-0.3.30 \
@@ -182,7 +187,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		generic-array-0.14.7 \
 		getopts-0.2.21 \
 		getrandom-0.1.16 \
-		getrandom-0.2.12 \
+		getrandom-0.2.14 \
 		gif-0.13.1 \
 		gimli-0.28.1 \
 		gix-features-0.36.1 \
@@ -197,16 +202,16 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		glutin_wgl_sys-0.5.0 \
 		gpu-alloc-0.6.0 \
 		gpu-alloc-types-0.3.0 \
-		gpu-allocator-0.23.0 \
+		gpu-allocator-0.25.0 \
 		gpu-descriptor-0.2.4 \
 		gpu-descriptor-types-0.1.2 \
-		h2-0.3.24 \
-		half-2.4.0 \
+		h2-0.3.26 \
+		half-2.4.1 \
 		handlebars-5.1.0 \
 		hashbrown-0.13.2 \
 		hashbrown-0.14.3 \
 		hashlink-0.8.4 \
-		hassle-rs-0.10.0 \
+		hassle-rs-0.11.0 \
 		headers-0.3.9 \
 		headers-core-0.2.0 \
 		heck-0.4.1 \
@@ -249,6 +254,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		itertools-0.11.0 \
 		itertools-0.12.1 \
 		itoa-1.0.10 \
+		jni-sys-0.3.0 \
 		jpeg-decoder-0.3.1 \
 		js-sys-0.3.68 \
 		junction-1.0.0 \
@@ -268,7 +274,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		linkify-0.7.0 \
 		linux-raw-sys-0.4.13 \
 		lock_api-0.4.11 \
-		log-0.4.20 \
+		log-0.4.21 \
 		lzma-sys-0.1.20 \
 		mac-0.1.1 \
 		malloc_buf-0.0.6 \
@@ -292,11 +298,11 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		mio-0.8.11 \
 		multer-2.1.0 \
 		multimap-0.8.3 \
-		naga-0.14.2 \
-		nanorand-0.7.0 \
+		naga-0.19.2 \
 		native-tls-0.2.11 \
 		ndarray-0.15.6 \
 		ndarray-rand-0.14.0 \
+		ndk-sys-0.5.0+25.2.9519653 \
 		new_debug_unreachable-1.0.4 \
 		nom-7.1.3 \
 		nonempty-0.7.0 \
@@ -369,7 +375,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		prettyplease-0.2.16 \
 		proc-macro-crate-3.1.0 \
 		proc-macro-hack-0.5.20+deprecated \
-		proc-macro2-1.0.78 \
+		proc-macro2-1.0.81 \
 		profiling-1.0.15 \
 		prost-0.12.3 \
 		prost-build-0.12.3 \
@@ -401,9 +407,9 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		rand_hc-0.2.0 \
 		range-alloc-0.1.3 \
 		raw-cpuid-10.7.0 \
-		raw-window-handle-0.5.2 \
+		raw-window-handle-0.6.1 \
 		rawpointer-0.2.1 \
-		rayon-1.9.0 \
+		rayon-1.10.0 \
 		rayon-core-1.12.1 \
 		rc2-0.8.1 \
 		rcgen-0.10.0 \
@@ -426,10 +432,11 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		rustc-demangle-0.1.23 \
 		rustc-hash-1.1.0 \
 		rustix-0.38.31 \
-		rustls-0.21.10 \
-		rustls-0.22.2 \
+		rustls-0.21.11 \
+		rustls-0.22.4 \
 		rustls-native-certs-0.6.3 \
 		rustls-pemfile-1.0.4 \
+		rustls-pemfile-2.1.2 \
 		rustls-pki-types-1.3.1 \
 		rustls-webpki-0.101.7 \
 		rustls-webpki-0.102.2 \
@@ -454,7 +461,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		serde-1.0.197 \
 		serde-aux-4.5.0 \
 		serde_derive-1.0.197 \
-		serde_json-1.0.114 \
+		serde_json-1.0.116 \
 		serde_path_to_error-0.1.15 \
 		serde_qs-0.8.5 \
 		serde_repr-0.1.18 \
@@ -481,7 +488,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		socket2-0.5.6 \
 		spin-0.5.2 \
 		spin-0.9.8 \
-		spirv-0.2.0+1.5.4 \
+		spirv-0.3.0+sdk-1.3.268.0 \
 		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		string_cache-0.8.7 \
@@ -507,8 +514,8 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		termcolor-1.4.1 \
 		terminal_size-0.3.0 \
 		text_placeholder-0.5.0 \
-		thiserror-1.0.57 \
-		thiserror-impl-1.0.57 \
+		thiserror-1.0.59 \
+		thiserror-impl-1.0.59 \
 		thread-tree-0.3.3 \
 		thread_local-1.1.8 \
 		tiff-0.9.1 \
@@ -574,7 +581,7 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		utf-8-0.7.6 \
 		utf8parse-0.2.1 \
 		utime-0.3.1 \
-		uuid-1.7.0 \
+		uuid-1.8.0 \
 		valuable-0.1.0 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
@@ -592,15 +599,15 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		wasm-bindgen-macro-support-0.2.91 \
 		wasm-bindgen-shared-0.2.91 \
 		wasm-streams-0.4.0 \
-		web-sys-0.3.64 \
+		web-sys-0.3.68 \
 		web-time-1.1.0 \
 		webpki-roots-0.25.4 \
 		webpki-roots-0.26.1 \
 		weezl-0.1.8 \
-		wgpu-0.18.0 \
-		wgpu-core-0.18.1 \
-		wgpu-hal-0.18.1 \
-		wgpu-types-0.18.0 \
+		wgpu-0.19.4 \
+		wgpu-core-0.19.4 \
+		wgpu-hal-0.19.4 \
+		wgpu-types-0.19.2 \
 		which-4.4.2 \
 		which-5.0.0 \
 		widestring-1.0.2 \
diff --git a/games/anki/distinfo b/games/anki/distinfo
index d0124ab5b810..25bbf395b31d 100644
--- a/games/anki/distinfo
+++ b/games/anki/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1713786119
-SHA256 (anki-yarn-cache-24.04.1.tar.gz) = b4dcd73ce528d41ab4ddcfafe397e46facbbe6955b0dbe6886aa4ecd63a6965f
-SIZE (anki-yarn-cache-24.04.1.tar.gz) = 328998462
+TIMESTAMP = 1717939257
+SHA256 (anki-yarn-cache-24.06.2.tar.gz) = b538e04593e80982ec68906bc85d1cc42b9f6af40dbf1b8569a9698e79cb7dfd
+SIZE (anki-yarn-cache-24.06.2.tar.gz) = 507330108
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -51,8 +51,8 @@ SHA256 (rust/crates/async-stream-0.3.5.crate) = cd56dd203fef61ac097dd65721a419dd
 SIZE (rust/crates/async-stream-0.3.5.crate) = 11916
 SHA256 (rust/crates/async-stream-impl-0.3.5.crate) = 16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193
 SIZE (rust/crates/async-stream-impl-0.3.5.crate) = 4173
-SHA256 (rust/crates/async-trait-0.1.77.crate) = c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9
-SIZE (rust/crates/async-trait-0.1.77.crate) = 29986
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
 SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
 SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
@@ -69,6 +69,8 @@ SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71
 SIZE (rust/crates/base64-0.13.1.crate) = 61002
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
 SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
 SHA256 (rust/crates/bincode-2.0.0-rc.3.crate) = f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95
@@ -95,34 +97,36 @@ SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178
 SIZE (rust/crates/bstr-1.9.1.crate) = 380305
 SHA256 (rust/crates/bumpalo-3.15.3.crate) = 8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b
 SIZE (rust/crates/bumpalo-3.15.3.crate) = 84438
-SHA256 (rust/crates/burn-0.12.1.crate) = b6b703e5dae87b2146649b64af54688ff86e16cf69fd19d28c43c8f9656d7d7c
-SIZE (rust/crates/burn-0.12.1.crate) = 15175
-SHA256 (rust/crates/burn-autodiff-0.12.1.crate) = f306e1b2e480fa0960c3130a68ca5e0fa54b3e33ed2fda7cf2121434703dd771
-SIZE (rust/crates/burn-autodiff-0.12.1.crate) = 38099
-SHA256 (rust/crates/burn-candle-0.12.1.crate) = fc87b644a2d83cc1b7c05d1176e9e24fb6394272256ab9ab8324ff7c4fe0e6a0
-SIZE (rust/crates/burn-candle-0.12.1.crate) = 8974
-SHA256 (rust/crates/burn-common-0.12.1.crate) = 1267068969f094323b62693df0c3b45d3b08a0568f3c3467e6a5c3207e6807c8
-SIZE (rust/crates/burn-common-0.12.1.crate) = 10814
-SHA256 (rust/crates/burn-compute-0.12.1.crate) = a1b51588cf7c84976f6241a9ac5f77857712b8bf443dab77296c260785033fe8
-SIZE (rust/crates/burn-compute-0.12.1.crate) = 18570
-SHA256 (rust/crates/burn-core-0.12.1.crate) = 6b11d8fd1e8c656eee1a0bb503b798c4583904dcaf7a369cbb8fdfd3acc3d0ab
-SIZE (rust/crates/burn-core-0.12.1.crate) = 1994180
-SHA256 (rust/crates/burn-dataset-0.12.1.crate) = c6050891281ae38ee9dc24d1d5badd084247717b15e3dcdae562a81456a41c6e
-SIZE (rust/crates/burn-dataset-0.12.1.crate) = 42611
-SHA256 (rust/crates/burn-derive-0.12.1.crate) = 70f149de5f32baa3f2191c374edab71e5a323bade05eb6092c702aed76cdcb7b
-SIZE (rust/crates/burn-derive-0.12.1.crate) = 14315
-SHA256 (rust/crates/burn-fusion-0.12.1.crate) = f512f780beaefca46088c4e4a80595511fbc3b35545118281fbf49f1fca767b4
-SIZE (rust/crates/burn-fusion-0.12.1.crate) = 42358
-SHA256 (rust/crates/burn-ndarray-0.12.1.crate) = 1aef9fb0b72a1c0a112ed51e35284fb663d3ba3fd98f3a3bfa32db39fd24ae4d
-SIZE (rust/crates/burn-ndarray-0.12.1.crate) = 21677
-SHA256 (rust/crates/burn-tch-0.12.1.crate) = e3d7aec36d836c5a11714480089738120899e2c91f6fe2e23abd09ec4a68a803
-SIZE (rust/crates/burn-tch-0.12.1.crate) = 26323
-SHA256 (rust/crates/burn-tensor-0.12.1.crate) = ad09aeb0f2428a4ee91f9876a7d71cef6feb1fcacdab6389362dd878ec5f9b27
-SIZE (rust/crates/burn-tensor-0.12.1.crate) = 82745
-SHA256 (rust/crates/burn-train-0.12.1.crate) = dd5536e98b23dd5047728f288e61e8a4d9fbffef6f55086d3483c2464758508d
-SIZE (rust/crates/burn-train-0.12.1.crate) = 42343
-SHA256 (rust/crates/burn-wgpu-0.12.1.crate) = 231d2deb14a02838c29dd5e90d1a87a9578d76bda7b02d5c7a77e5440ef6ae95
-SIZE (rust/crates/burn-wgpu-0.12.1.crate) = 82313
+SHA256 (rust/crates/burn-0.13.1.crate) = e041d5f4eef703500763e599050cba419cd90d464172d71e3d5397baebbf1d8a
+SIZE (rust/crates/burn-0.13.1.crate) = 15357
+SHA256 (rust/crates/burn-autodiff-0.13.1.crate) = 1e23c815bc728ac60343b8820fb71e9b4a2c0cb283bfd58828246caacabe6eff
+SIZE (rust/crates/burn-autodiff-0.13.1.crate) = 56185
+SHA256 (rust/crates/burn-candle-0.13.1.crate) = 5d319a88254df7e9740154c32e862d721d29e5f782c0fdf7004f6b9ed5c8369f
+SIZE (rust/crates/burn-candle-0.13.1.crate) = 14461
+SHA256 (rust/crates/burn-common-0.13.1.crate) = a14cddb7f93dc985637e21f068a343acdfc4d62232fb11101f88c2739abad249
+SIZE (rust/crates/burn-common-0.13.1.crate) = 12064
+SHA256 (rust/crates/burn-compute-0.13.1.crate) = cbe641bbe653d04fb070a80946f3db13485e04d7d12104aab9287a1d55b3493c
+SIZE (rust/crates/burn-compute-0.13.1.crate) = 23064
+SHA256 (rust/crates/burn-core-0.13.1.crate) = 9f3532e2f722bca39aefa69aea2b8e6cf2c3bf70f95ba8421b557082d89ea476
+SIZE (rust/crates/burn-core-0.13.1.crate) = 97316
+SHA256 (rust/crates/burn-dataset-0.13.1.crate) = ebb03147d7c50f31c673ee7f672543caddd56bc5de906810db23e396ca062054
+SIZE (rust/crates/burn-dataset-0.13.1.crate) = 47195
+SHA256 (rust/crates/burn-derive-0.13.1.crate) = 7dbf7e7f4154821f1a74c709ed2191304701e6f56b6221aec8585b8a16d16ae5
+SIZE (rust/crates/burn-derive-0.13.1.crate) = 15873
+SHA256 (rust/crates/burn-fusion-0.13.1.crate) = 934015329ca3b41a6a6bc7b6a4eedcda04d899085e0b3273e7fb330358c15cf8
+SIZE (rust/crates/burn-fusion-0.13.1.crate) = 49334
+SHA256 (rust/crates/burn-jit-0.13.1.crate) = d257cec36c1b4404c79355492a0c32d0775ed5d7826241051323eb88f1e633dc
+SIZE (rust/crates/burn-jit-0.13.1.crate) = 99652
+SHA256 (rust/crates/burn-ndarray-0.13.1.crate) = 4f3a7d13e0116b4e442bda45aa9eb8a4cc3b70cf7d67197b13d539753275428c
+SIZE (rust/crates/burn-ndarray-0.13.1.crate) = 24601
+SHA256 (rust/crates/burn-tch-0.13.1.crate) = 3ee78099b81128ba1122c645344cb7126c1fadfc05b284150efd94731001f0a7
+SIZE (rust/crates/burn-tch-0.13.1.crate) = 28194
+SHA256 (rust/crates/burn-tensor-0.13.1.crate) = b9395b25136b8fff2ca293dc30e8ca915cc811ed48ffbb147063b6c9c7fcba6a
+SIZE (rust/crates/burn-tensor-0.13.1.crate) = 107135
+SHA256 (rust/crates/burn-train-0.13.1.crate) = da95f83ed597cdb313fb0e18b389f88b96d5bcd1a37620adc969fe2934d486ff
+SIZE (rust/crates/burn-train-0.13.1.crate) = 46649
+SHA256 (rust/crates/burn-wgpu-0.13.1.crate) = 6377670147b65387c807938b4f77a0b149b154ecc8b749f66ad068d345efac14
+SIZE (rust/crates/burn-wgpu-0.13.1.crate) = 23742
 SHA256 (rust/crates/bytemuck-1.14.3.crate) = a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f
 SIZE (rust/crates/bytemuck-1.14.3.crate) = 47032
 SHA256 (rust/crates/bytemuck_derive-1.5.0.crate) = 965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1
@@ -137,8 +141,8 @@ SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8ca
 SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
 SHA256 (rust/crates/camino-1.1.6.crate) = c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c
 SIZE (rust/crates/camino-1.1.6.crate) = 30519
-SHA256 (rust/crates/candle-core-0.3.3.crate) = 6db8659ea87ee8197d2fc627348916cce0561330ee7ae3874e771691d3cecb2f
-SIZE (rust/crates/candle-core-0.3.3.crate) = 193222
+SHA256 (rust/crates/candle-core-0.4.1.crate) = 6f1b20174c1707e20f4cb364a355b449803c03e9b0c9193324623cf9787a4e00
+SIZE (rust/crates/candle-core-0.4.1.crate) = 200622
 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
 SIZE (rust/crates/cast-0.3.0.crate) = 11452
 SHA256 (rust/crates/cbc-0.1.2.crate) = 26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6
@@ -147,6 +151,8 @@ SHA256 (rust/crates/cc-1.0.88.crate) = 02f341c093d19155a6e41631ce5971aac4e9a8682
 SIZE (rust/crates/cc-1.0.88.crate) = 75288
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
+SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
 SHA256 (rust/crates/chrono-0.4.34.crate) = 5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b
 SIZE (rust/crates/chrono-0.4.34.crate) = 228932
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
@@ -177,8 +183,12 @@ SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7
 SIZE (rust/crates/color_quant-1.1.0.crate) = 6649
 SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
 SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
-SHA256 (rust/crates/com-rs-0.2.1.crate) = bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642
-SIZE (rust/crates/com-rs-0.2.1.crate) = 10647
+SHA256 (rust/crates/com-0.6.0.crate) = 7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6
+SIZE (rust/crates/com-0.6.0.crate) = 24855
+SHA256 (rust/crates/com_macros-0.6.0.crate) = d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5
+SIZE (rust/crates/com_macros-0.6.0.crate) = 1075
+SHA256 (rust/crates/com_macros_support-0.6.0.crate) = ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c
+SIZE (rust/crates/com_macros_support-0.6.0.crate) = 17334
 SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
 SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
 SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
@@ -217,8 +227,8 @@ SHA256 (rust/crates/csv-1.3.0.crate) = ac574ff4d437a7b5ad237ef331c17ccca63c46479
 SIZE (rust/crates/csv-1.3.0.crate) = 888212
 SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
 SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
-SHA256 (rust/crates/d3d12-0.7.0.crate) = e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20
-SIZE (rust/crates/d3d12-0.7.0.crate) = 17319
+SHA256 (rust/crates/d3d12-0.19.0.crate) = 3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307
+SIZE (rust/crates/d3d12-0.19.0.crate) = 16772
 SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
 SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
 SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
@@ -321,8 +331,8 @@ SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1a
 SIZE (rust/crates/fs2-0.4.3.crate) = 13138
 SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2
 SIZE (rust/crates/fsevent-sys-4.1.0.crate) = 4620
-SHA256 (rust/crates/fsrs-0.5.5.crate) = 84a04c31041078628c5ce7310be96c987bf7f33a3f8815fa0fcdb084eb31feba
-SIZE (rust/crates/fsrs-0.5.5.crate) = 35913
+SHA256 (rust/crates/fsrs-0.6.4.crate) = 70cec685337af48789e58cea6ef59ee9f01289d1083428b03fe14e76b98c817c
+SIZE (rust/crates/fsrs-0.6.4.crate) = 36422
 SHA256 (rust/crates/futf-0.1.5.crate) = df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843
 SIZE (rust/crates/futf-0.1.5.crate) = 11344
 SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
@@ -369,8 +379,8 @@ SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce8
 SIZE (rust/crates/getopts-0.2.21.crate) = 18457
 SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
 SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
-SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
-SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
+SHA256 (rust/crates/getrandom-0.2.14.crate) = 94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c
+SIZE (rust/crates/getrandom-0.2.14.crate) = 37307
 SHA256 (rust/crates/gif-0.13.1.crate) = 3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2
 SIZE (rust/crates/gif-0.13.1.crate) = 36408
 SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
@@ -399,16 +409,16 @@ SHA256 (rust/crates/gpu-alloc-0.6.0.crate) = fbcd2dba93594b227a1f57ee09b8b9da889
 SIZE (rust/crates/gpu-alloc-0.6.0.crate) = 19649
 SHA256 (rust/crates/gpu-alloc-types-0.3.0.crate) = 98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4
 SIZE (rust/crates/gpu-alloc-types-0.3.0.crate) = 4128
-SHA256 (rust/crates/gpu-allocator-0.23.0.crate) = 40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad
-SIZE (rust/crates/gpu-allocator-0.23.0.crate) = 50234
+SHA256 (rust/crates/gpu-allocator-0.25.0.crate) = 6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884
+SIZE (rust/crates/gpu-allocator-0.25.0.crate) = 44341
 SHA256 (rust/crates/gpu-descriptor-0.2.4.crate) = cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c
 SIZE (rust/crates/gpu-descriptor-0.2.4.crate) = 6641
 SHA256 (rust/crates/gpu-descriptor-types-0.1.2.crate) = 6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c
 SIZE (rust/crates/gpu-descriptor-types-0.1.2.crate) = 1928
-SHA256 (rust/crates/h2-0.3.24.crate) = bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9
-SIZE (rust/crates/h2-0.3.24.crate) = 167814
-SHA256 (rust/crates/half-2.4.0.crate) = b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e
-SIZE (rust/crates/half-2.4.0.crate) = 50666
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
+SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
+SIZE (rust/crates/half-2.4.1.crate) = 50892
 SHA256 (rust/crates/handlebars-5.1.0.crate) = ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4
 SIZE (rust/crates/handlebars-5.1.0.crate) = 97779
 SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
@@ -417,8 +427,8 @@ SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee
 SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
 SHA256 (rust/crates/hashlink-0.8.4.crate) = e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7
 SIZE (rust/crates/hashlink-0.8.4.crate) = 26514
-SHA256 (rust/crates/hassle-rs-0.10.0.crate) = 1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0
-SIZE (rust/crates/hassle-rs-0.10.0.crate) = 25867
+SHA256 (rust/crates/hassle-rs-0.11.0.crate) = af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890
+SIZE (rust/crates/hassle-rs-0.11.0.crate) = 27178
 SHA256 (rust/crates/headers-0.3.9.crate) = 06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270
 SIZE (rust/crates/headers-0.3.9.crate) = 68290
 SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
@@ -503,6 +513,8 @@ SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954
 SIZE (rust/crates/itertools-0.12.1.crate) = 137761
 SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
 SIZE (rust/crates/itoa-1.0.10.crate) = 10534
+SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
+SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
 SHA256 (rust/crates/jpeg-decoder-0.3.1.crate) = f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0
 SIZE (rust/crates/jpeg-decoder-0.3.1.crate) = 744364
 SHA256 (rust/crates/js-sys-0.3.68.crate) = 406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee
@@ -541,8 +553,8 @@ SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33e
 SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
 SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
 SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
-SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
-SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
 SHA256 (rust/crates/lzma-sys-0.1.20.crate) = 5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27
 SIZE (rust/crates/lzma-sys-0.1.20.crate) = 760045
 SHA256 (rust/crates/mac-0.1.1.crate) = c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4
@@ -589,16 +601,16 @@ SHA256 (rust/crates/multer-2.1.0.crate) = 01acbdc23469fd8fe07ab135923371d5f5a422
 SIZE (rust/crates/multer-2.1.0.crate) = 23976
 SHA256 (rust/crates/multimap-0.8.3.crate) = e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a
 SIZE (rust/crates/multimap-0.8.3.crate) = 13518
-SHA256 (rust/crates/naga-0.14.2.crate) = ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e
-SIZE (rust/crates/naga-0.14.2.crate) = 527007
-SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
-SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
+SHA256 (rust/crates/naga-0.19.2.crate) = 50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843
+SIZE (rust/crates/naga-0.19.2.crate) = 537942
 SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
 SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
 SHA256 (rust/crates/ndarray-0.15.6.crate) = adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32
 SIZE (rust/crates/ndarray-0.15.6.crate) = 275225
 SHA256 (rust/crates/ndarray-rand-0.14.0.crate) = 65608f937acc725f5b164dcf40f4f0bc5d67dc268ab8a649d3002606718c4588
 SIZE (rust/crates/ndarray-rand-0.14.0.crate) = 10025
+SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691
+SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233
 SHA256 (rust/crates/new_debug_unreachable-1.0.4.crate) = e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54
 SIZE (rust/crates/new_debug_unreachable-1.0.4.crate) = 2561
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
@@ -743,8 +755,8 @@ SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a348
 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
-SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
-SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158
+SHA256 (rust/crates/proc-macro2-1.0.81.crate) = 3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba
+SIZE (rust/crates/proc-macro2-1.0.81.crate) = 48233
 SHA256 (rust/crates/profiling-1.0.15.crate) = 43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58
 SIZE (rust/crates/profiling-1.0.15.crate) = 14255
 SHA256 (rust/crates/prost-0.12.3.crate) = 146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a
@@ -807,12 +819,12 @@ SHA256 (rust/crates/range-alloc-0.1.3.crate) = 9c8a99fddc9f0ba0a85884b8d14e35928
 SIZE (rust/crates/range-alloc-0.1.3.crate) = 7664
 SHA256 (rust/crates/raw-cpuid-10.7.0.crate) = 6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332
 SIZE (rust/crates/raw-cpuid-10.7.0.crate) = 107292
-SHA256 (rust/crates/raw-window-handle-0.5.2.crate) = f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9
-SIZE (rust/crates/raw-window-handle-0.5.2.crate) = 17063
+SHA256 (rust/crates/raw-window-handle-0.6.1.crate) = 8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b
+SIZE (rust/crates/raw-window-handle-0.6.1.crate) = 19274
 SHA256 (rust/crates/rawpointer-0.2.1.crate) = 60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3
 SIZE (rust/crates/rawpointer-0.2.1.crate) = 7490
-SHA256 (rust/crates/rayon-1.9.0.crate) = e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd
-SIZE (rust/crates/rayon-1.9.0.crate) = 177770
+SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
+SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
 SHA256 (rust/crates/rc2-0.8.1.crate) = 62c64daa8e9438b84aaae55010a93f396f8e60e3911590fcba770d04643fc1dd
@@ -857,14 +869,16 @@ SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustix-0.38.31.crate) = 6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949
 SIZE (rust/crates/rustix-0.38.31.crate) = 375443
-SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
-SIZE (rust/crates/rustls-0.21.10.crate) = 284920
-SHA256 (rust/crates/rustls-0.22.2.crate) = e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41
-SIZE (rust/crates/rustls-0.22.2.crate) = 332080
+SHA256 (rust/crates/rustls-0.21.11.crate) = 7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4
+SIZE (rust/crates/rustls-0.21.11.crate) = 284815
+SHA256 (rust/crates/rustls-0.22.4.crate) = bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432
+SIZE (rust/crates/rustls-0.22.4.crate) = 333681
 SHA256 (rust/crates/rustls-native-certs-0.6.3.crate) = a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00
 SIZE (rust/crates/rustls-native-certs-0.6.3.crate) = 24438
 SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
 SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
+SHA256 (rust/crates/rustls-pemfile-2.1.2.crate) = 29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d
+SIZE (rust/crates/rustls-pemfile-2.1.2.crate) = 25928
 SHA256 (rust/crates/rustls-pki-types-1.3.1.crate) = 5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8
 SIZE (rust/crates/rustls-pki-types-1.3.1.crate) = 21637
 SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
@@ -913,8 +927,8 @@ SHA256 (rust/crates/serde-aux-4.5.0.crate) = 0d2e8bfba469d06512e11e3311d4d051a4a
 SIZE (rust/crates/serde-aux-4.5.0.crate) = 12448
 SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
 SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
-SHA256 (rust/crates/serde_json-1.0.114.crate) = c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0
-SIZE (rust/crates/serde_json-1.0.114.crate) = 146986
+SHA256 (rust/crates/serde_json-1.0.116.crate) = 3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813
+SIZE (rust/crates/serde_json-1.0.116.crate) = 146790
 SHA256 (rust/crates/serde_path_to_error-0.1.15.crate) = ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c
 SIZE (rust/crates/serde_path_to_error-0.1.15.crate) = 16623
 SHA256 (rust/crates/serde_qs-0.8.5.crate) = c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6
@@ -967,8 +981,8 @@ SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613
 SIZE (rust/crates/spin-0.5.2.crate) = 12004
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
-SHA256 (rust/crates/spirv-0.2.0+1.5.4.crate) = 246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830
-SIZE (rust/crates/spirv-0.2.0+1.5.4.crate) = 30491
+SHA256 (rust/crates/spirv-0.3.0+sdk-1.3.268.0.crate) = eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844
+SIZE (rust/crates/spirv-0.3.0+sdk-1.3.268.0.crate) = 30802
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
@@ -1019,10 +1033,10 @@ SHA256 (rust/crates/terminal_size-0.3.0.crate) = 21bebf2b7c9e0a515f6e0f8c51dc0f8
 SIZE (rust/crates/terminal_size-0.3.0.crate) = 10096
 SHA256 (rust/crates/text_placeholder-0.5.0.crate) = 512104f982ce6f50def5340f9d7d14cc21f7a859e9ccd251aa19d12e1345c070
 SIZE (rust/crates/text_placeholder-0.5.0.crate) = 7102
-SHA256 (rust/crates/thiserror-1.0.57.crate) = 1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b
-SIZE (rust/crates/thiserror-1.0.57.crate) = 20993
-SHA256 (rust/crates/thiserror-impl-1.0.57.crate) = a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81
-SIZE (rust/crates/thiserror-impl-1.0.57.crate) = 15639
+SHA256 (rust/crates/thiserror-1.0.59.crate) = f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa
+SIZE (rust/crates/thiserror-1.0.59.crate) = 21040
+SHA256 (rust/crates/thiserror-impl-1.0.59.crate) = d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66
+SIZE (rust/crates/thiserror-impl-1.0.59.crate) = 15726
 SHA256 (rust/crates/thread-tree-0.3.3.crate) = ffbd370cb847953a25954d9f63e14824a36113f8c72eecf6eccef5dc4b45d630
 SIZE (rust/crates/thread-tree-0.3.3.crate) = 12263
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
@@ -1153,8 +1167,8 @@ SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dc
 SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
 SHA256 (rust/crates/utime-0.3.1.crate) = 91baa0c65eabd12fcbdac8cc35ff16159cab95cae96d0222d6d0271db6193cef
 SIZE (rust/crates/utime-0.3.1.crate) = 8311
-SHA256 (rust/crates/uuid-1.7.0.crate) = f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a
-SIZE (rust/crates/uuid-1.7.0.crate) = 42627
+SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
+SIZE (rust/crates/uuid-1.8.0.crate) = 44043
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
 SIZE (rust/crates/valuable-0.1.0.crate) = 27718
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
@@ -1189,8 +1203,8 @@ SHA256 (rust/crates/wasm-bindgen-shared-0.2.91.crate) = 4f186bd2dcf04330886ce82d
 SIZE (rust/crates/wasm-bindgen-shared-0.2.91.crate) = 7267
 SHA256 (rust/crates/wasm-streams-0.4.0.crate) = b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129
 SIZE (rust/crates/wasm-streams-0.4.0.crate) = 34328
-SHA256 (rust/crates/web-sys-0.3.64.crate) = 9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b
-SIZE (rust/crates/web-sys-0.3.64.crate) = 725584
+SHA256 (rust/crates/web-sys-0.3.68.crate) = 96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446
+SIZE (rust/crates/web-sys-0.3.68.crate) = 728353
 SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
 SIZE (rust/crates/web-time-1.1.0.crate) = 18026
 SHA256 (rust/crates/webpki-roots-0.25.4.crate) = 5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1
@@ -1199,14 +1213,14 @@ SHA256 (rust/crates/webpki-roots-0.26.1.crate) = b3de34ae270483955a94f4b21bdaaeb
 SIZE (rust/crates/webpki-roots-0.26.1.crate) = 249748
 SHA256 (rust/crates/weezl-0.1.8.crate) = 53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082
 SIZE (rust/crates/weezl-0.1.8.crate) = 42175
-SHA256 (rust/crates/wgpu-0.18.0.crate) = 30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24
-SIZE (rust/crates/wgpu-0.18.0.crate) = 99673
-SHA256 (rust/crates/wgpu-core-0.18.1.crate) = ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726
-SIZE (rust/crates/wgpu-core-0.18.1.crate) = 225351
-SHA256 (rust/crates/wgpu-hal-0.18.1.crate) = b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9
-SIZE (rust/crates/wgpu-hal-0.18.1.crate) = 268148
-SHA256 (rust/crates/wgpu-types-0.18.0.crate) = 0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd
-SIZE (rust/crates/wgpu-types-0.18.0.crate) = 55501
+SHA256 (rust/crates/wgpu-0.19.4.crate) = cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01
+SIZE (rust/crates/wgpu-0.19.4.crate) = 140361
+SHA256 (rust/crates/wgpu-core-0.19.4.crate) = 28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a
+SIZE (rust/crates/wgpu-core-0.19.4.crate) = 235954
+SHA256 (rust/crates/wgpu-hal-0.19.4.crate) = fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3
+SIZE (rust/crates/wgpu-hal-0.19.4.crate) = 290171
+SHA256 (rust/crates/wgpu-types-0.19.2.crate) = b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805
+SIZE (rust/crates/wgpu-types-0.19.2.crate) = 59463
 SHA256 (rust/crates/which-4.4.2.crate) = 87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7
 SIZE (rust/crates/which-4.4.2.crate) = 15953
 SHA256 (rust/crates/which-5.0.0.crate) = 9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14
@@ -1319,9 +1333,9 @@ SHA256 (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz)
 SIZE (ankitects-rust-url-bb930b8d089f4d30d7d19c12e54e66191de47b88_GH0.tar.gz) = 394844
 SHA256 (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 58ac773ba2e7c76a9ec3f59ee9571576d76e74d58c4974a1d606d6976e1be70e
 SIZE (ankitects-linkcheck-184b2ca50ed39ca43da13f0b830a463861adb9ca_GH0.tar.gz) = 19408
-SHA256 (ankitects-anki-24.04.1_GH0.tar.gz) = 7cebd7745830392f9b6ec62c2300f3c45c934969b47f25275ecee0ee53f9aa68
-SIZE (ankitects-anki-24.04.1_GH0.tar.gz) = 2394990
-SHA256 (ankitects-anki-core-i18n-e3af3c9_GH0.tar.gz) = cc200bd648b33242445972ebe4d793839abb8cef53901cd116dea2ed4e542344
-SIZE (ankitects-anki-core-i18n-e3af3c9_GH0.tar.gz) = 1295301
-SHA256 (ankitects-anki-desktop-ftl-4515531_GH0.tar.gz) = 53e7b96e2d82a40be859d3dfa0ce1ea62d8f706d58baddcb8e183f7d7a8e6e12
-SIZE (ankitects-anki-desktop-ftl-4515531_GH0.tar.gz) = 218559
+SHA256 (ankitects-anki-24.06.2_GH0.tar.gz) = 44500df78bea9b197fd9a4f10949797a103098396f8250d5d8293aa79ad8d41e
+SIZE (ankitects-anki-24.06.2_GH0.tar.gz) = 2388832
+SHA256 (ankitects-anki-core-i18n-50fdc91_GH0.tar.gz) = d5135ead3b048ec1a675ca90b3022a09b6ca00e5bbfbf49824bc1e9ca2857071
+SIZE (ankitects-anki-core-i18n-50fdc91_GH0.tar.gz) = 1323736
+SHA256 (ankitects-anki-desktop-ftl-e747f9e_GH0.tar.gz) = cc0a11aa250da6a89461305d3918fe37ccabe3c4b2480065287293f027ea4d47
+SIZE (ankitects-anki-desktop-ftl-e747f9e_GH0.tar.gz) = 220416
diff --git a/games/anki/files/patch-package.json b/games/anki/files/patch-package.json
new file mode 100644
index 000000000000..ce2d9fce1fe1
--- /dev/null
+++ b/games/anki/files/patch-package.json
@@ -0,0 +1,23 @@
+Use the WASM build to prevent the following error during build:
+
+Error: Your current platform "freebsd" and architecture "x64" combination is not yet supported by the native Rollup build. Please use the WASM build "@rollup/wasm-node" instead.
+
+The following platform-architecture combinations are supported:
+[...]
+
+If this is important to you, please consider supporting Rollup to make a native build for your platform and architecture available.
+    at Object.<anonymous> (/wrkdirs/usr/ports/games/anki/work/anki-24.06.2/out/node_modules/rollup/dist/native.js:38:8)
+    [...]
+
+--- package.json.orig	2024-04-13 08:02:54 UTC
++++ package.json
+@@ -78,7 +78,8 @@
+         "hammerjs": "^2.0.8"
+     },
+     "resolutions": {
+-        "canvas": "npm:empty-npm-package"
++        "canvas": "npm:empty-npm-package",
++        "rollup": "npm:@rollup/wasm-node"
+     },
+     "browserslist": [
+         "defaults",
diff --git a/games/anki/pkg-plist b/games/anki/pkg-plist
index 03fb06169b36..9d8d147e1aa3 100644
--- a/games/anki/pkg-plist
+++ b/games/anki/pkg-plist
@@ -132,35 +132,105 @@ share/man/man1/anki.1.gz
 %%DATADIR%%/_aqt/data/web/js/vendor/mathjax/tex-chtml-full.js
 %%DATADIR%%/_aqt/data/web/js/vendor/plot.js
 %%DATADIR%%/_aqt/data/web/js/webview.js
-%%DATADIR%%/_aqt/data/web/pages/card-info.css
-%%DATADIR%%/_aqt/data/web/pages/card-info.html
-%%DATADIR%%/_aqt/data/web/pages/card-info.js
-%%DATADIR%%/_aqt/data/web/pages/change-notetype.css
-%%DATADIR%%/_aqt/data/web/pages/change-notetype.html
-%%DATADIR%%/_aqt/data/web/pages/change-notetype.js
-%%DATADIR%%/_aqt/data/web/pages/congrats.css
-%%DATADIR%%/_aqt/data/web/pages/congrats.html
-%%DATADIR%%/_aqt/data/web/pages/congrats.js
-%%DATADIR%%/_aqt/data/web/pages/deck-options.css
-%%DATADIR%%/_aqt/data/web/pages/deck-options.html
-%%DATADIR%%/_aqt/data/web/pages/deck-options.js
 %%DATADIR%%/_aqt/data/web/pages/editable.css
 %%DATADIR%%/_aqt/data/web/pages/editable.js
-%%DATADIR%%/_aqt/data/web/pages/graphs.css
-%%DATADIR%%/_aqt/data/web/pages/graphs.html
-%%DATADIR%%/_aqt/data/web/pages/graphs.js
-%%DATADIR%%/_aqt/data/web/pages/image-occlusion.css
-%%DATADIR%%/_aqt/data/web/pages/image-occlusion.html
-%%DATADIR%%/_aqt/data/web/pages/image-occlusion.js
-%%DATADIR%%/_aqt/data/web/pages/import-anki-package.css
-%%DATADIR%%/_aqt/data/web/pages/import-anki-package.html
-%%DATADIR%%/_aqt/data/web/pages/import-anki-package.js
-%%DATADIR%%/_aqt/data/web/pages/import-csv.css
-%%DATADIR%%/_aqt/data/web/pages/import-csv.html
-%%DATADIR%%/_aqt/data/web/pages/import-csv.js
-%%DATADIR%%/_aqt/data/web/pages/import-page.css
-%%DATADIR%%/_aqt/data/web/pages/import-page.html
-%%DATADIR%%/_aqt/data/web/pages/import-page.js
+%%DATADIR%%/_aqt/data/web/sveltekit/_app/env.js
+@comment Several *.css and *.mjs files of sveltekit have a computed filename.
+@comment As it is user-specific it is impossible to know their filename in
+@comment advance thus they're autogenerated for the plist during build.
+@comment The affected files are kept here for reference.
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/0.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/11.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/2.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/3.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/4.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/5.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/6.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/9.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Badge.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/ButtonGroup.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/ButtonToolbar.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Col.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Container.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/EnumSelectorRow.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/EnumSelectorRow.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/IconButton.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/ImageOcclusionPage.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/ImportPage.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/LabelButton.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Row.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Select.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/Shortcut.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/StickyContainer.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/TagEditor.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/TagEditor.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/TitledContainer.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/WithTooltip.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_layout.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/_page.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/functional.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/assets/index.GUESS_ME.css
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Badge.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/ButtonGroup.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Col.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Component.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Container.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/EnumSelectorRow.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/IconButton.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/ImageOcclusionPage.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/ImportPage.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/LabelButton.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Row.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Select.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/Shortcut.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/StickyContainer.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/TagEditor.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/TitledContainer.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/WithTooltip.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/_commonjsHelpers.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/await_block.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/backend.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/bridgecommand.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/cloneDeep.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/context-keys.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/cross-browser.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/each.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/entry.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/ftl.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/functional.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/helpers.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/index.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/index.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/index.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/isObject.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/progress.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/runtime-require.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/stores.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/theme.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/time.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/chunks/utils.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/entry/app.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/entry/start.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/0.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/1.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/10.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/11.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/2.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/3.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/4.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/5.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/6.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/7.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/8.GUESS_ME.mjs
+@comment %%DATADIR%%/_aqt/data/web/sveltekit/_app/immutable/nodes/9.GUESS_ME.mjs
+%%DATADIR%%/_aqt/data/web/sveltekit/_app/version.json
+%%DATADIR%%/_aqt/data/web/sveltekit/index.html
 %%DATADIR%%/_aqt/forms/about_qt5.py
 %%DATADIR%%/_aqt/forms/about_qt6.py
 %%DATADIR%%/_aqt/forms/addcards_qt5.py
diff --git a/games/automuteus/Makefile b/games/automuteus/Makefile
index bb3ef8eb59a6..6d155d517be8 100644
--- a/games/automuteus/Makefile
+++ b/games/automuteus/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	automuteus
 DISTVERSION=	7.2.7
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	games
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/games/jumpy/Makefile b/games/jumpy/Makefile
index d84a438c1921..67f0256fb48b 100644
--- a/games/jumpy/Makefile
+++ b/games/jumpy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jumpy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.12.0
+DISTVERSION=	0.12.1
 CATEGORIES=	games wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,6 +11,9 @@ LICENSE=	CC-BY-NC-4.0 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/licenses/LICENSE-MIT
 
+BROKEN_aarch64=	need https://github.com/shellrow/netdev/pull/71
+BROKEN_armv7=	need https://github.com/shellrow/netdev/pull/71
+
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libudev.so:devel/libudev-devd
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
@@ -23,7 +26,7 @@ WITHOUT_LTO=	yes # XXX bug 277333 # bevy_dylib
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
-.if ${MACHINE_ARCH} == i386
+.if ${MACHINE_ARCH} == i386 || "${MACHINE_ARCH:Marmv?}" != ""
 # https://github.com/rust-lang/rust/issues/85598
 CARGO_ENV+=	CARGO_PROFILE_RELEASE_LTO=false
 # https://github.com/briansmith/ring/issues/1793#issuecomment-1793243725
diff --git a/games/jumpy/Makefile.crates b/games/jumpy/Makefile.crates
index 480db76dea0e..35e4dca2dc0f 100644
--- a/games/jumpy/Makefile.crates
+++ b/games/jumpy/Makefile.crates
@@ -7,6 +7,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		accesskit_winit-0.14.4 \
 		addr2line-0.21.0 \
 		adler-1.0.2 \
+		aead-0.5.2 \
 		ahash-0.8.11 \
 		aho-corasick-1.1.3 \
 		allocator-api2-0.2.18 \
@@ -14,6 +15,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		alsa-sys-0.3.1 \
 		android-activity-0.4.3 \
 		android-properties-0.2.2 \
+		android-tzdata-0.1.1 \
 		android_log-sys-0.3.1 \
 		android_system_properties-0.1.5 \
 		anyhow-1.0.82 \
@@ -23,18 +25,28 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		arrayref-0.3.7 \
 		arrayvec-0.7.4 \
 		ash-0.37.3+1.3.251 \
+		asn1-rs-0.5.2 \
+		asn1-rs-0.6.1 \
+		asn1-rs-derive-0.4.0 \
+		asn1-rs-derive-0.5.0 \
+		asn1-rs-impl-0.1.0 \
+		asn1-rs-impl-0.2.0 \
 		async-channel-1.9.0 \
 		async-executor-1.11.0 \
-		async-io-2.3.2 \
-		async-lock-3.3.0 \
 		async-task-4.7.0 \
+		async-trait-0.1.80 \
 		atomic-arena-0.1.1 \
 		atomic-polyfill-1.0.3 \
 		atomicell-0.2.0 \
+		attohttpc-0.24.1 \
 		autocfg-1.2.0 \
+		backoff-0.4.0 \
 		backtrace-0.3.71 \
+		bao-tree-0.13.0 \
+		base16ct-0.2.0 \
 		base64-0.21.7 \
 		base64-0.22.0 \
+		base64ct-1.6.0 \
 		bevy-0.11.3 \
 		bevy_a11y-0.11.3 \
 		bevy_app-0.11.3 \
@@ -73,6 +85,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		bevy_utils_proc_macros-0.11.3 \
 		bevy_window-0.11.3 \
 		bevy_winit-0.11.3 \
+		binary-merge-0.1.2 \
 		bincode-1.3.3 \
 		bindgen-0.69.4 \
 		bit-set-0.5.3 \
@@ -87,6 +100,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		block-buffer-0.10.4 \
 		block-sys-0.1.0-beta.1 \
 		block2-0.2.0-alpha.6 \
+		bounded-integer-0.5.7 \
 		branches-0.1.3 \
 		bs58-0.5.1 \
 		bumpalo-3.16.0 \
@@ -100,6 +114,9 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		cexpr-0.6.0 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
+		chacha20-0.9.1 \
+		chrono-0.4.38 \
+		cipher-0.4.4 \
 		clang-sys-1.7.0 \
 		clipboard-win-5.3.0 \
 		cobs-0.2.3 \
@@ -109,11 +126,13 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		combine-4.6.7 \
 		concurrent-queue-2.4.0 \
 		console_error_panic_hook-0.1.7 \
+		const-oid-0.9.6 \
 		const_fn-0.4.9 \
 		const_format-0.2.32 \
 		const_format_proc_macros-0.2.32 \
 		const_panic-0.2.8 \
 		const_soft_float-0.1.4 \
+		constant_time_eq-0.3.0 \
 		constgebra-0.1.4 \
 		core-foundation-0.9.4 \
 		core-foundation-sys-0.8.6 \
@@ -124,6 +143,8 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		coreaudio-sys-0.2.15 \
 		cpal-0.15.3 \
 		cpufeatures-0.2.12 \
+		crc-3.2.1 \
+		crc-catalog-2.4.0 \
 		crc32fast-1.4.0 \
 		critical-section-1.1.2 \
 		crossbeam-0.8.4 \
@@ -132,27 +153,45 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		crossbeam-epoch-0.9.18 \
 		crossbeam-queue-0.3.11 \
 		crossbeam-utils-0.8.19 \
+		crypto-bigint-0.5.5 \
 		crypto-common-0.1.6 \
+		crypto_box-0.9.1 \
+		crypto_secretbox-0.1.1 \
 		csscolorparser-0.6.2 \
+		curve25519-dalek-4.1.2 \
+		curve25519-dalek-derive-0.1.1 \
 		d3d12-0.6.0 \
 		dashmap-5.5.3 \
 		dasp_sample-0.11.0 \
 		data-encoding-2.5.0 \
+		der-0.7.9 \
+		der-parser-8.2.0 \
+		der-parser-9.0.0 \
+		der_derive-0.7.2 \
 		deranged-0.3.11 \
+		derive_more-1.0.0-beta.6 \
+		derive_more-impl-1.0.0-beta.6 \
 		digest-0.10.7 \
 		directories-5.0.1 \
 		dirs-sys-0.4.1 \
 		dispatch-0.2.0 \
 		displaydoc-0.2.4 \
 		dlib-0.5.2 \
+		dlopen2-0.5.0 \
 		document-features-0.2.8 \
 		downcast-rs-1.2.1 \
+		dtoa-1.0.9 \
+		duct-0.13.7 \
+		ecdsa-0.16.9 \
 		ecolor-0.23.0 \
+		ed25519-2.2.3 \
+		ed25519-dalek-2.1.1 \
 		egui-0.23.0 \
 		egui_extras-0.23.0 \
 		egui_plot-0.23.0 \
 		ehttp-0.3.1 \
 		either-1.11.0 \
+		elliptic-curve-0.13.8 \
 		elsa-1.10.0 \
 		emath-0.23.0 \
 		embedded-io-0.4.0 \
@@ -160,22 +199,28 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		encase_derive-0.6.1 \
 		encase_derive_impl-0.6.1 \
 		encoding_rs-0.8.34 \
+		enum-as-inner-0.6.0 \
 		enum-map-2.7.3 \
 		enum-map-derive-0.17.0 \
+		enumflags2-0.7.9 \
+		enumflags2_derive-0.7.9 \
 		enumn-0.1.13 \
 		epaint-0.23.0 \
 		equivalent-1.0.1 \
 		erased-serde-0.3.31 \
 		erased-serde-0.4.4 \
+		erased_set-0.7.0 \
 		errno-0.3.8 \
 		error-code-3.2.0 \
 		euclid-0.22.9 \
 		event-listener-2.5.3 \
 		event-listener-4.0.3 \
-		event-listener-strategy-0.4.0 \
+		fallible-iterator-0.3.0 \
 		fastrand-1.9.0 \
 		fastrand-2.0.2 \
 		fdeflate-0.3.4 \
+		ff-0.13.0 \
+		fiat-crypto-0.2.9 \
 		filetime-0.2.23 \
 		fixedbitset-0.4.2 \
 		flate2-1.0.28 \
@@ -195,7 +240,9 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		fsevent-sys-4.1.0 \
 		funty-2.0.0 \
 		futures-0.3.30 \
+		futures-buffered-0.2.4 \
 		futures-channel-0.3.30 \
+		futures-concurrency-7.6.0 \
 		futures-core-0.3.30 \
 		futures-executor-0.3.30 \
 		futures-io-0.3.30 \
@@ -204,10 +251,14 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		futures-macro-0.3.30 \
 		futures-sink-0.3.30 \
 		futures-task-0.3.30 \
+		futures-timer-3.0.3 \
 		futures-util-0.3.30 \
 		fxhash-0.2.1 \
 		gc-arena-0.5.0 \
 		gc-arena-derive-0.5.0 \
+		genawaiter-0.99.1 \
+		genawaiter-macro-0.99.1 \
+		genawaiter-proc-macro-0.99.1 \
 		generic-array-0.14.7 \
 		gethostname-0.4.3 \
 		getrandom-0.2.14 \
@@ -219,12 +270,15 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		glam-0.25.0 \
 		glob-0.3.1 \
 		glow-0.12.3 \
+		governor-0.6.3 \
 		gpu-alloc-0.5.4 \
 		gpu-alloc-types-0.2.0 \
 		gpu-allocator-0.22.0 \
 		gpu-descriptor-0.2.4 \
 		gpu-descriptor-types-0.1.2 \
+		group-0.13.0 \
 		guillotiere-0.6.2 \
+		h2-0.3.26 \
 		hash32-0.2.1 \
 		hashbrown-0.12.3 \
 		hashbrown-0.14.3 \
@@ -235,22 +289,54 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		hex-0.4.3 \
 		hexasphere-9.1.0 \
 		hexf-parse-0.2.1 \
+		hickory-proto-0.24.1 \
+		hickory-resolver-0.24.1 \
+		hmac-0.12.1 \
+		hmac-sha1-0.2.2 \
+		hmac-sha256-1.1.7 \
 		home-0.5.9 \
+		hostname-0.3.1 \
+		hostname-validator-1.1.1 \
+		http-0.2.12 \
+		http-1.1.0 \
+		http-body-0.4.6 \
+		http-body-1.0.0 \
+		http-body-util-0.1.1 \
+		httparse-1.8.0 \
+		httpdate-1.0.3 \
 		humantime-2.1.0 \
 		humantime-serde-1.1.1 \
+		hyper-0.14.28 \
+		hyper-1.3.1 \
+		hyper-rustls-0.24.2 \
+		hyper-util-0.1.3 \
 		iana-time-zone-0.1.60 \
 		iana-time-zone-haiku-0.1.2 \
+		idna-0.4.0 \
 		idna-0.5.0 \
 		if-addrs-0.10.2 \
+		igd-next-0.14.3 \
 		image-0.24.9 \
 		indexmap-1.9.3 \
 		indexmap-2.2.6 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
+		inout-0.1.3 \
+		inplace-vec-builder-0.1.1 \
 		instant-0.1.12 \
 		intl-memoizer-0.5.1 \
 		intl_pluralrules-7.0.2 \
 		io-kit-sys-0.3.0 \
+		ipconfig-0.3.2 \
+		ipnet-2.9.0 \
+		iroh-base-0.16.2 \
+		iroh-blake3-1.4.5 \
+		iroh-io-0.6.0 \
+		iroh-metrics-0.16.2 \
+		iroh-net-0.16.2 \
+		iroh-quinn-0.10.4 \
+		iroh-quinn-proto-0.10.7 \
+		iroh-quinn-udp-0.4.1 \
 		is_debug-1.0.1 \
 		itertools-0.10.5 \
 		itoa-1.0.11 \
@@ -274,10 +360,12 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		libredox-0.1.3 \
 		libudev-sys-0.1.4 \
 		libz-sys-1.1.16 \
+		linked-hash-map-0.5.6 \
 		linux-raw-sys-0.4.13 \
 		litrs-0.4.1 \
 		lock_api-0.4.11 \
 		log-0.4.21 \
+		lru-cache-0.1.2 \
 		lyon_algorithms-1.0.4 \
 		lyon_geom-1.0.5 \
 		lyon_path-1.0.4 \
@@ -285,14 +373,18 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		lz4_flex-0.11.3 \
 		mach2-0.4.2 \
 		malloc_buf-0.0.6 \
+		match_cfg-0.1.0 \
 		matchers-0.1.0 \
 		matrixmultiply-0.3.8 \
 		maybe-owned-0.3.4 \
+		md5-0.7.0 \
 		mdns-sd-0.10.5 \
+		memalloc-0.1.0 \
 		memchr-2.7.2 \
 		memmap2-0.5.10 \
 		memoffset-0.6.5 \
 		metal-0.24.0 \
+		mime-0.3.17 \
 		minimal-lexical-0.2.1 \
 		miniz_oxide-0.7.2 \
 		mint-0.5.9 \
@@ -301,27 +393,41 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		naga_oil-0.8.2 \
 		nalgebra-0.32.5 \
 		nalgebra-macros-0.2.1 \
+		nanorand-0.7.0 \
 		natord-1.0.9 \
 		ndk-0.7.0 \
 		ndk-0.8.0 \
 		ndk-context-0.1.1 \
 		ndk-sys-0.4.1+23.1.7779620 \
 		ndk-sys-0.5.0+25.2.9519653 \
+		netdev-0.25.0 \
+		netlink-packet-core-0.7.0 \
+		netlink-packet-route-0.17.1 \
+		netlink-packet-utils-0.5.2 \
+		netlink-proto-0.11.3 \
+		netlink-sys-0.8.6 \
 		nix-0.24.3 \
 		nix-0.25.1 \
 		nix-0.26.4 \
+		no-std-compat-0.4.1 \
+		no-std-net-0.6.0 \
 		nohash-hasher-0.2.0 \
 		noise-0.9.0 \
 		nom-7.1.3 \
+		nonzero_ext-0.3.0 \
 		notify-6.1.1 \
 		ntapi-0.4.1 \
 		nu-ansi-term-0.46.0 \
+		num-bigint-0.4.5 \
+		num-bigint-dig-0.8.4 \
 		num-complex-0.4.5 \
 		num-conv-0.1.0 \
 		num-derive-0.4.2 \
 		num-integer-0.1.46 \
+		num-iter-0.1.45 \
 		num-rational-0.4.1 \
 		num-traits-0.2.18 \
+		num_cpus-1.16.0 \
 		num_enum-0.5.11 \
 		num_enum-0.6.1 \
 		num_enum-0.7.2 \
@@ -340,14 +446,21 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		object-0.32.2 \
 		oboe-0.6.1 \
 		oboe-sys-0.6.1 \
+		oid-registry-0.6.1 \
+		oid-registry-0.7.0 \
 		once_cell-1.19.0 \
 		once_map-0.4.16 \
+		opaque-debug-0.3.1 \
 		openssl-probe-0.1.5 \
 		option-ext-0.2.0 \
 		orbclient-0.3.47 \
 		ordered-float-3.9.2 \
+		os_pipe-1.1.5 \
 		overload-0.1.1 \
 		owned_ttf_parser-0.20.0 \
+		p256-0.13.2 \
+		p384-0.13.0 \
+		p521-0.13.3 \
 		parking-2.2.0 \
 		parking_lot-0.12.1 \
 		parking_lot_core-0.9.9 \
@@ -359,7 +472,12 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		peg-macros-0.8.2 \
 		peg-runtime-0.8.2 \
 		pem-3.0.4 \
+		pem-rfc7468-0.7.0 \
 		percent-encoding-2.3.1 \
+		pest-2.7.10 \
+		pest_derive-2.7.10 \
+		pest_generator-2.7.10 \
+		pest_meta-2.7.10 \
 		petgraph-0.6.4 \
 		phf-0.11.2 \
 		phf_generator-0.11.2 \
@@ -371,24 +489,44 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
 		ping-rs-0.1.2 \
+		pkarr-1.1.5 \
+		pkcs1-0.7.5 \
+		pkcs8-0.10.2 \
 		pkg-config-0.3.30 \
+		platforms-3.4.0 \
+		pnet_base-0.34.0 \
+		pnet_macros-0.34.0 \
+		pnet_macros_support-0.34.0 \
+		pnet_packet-0.34.0 \
 		png-0.17.13 \
 		polling-2.8.0 \
-		polling-3.6.0 \
+		poly1305-0.8.0 \
+		portable-atomic-1.6.0 \
+		positioned-io-0.3.3 \
 		postcard-1.0.8 \
+		postcard-derive-0.1.1 \
 		powerfmt-0.2.0 \
 		pp-rs-0.2.1 \
 		ppv-lite86-0.2.17 \
+		precis-core-0.1.9 \
+		precis-profiles-0.1.10 \
+		precis-tools-0.1.7 \
+		primeorder-0.13.6 \
 		proc-macro-crate-1.3.1 \
 		proc-macro-crate-3.1.0 \
+		proc-macro-error-0.4.12 \
+		proc-macro-error-attr-0.4.12 \
+		proc-macro-hack-0.5.20+deprecated \
 		proc-macro2-1.0.80 \
 		profiling-1.0.15 \
+		prometheus-client-0.22.2 \
+		prometheus-client-derive-encode-0.4.2 \
 		puffin-0.17.0 \
 		puffin_egui-0.23.0 \
-		quinn-0.10.2 \
-		quinn-proto-0.10.6 \
-		quinn-udp-0.4.1 \
+		quanta-0.12.3 \
+		quick-error-1.2.3 \
 		quote-1.0.36 \
+		quoted-string-parser-0.1.0 \
 		radium-0.7.0 \
 		radsort-0.1.0 \
 		rand-0.8.5 \
@@ -396,27 +534,39 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		rand_core-0.6.4 \
 		rand_xorshift-0.3.0 \
 		range-alloc-0.1.3 \
+		range-collections-0.4.5 \
+		raw-cpuid-11.0.2 \
 		raw-window-handle-0.5.2 \
 		rawpointer-0.2.1 \
+		rcgen-0.11.3 \
 		rcgen-0.12.1 \
 		rectangle-pack-0.4.2 \
 		redox_syscall-0.3.5 \
 		redox_syscall-0.4.1 \
 		redox_users-0.4.5 \
+		ref-cast-1.0.23 \
+		ref-cast-impl-1.0.23 \
 		regex-1.10.4 \
 		regex-automata-0.1.10 \
 		regex-automata-0.4.6 \
+		regex-lite-0.1.5 \
 		regex-syntax-0.6.29 \
 		regex-syntax-0.8.3 \
 		renderdoc-sys-1.1.0 \
+		reqwest-0.11.27 \
+		resolv-conf-0.7.0 \
+		rfc6979-0.4.0 \
 		ring-0.16.20 \
 		ring-0.17.8 \
 		ringbuf-0.3.3 \
 		robust-1.1.0 \
 		ron-0.8.1 \
+		rsa-0.9.6 \
+		rtnetlink-0.13.1 \
 		rustc-demangle-0.1.23 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.4.0 \
+		rusticata-macros-4.1.0 \
 		rustix-0.38.32 \
 		rustls-0.21.11 \
 		rustls-0.22.4 \
@@ -428,12 +578,14 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		rustversion-1.0.15 \
 		ryu-1.0.17 \
 		safe_arch-0.7.1 \
+		salsa20-0.10.2 \
 		same-file-1.0.6 \
 		schannel-0.1.23 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
 		sct-0.7.1 \
 		sctk-adwaita-0.5.4 \
+		sec1-0.7.3 \
 		security-framework-2.10.0 \
 		security-framework-sys-2.10.0 \
 		self_cell-0.10.3 \
@@ -441,16 +593,24 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		semver-1.0.22 \
 		send_wrapper-0.6.0 \
 		serde-1.0.197 \
+		serde-error-0.1.2 \
 		serde_derive-1.0.197 \
 		serde_json-1.0.115 \
+		serde_urlencoded-0.7.1 \
 		serde_yaml-0.9.34+deprecated \
+		serdect-0.2.0 \
+		sha1-0.10.6 \
 		sha2-0.10.8 \
 		shadow-rs-0.25.0 \
 		sharded-slab-0.1.7 \
+		shared_child-1.0.0 \
 		shiftnanigans-0.3.3 \
 		shlex-1.3.0 \
+		signal-hook-registry-1.4.2 \
+		signature-2.2.0 \
 		simba-0.8.1 \
 		simd-adler32-0.3.7 \
+		simple-dns-0.6.2 \
 		siphasher-0.3.11 \
 		slab-0.4.9 \
 		slotmap-1.0.7 \
@@ -462,14 +622,26 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		spade-2.6.0 \
 		spin-0.5.2 \
 		spin-0.9.8 \
+		spinning_top-0.3.0 \
 		spirv-0.2.0+1.5.4 \
+		spki-0.7.3 \
 		sptr-0.3.2 \
+		ssh-cipher-0.2.0 \
+		ssh-encoding-0.2.0 \
+		ssh-key-0.6.6 \
 		stable_deref_trait-1.2.0 \
 		static_assertions-1.1.0 \
 		strict-num-0.1.1 \
+		struct_iterable-0.1.1 \
+		struct_iterable_derive-0.1.0 \
+		struct_iterable_internal-0.1.1 \
 		strum-0.25.0 \
+		strum-0.26.2 \
 		strum_macros-0.25.3 \
+		strum_macros-0.26.2 \
+		stun-rs-0.1.8 \
 		subtle-2.5.0 \
+		surge-ping-0.8.1 \
 		svg_fmt-0.4.2 \
 		svgtypes-0.8.2 \
 		symphonia-0.5.4 \
@@ -480,9 +652,16 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		symphonia-utils-xiph-0.5.4 \
 		syn-1.0.109 \
 		syn-2.0.58 \
+		syn-mid-0.5.4 \
+		sync_wrapper-0.1.2 \
+		synstructure-0.12.6 \
 		synstructure-0.13.1 \
 		sys-locale-0.3.1 \
 		sysinfo-0.29.11 \
+		system-configuration-0.5.1 \
+		system-configuration-0.6.0 \
+		system-configuration-sys-0.5.0 \
+		system-configuration-sys-0.6.0 \
 		tap-1.0.1 \
 		termcolor-1.4.1 \
 		thiserror-1.0.58 \
@@ -498,9 +677,14 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		tokio-1.37.0 \
+		tokio-macros-2.2.0 \
+		tokio-rustls-0.24.1 \
+		tokio-rustls-acme-0.3.0 \
+		tokio-util-0.7.11 \
 		toml_datetime-0.6.5 \
 		toml_edit-0.19.15 \
 		toml_edit-0.21.1 \
+		tower-service-0.3.2 \
 		tracing-0.1.40 \
 		tracing-attributes-0.1.27 \
 		tracing-core-0.1.32 \
@@ -508,7 +692,9 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		tracing-log-0.2.0 \
 		tracing-subscriber-0.3.18 \
 		tracing-wasm-0.2.1 \
+		try-lock-0.2.5 \
 		ttf-parser-0.20.0 \
+		ttl_cache-0.5.1 \
 		turborand-0.10.1 \
 		type-map-0.4.0 \
 		typenum-1.17.0 \
@@ -516,6 +702,8 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		tzdb-0.5.10 \
 		tzdb-0.6.1 \
 		tzdb_data-0.1.2 \
+		ucd-parse-0.1.13 \
+		ucd-trie-0.1.6 \
 		ulid-1.1.2 \
 		unic-langid-0.9.4 \
 		unic-langid-impl-0.9.4 \
@@ -524,6 +712,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		unicode-normalization-0.1.23 \
 		unicode-width-0.1.11 \
 		unicode-xid-0.2.4 \
+		universal-hash-0.5.1 \
 		unsafe-libyaml-0.2.11 \
 		untrusted-0.7.1 \
 		untrusted-0.9.0 \
@@ -540,6 +729,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		version_check-0.9.4 \
 		waker-fn-1.1.1 \
 		walkdir-2.5.0 \
+		want-0.3.1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.92 \
 		wasm-bindgen-backend-0.2.92 \
@@ -547,6 +737,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		wasm-bindgen-macro-0.2.92 \
 		wasm-bindgen-macro-support-0.2.92 \
 		wasm-bindgen-shared-0.2.92 \
+		watchable-1.1.2 \
 		wayland-client-0.29.5 \
 		wayland-commons-0.29.5 \
 		wayland-cursor-0.29.5 \
@@ -557,6 +748,7 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		web-time-0.2.4 \
 		web-time-1.1.0 \
 		webbrowser-0.8.15 \
+		webpki-roots-0.25.4 \
 		webpki-roots-0.26.1 \
 		weezl-0.1.8 \
 		wgpu-0.16.3 \
@@ -572,11 +764,16 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		windows-0.43.0 \
 		windows-0.44.0 \
 		windows-0.48.0 \
+		windows-0.51.1 \
+		windows-0.52.0 \
 		windows-0.54.0 \
+		windows-core-0.51.1 \
 		windows-core-0.52.0 \
 		windows-core-0.54.0 \
 		windows-implement-0.48.0 \
+		windows-implement-0.52.0 \
 		windows-interface-0.48.0 \
+		windows-interface-0.52.0 \
 		windows-result-0.1.1 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
@@ -608,16 +805,22 @@ CARGO_CRATES=	ab_glyph-0.2.25 \
 		windows_x86_64_msvc-0.52.5 \
 		winit-0.28.7 \
 		winnow-0.5.40 \
+		winreg-0.50.0 \
+		wmi-0.13.3 \
 		wyz-0.5.1 \
 		x11-dl-2.21.0 \
 		x11rb-0.13.0 \
 		x11rb-protocol-0.13.0 \
+		x509-parser-0.15.1 \
+		x509-parser-0.16.0 \
 		xcursor-0.3.5 \
 		xml-rs-0.8.20 \
+		xmltree-0.10.3 \
 		yasna-0.5.2 \
+		z32-1.1.1 \
 		zerocopy-0.7.32 \
 		zerocopy-derive-0.7.32 \
 		zeroize-1.7.0 \
 		rapier2d@git+https://github.com/MaxCWhitehead/rapier.git?rev=29c72c6c282e7c40987c0d0d0ce3089ea019a532\#29c72c6c282e7c40987c0d0d0ce3089ea019a532 \
-		ggrs@git+https://github.com/MaxCWhitehead/ggrs.git?rev=96499377407ce55805a9d0367b86860b74c233bd\#96499377407ce55805a9d0367b86860b74c233bd \
-		bones_asset,bones_bevy_renderer,bones_ecs,bones_ecs_macros,bones_ecs_macros_core,bones_framework,bones_lib,bones_matchmaker_proto,bones_schema,bones_schema_macros,bones_scripting,bones_utils,bones_utils_macros,quinn_runtime_bevy@git+https://github.com/fishfolk/bones\#b7db196ae92898e79575bdfe268c87f07585819d
+		bones_asset,bones_bevy_renderer,bones_ecs,bones_ecs_macros,bones_ecs_macros_core,bones_framework,bones_lib,bones_matchmaker_proto,bones_schema,bones_schema_macros,bones_scripting,bones_utils,bones_utils_macros@git+https://github.com/fishfolk/bones\#3cb6a880284514c8367ededa62d45e90f48c60b6 \
+		ggrs@git+https://github.com/MaxCWhitehead/ggrs.git?rev=96499377407ce55805a9d0367b86860b74c233bd\#96499377407ce55805a9d0367b86860b74c233bd
diff --git a/games/jumpy/distinfo b/games/jumpy/distinfo
index 49c3796cb680..e279be866e0c 100644
--- a/games/jumpy/distinfo
+++ b/games/jumpy/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1713765153
+TIMESTAMP = 1716071613
 SHA256 (rust/crates/ab_glyph-0.2.25.crate) = 6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775
 SIZE (rust/crates/ab_glyph-0.2.25.crate) = 19105
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
@@ -17,6 +17,8 @@ SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/aead-0.5.2.crate) = d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0
+SIZE (rust/crates/aead-0.5.2.crate) = 15509
 SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
 SIZE (rust/crates/ahash-0.8.11.crate) = 43607
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
@@ -31,6 +33,8 @@ SHA256 (rust/crates/android-activity-0.4.3.crate) = 64529721f27c2314ced0890ce45e
 SIZE (rust/crates/android-activity-0.4.3.crate) = 238185
 SHA256 (rust/crates/android-properties-0.2.2.crate) = fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04
 SIZE (rust/crates/android-properties-0.2.2.crate) = 4563
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
 SHA256 (rust/crates/android_log-sys-0.3.1.crate) = 5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937
 SIZE (rust/crates/android_log-sys-0.3.1.crate) = 6063
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
@@ -49,30 +53,50 @@ SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2
 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
 SHA256 (rust/crates/ash-0.37.3+1.3.251.crate) = 39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a
 SIZE (rust/crates/ash-0.37.3+1.3.251.crate) = 449524
+SHA256 (rust/crates/asn1-rs-0.5.2.crate) = 7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0
+SIZE (rust/crates/asn1-rs-0.5.2.crate) = 82934
+SHA256 (rust/crates/asn1-rs-0.6.1.crate) = 22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d
+SIZE (rust/crates/asn1-rs-0.6.1.crate) = 84743
+SHA256 (rust/crates/asn1-rs-derive-0.4.0.crate) = 726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c
+SIZE (rust/crates/asn1-rs-derive-0.4.0.crate) = 5220
+SHA256 (rust/crates/asn1-rs-derive-0.5.0.crate) = 7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1
+SIZE (rust/crates/asn1-rs-derive-0.5.0.crate) = 5234
+SHA256 (rust/crates/asn1-rs-impl-0.1.0.crate) = 2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed
+SIZE (rust/crates/asn1-rs-impl-0.1.0.crate) = 2256
+SHA256 (rust/crates/asn1-rs-impl-0.2.0.crate) = 7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7
+SIZE (rust/crates/asn1-rs-impl-0.2.0.crate) = 2261
 SHA256 (rust/crates/async-channel-1.9.0.crate) = 81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35
 SIZE (rust/crates/async-channel-1.9.0.crate) = 13664
 SHA256 (rust/crates/async-executor-1.11.0.crate) = b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a
 SIZE (rust/crates/async-executor-1.11.0.crate) = 24767
-SHA256 (rust/crates/async-io-2.3.2.crate) = dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884
-SIZE (rust/crates/async-io-2.3.2.crate) = 49298
-SHA256 (rust/crates/async-lock-3.3.0.crate) = d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b
-SIZE (rust/crates/async-lock-3.3.0.crate) = 33286
 SHA256 (rust/crates/async-task-4.7.0.crate) = fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799
 SIZE (rust/crates/async-task-4.7.0.crate) = 38906
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
 SHA256 (rust/crates/atomic-arena-0.1.1.crate) = 5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10
 SIZE (rust/crates/atomic-arena-0.1.1.crate) = 12102
 SHA256 (rust/crates/atomic-polyfill-1.0.3.crate) = 8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4
 SIZE (rust/crates/atomic-polyfill-1.0.3.crate) = 11581
 SHA256 (rust/crates/atomicell-0.2.0.crate) = bf53d6c43ea3fa42a5d18d6060081bcfddeca7c63faa64e65a59c4372bbe173b
 SIZE (rust/crates/atomicell-0.2.0.crate) = 13910
+SHA256 (rust/crates/attohttpc-0.24.1.crate) = 8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2
+SIZE (rust/crates/attohttpc-0.24.1.crate) = 60895
 SHA256 (rust/crates/autocfg-1.2.0.crate) = f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80
 SIZE (rust/crates/autocfg-1.2.0.crate) = 14808
+SHA256 (rust/crates/backoff-0.4.0.crate) = b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1
+SIZE (rust/crates/backoff-0.4.0.crate) = 26738
 SHA256 (rust/crates/backtrace-0.3.71.crate) = 26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d
 SIZE (rust/crates/backtrace-0.3.71.crate) = 86553
+SHA256 (rust/crates/bao-tree-0.13.0.crate) = f1f7a89a8ee5889d2593ae422ce6e1bb03e48a0e8a16e4fa0882dfcbe7e182ef
+SIZE (rust/crates/bao-tree-0.13.0.crate) = 229463
+SHA256 (rust/crates/base16ct-0.2.0.crate) = 4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf
+SIZE (rust/crates/base16ct-0.2.0.crate) = 10240
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
 SHA256 (rust/crates/base64-0.22.0.crate) = 9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51
 SIZE (rust/crates/base64-0.22.0.crate) = 81568
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
 SHA256 (rust/crates/bevy-0.11.3.crate) = 91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7
 SIZE (rust/crates/bevy-0.11.3.crate) = 345610
 SHA256 (rust/crates/bevy_a11y-0.11.3.crate) = 132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42
@@ -149,6 +173,8 @@ SHA256 (rust/crates/bevy_window-0.11.3.crate) = bd584c0da7c4ada6557b09f57f30fb7c
 SIZE (rust/crates/bevy_window-0.11.3.crate) = 18930
 SHA256 (rust/crates/bevy_winit-0.11.3.crate) = bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53
 SIZE (rust/crates/bevy_winit-0.11.3.crate) = 23870
+SHA256 (rust/crates/binary-merge-0.1.2.crate) = 597bb81c80a54b6a4381b23faba8d7774b144c94cbd1d6fe3f1329bd776554ab
+SIZE (rust/crates/binary-merge-0.1.2.crate) = 8406
 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
 SIZE (rust/crates/bincode-1.3.3.crate) = 28958
 SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
@@ -177,6 +203,8 @@ SHA256 (rust/crates/block-sys-0.1.0-beta.1.crate) = 0fa55741ee90902547802152aaf3
 SIZE (rust/crates/block-sys-0.1.0-beta.1.crate) = 9039
 SHA256 (rust/crates/block2-0.2.0-alpha.6.crate) = 8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42
 SIZE (rust/crates/block2-0.2.0-alpha.6.crate) = 10639
+SHA256 (rust/crates/bounded-integer-0.5.7.crate) = 78a6932c88f1d2c29533a3b8a5f5a2f84cc19c3339b431677c3160c5c2e6ca85
+SIZE (rust/crates/bounded-integer-0.5.7.crate) = 16123
 SHA256 (rust/crates/branches-0.1.3.crate) = 7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a
 SIZE (rust/crates/branches-0.1.3.crate) = 3299
 SHA256 (rust/crates/bs58-0.5.1.crate) = bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4
@@ -203,6 +231,12 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
 SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/chacha20-0.9.1.crate) = c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818
+SIZE (rust/crates/chacha20-0.9.1.crate) = 23424
+SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
+SIZE (rust/crates/chrono-0.4.38.crate) = 220559
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
 SHA256 (rust/crates/clang-sys-1.7.0.crate) = 67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1
 SIZE (rust/crates/clang-sys-1.7.0.crate) = 42088
 SHA256 (rust/crates/clipboard-win-5.3.0.crate) = d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee
@@ -221,6 +255,8 @@ SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f
 SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
 SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc
 SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
 SHA256 (rust/crates/const_fn-0.4.9.crate) = fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935
 SIZE (rust/crates/const_fn-0.4.9.crate) = 12624
 SHA256 (rust/crates/const_format-0.2.32.crate) = e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673
@@ -231,6 +267,8 @@ SHA256 (rust/crates/const_panic-0.2.8.crate) = 6051f239ecec86fde3410901ab7860d45
 SIZE (rust/crates/const_panic-0.2.8.crate) = 48077
 SHA256 (rust/crates/const_soft_float-0.1.4.crate) = 87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff
 SIZE (rust/crates/const_soft_float-0.1.4.crate) = 50345
+SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
+SIZE (rust/crates/constant_time_eq-0.3.0.crate) = 11369
 SHA256 (rust/crates/constgebra-0.1.4.crate) = e1aaf9b65849a68662ac6c0810c8893a765c960b907dd7cfab9c4a50bf764fbc
 SIZE (rust/crates/constgebra-0.1.4.crate) = 15045
 SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
@@ -251,6 +289,10 @@ SHA256 (rust/crates/cpal-0.15.3.crate) = 873dab07c8f743075e57f524c583985fbaf7456
 SIZE (rust/crates/cpal-0.15.3.crate) = 100083
 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
 SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/crc-3.2.1.crate) = 69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636
+SIZE (rust/crates/crc-3.2.1.crate) = 15070
+SHA256 (rust/crates/crc-catalog-2.4.0.crate) = 19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5
+SIZE (rust/crates/crc-catalog-2.4.0.crate) = 10155
 SHA256 (rust/crates/crc32fast-1.4.0.crate) = b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa
 SIZE (rust/crates/crc32fast-1.4.0.crate) = 38665
 SHA256 (rust/crates/critical-section-1.1.2.crate) = 7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216
@@ -267,10 +309,20 @@ SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1
 SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
 SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
 SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crypto-bigint-0.5.5.crate) = 0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76
+SIZE (rust/crates/crypto-bigint-0.5.5.crate) = 83384
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/crypto_box-0.9.1.crate) = 16182b4f39a82ec8a6851155cc4c0cda3065bb1db33651726a29e1951de0f009
+SIZE (rust/crates/crypto_box-0.9.1.crate) = 16702
+SHA256 (rust/crates/crypto_secretbox-0.1.1.crate) = b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1
+SIZE (rust/crates/crypto_secretbox-0.1.1.crate) = 11377
 SHA256 (rust/crates/csscolorparser-0.6.2.crate) = eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf
 SIZE (rust/crates/csscolorparser-0.6.2.crate) = 16859
+SHA256 (rust/crates/curve25519-dalek-4.1.2.crate) = 0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348
+SIZE (rust/crates/curve25519-dalek-4.1.2.crate) = 305477
+SHA256 (rust/crates/curve25519-dalek-derive-0.1.1.crate) = f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3
+SIZE (rust/crates/curve25519-dalek-derive-0.1.1.crate) = 11723
 SHA256 (rust/crates/d3d12-0.6.0.crate) = d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da
 SIZE (rust/crates/d3d12-0.6.0.crate) = 17274
 SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
@@ -279,8 +331,20 @@ SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f
 SIZE (rust/crates/dasp_sample-0.11.0.crate) = 11617
 SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
 SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632
+SHA256 (rust/crates/der-0.7.9.crate) = f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0
+SIZE (rust/crates/der-0.7.9.crate) = 85173
+SHA256 (rust/crates/der-parser-8.2.0.crate) = dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e
+SIZE (rust/crates/der-parser-8.2.0.crate) = 63495
+SHA256 (rust/crates/der-parser-9.0.0.crate) = 5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553
+SIZE (rust/crates/der-parser-9.0.0.crate) = 63191
+SHA256 (rust/crates/der_derive-0.7.2.crate) = 5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049
+SIZE (rust/crates/der_derive-0.7.2.crate) = 24601
 SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
 SIZE (rust/crates/deranged-0.3.11.crate) = 18043
+SHA256 (rust/crates/derive_more-1.0.0-beta.6.crate) = f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d
+SIZE (rust/crates/derive_more-1.0.0-beta.6.crate) = 51549
+SHA256 (rust/crates/derive_more-impl-1.0.0-beta.6.crate) = 2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e
+SIZE (rust/crates/derive_more-impl-1.0.0-beta.6.crate) = 71127
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
 SHA256 (rust/crates/directories-5.0.1.crate) = 9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35
@@ -293,12 +357,24 @@ SHA256 (rust/crates/displaydoc-0.2.4.crate) = 487585f4d0c6655fe74905e2504d8ad690
 SIZE (rust/crates/displaydoc-0.2.4.crate) = 23200
 SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412
 SIZE (rust/crates/dlib-0.5.2.crate) = 5806
+SHA256 (rust/crates/dlopen2-0.5.0.crate) = 09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa
+SIZE (rust/crates/dlopen2-0.5.0.crate) = 28703
 SHA256 (rust/crates/document-features-0.2.8.crate) = ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95
 SIZE (rust/crates/document-features-0.2.8.crate) = 12979
 SHA256 (rust/crates/downcast-rs-1.2.1.crate) = 75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2
 SIZE (rust/crates/downcast-rs-1.2.1.crate) = 11821
+SHA256 (rust/crates/dtoa-1.0.9.crate) = dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653
+SIZE (rust/crates/dtoa-1.0.9.crate) = 17002
+SHA256 (rust/crates/duct-0.13.7.crate) = e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c
+SIZE (rust/crates/duct-0.13.7.crate) = 30055
+SHA256 (rust/crates/ecdsa-0.16.9.crate) = ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca
+SIZE (rust/crates/ecdsa-0.16.9.crate) = 31406
 SHA256 (rust/crates/ecolor-0.23.0.crate) = cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af
 SIZE (rust/crates/ecolor-0.23.0.crate) = 8106
+SHA256 (rust/crates/ed25519-2.2.3.crate) = 115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53
+SIZE (rust/crates/ed25519-2.2.3.crate) = 17802
+SHA256 (rust/crates/ed25519-dalek-2.1.1.crate) = 4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871
+SIZE (rust/crates/ed25519-dalek-2.1.1.crate) = 85736
 SHA256 (rust/crates/egui-0.23.0.crate) = 8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7
 SIZE (rust/crates/egui-0.23.0.crate) = 244783
 SHA256 (rust/crates/egui_extras-0.23.0.crate) = 68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07
@@ -309,6 +385,8 @@ SHA256 (rust/crates/ehttp-0.3.1.crate) = f88f45662356f96afc7d9e2bc9910ad8352ee01
 SIZE (rust/crates/ehttp-0.3.1.crate) = 7641
 SHA256 (rust/crates/either-1.11.0.crate) = a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2
 SIZE (rust/crates/either-1.11.0.crate) = 18973
+SHA256 (rust/crates/elliptic-curve-0.13.8.crate) = b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47
+SIZE (rust/crates/elliptic-curve-0.13.8.crate) = 63198
 SHA256 (rust/crates/elsa-1.10.0.crate) = d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10
 SIZE (rust/crates/elsa-1.10.0.crate) = 20322
 SHA256 (rust/crates/emath-0.23.0.crate) = 1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0
@@ -323,10 +401,16 @@ SHA256 (rust/crates/encase_derive_impl-0.6.1.crate) = 3fe2568f851fd6144a45fa91cf
 SIZE (rust/crates/encase_derive_impl-0.6.1.crate) = 5759
 SHA256 (rust/crates/encoding_rs-0.8.34.crate) = b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59
 SIZE (rust/crates/encoding_rs-0.8.34.crate) = 1378166
+SHA256 (rust/crates/enum-as-inner-0.6.0.crate) = 5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a
+SIZE (rust/crates/enum-as-inner-0.6.0.crate) = 12079
 SHA256 (rust/crates/enum-map-2.7.3.crate) = 6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9
 SIZE (rust/crates/enum-map-2.7.3.crate) = 21792
 SHA256 (rust/crates/enum-map-derive-0.17.0.crate) = f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb
 SIZE (rust/crates/enum-map-derive-0.17.0.crate) = 10781
+SHA256 (rust/crates/enumflags2-0.7.9.crate) = 3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d
+SIZE (rust/crates/enumflags2-0.7.9.crate) = 16555
+SHA256 (rust/crates/enumflags2_derive-0.7.9.crate) = 5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4
+SIZE (rust/crates/enumflags2_derive-0.7.9.crate) = 7901
 SHA256 (rust/crates/enumn-0.1.13.crate) = 6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42
 SIZE (rust/crates/enumn-0.1.13.crate) = 8391
 SHA256 (rust/crates/epaint-0.23.0.crate) = 58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e
@@ -337,6 +421,8 @@ SHA256 (rust/crates/erased-serde-0.3.31.crate) = 6c138974f9d5e7fe373eb04df7cae98
 SIZE (rust/crates/erased-serde-0.3.31.crate) = 24182
 SHA256 (rust/crates/erased-serde-0.4.4.crate) = 2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3
 SIZE (rust/crates/erased-serde-0.4.4.crate) = 25664
+SHA256 (rust/crates/erased_set-0.7.0.crate) = 76a5aa24577083f8190ad401e376b55887c7cd9083ae95d83ceec5d28ea78125
+SIZE (rust/crates/erased_set-0.7.0.crate) = 3898
 SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
 SIZE (rust/crates/errno-0.3.8.crate) = 10645
 SHA256 (rust/crates/error-code-3.2.0.crate) = a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b
@@ -347,14 +433,18 @@ SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e2
 SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
 SHA256 (rust/crates/event-listener-4.0.3.crate) = 67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e
 SIZE (rust/crates/event-listener-4.0.3.crate) = 39784
-SHA256 (rust/crates/event-listener-strategy-0.4.0.crate) = 958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3
-SIZE (rust/crates/event-listener-strategy-0.4.0.crate) = 10225
+SHA256 (rust/crates/fallible-iterator-0.3.0.crate) = 2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649
+SIZE (rust/crates/fallible-iterator-0.3.0.crate) = 19639
 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
 SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
 SHA256 (rust/crates/fastrand-2.0.2.crate) = 658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984
 SIZE (rust/crates/fastrand-2.0.2.crate) = 14674
 SHA256 (rust/crates/fdeflate-0.3.4.crate) = 4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645
 SIZE (rust/crates/fdeflate-0.3.4.crate) = 25001
+SHA256 (rust/crates/ff-0.13.0.crate) = ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449
+SIZE (rust/crates/ff-0.13.0.crate) = 17688
+SHA256 (rust/crates/fiat-crypto-0.2.9.crate) = 28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d
+SIZE (rust/crates/fiat-crypto-0.2.9.crate) = 495390
 SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
 SIZE (rust/crates/filetime-0.2.23.crate) = 14942
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
@@ -393,8 +483,12 @@ SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65
 SIZE (rust/crates/funty-2.0.0.crate) = 13160
 SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
 SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-buffered-0.2.4.crate) = de8419e65098e54c06f5ae8a130a79e8ba2e391ff995d260ca5d77ea72ab2fe3
+SIZE (rust/crates/futures-buffered-0.2.4.crate) = 28122
 SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
 SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-concurrency-7.6.0.crate) = 51ee14e256b9143bfafbf2fddeede6f396650bacf95d06fc1b3f2b503df129a0
+SIZE (rust/crates/futures-concurrency-7.6.0.crate) = 76002
 SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
 SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
 SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
@@ -411,6 +505,8 @@ SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f
 SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
 SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
 SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-timer-3.0.3.crate) = f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24
+SIZE (rust/crates/futures-timer-3.0.3.crate) = 19739
 SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
 SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
 SHA256 (rust/crates/fxhash-0.2.1.crate) = c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c
@@ -419,6 +515,12 @@ SHA256 (rust/crates/gc-arena-0.5.0.crate) = 57b2e43b3fc51b9900cc9ced1c4630dcbfae
 SIZE (rust/crates/gc-arena-0.5.0.crate) = 39122
 SHA256 (rust/crates/gc-arena-derive-0.5.0.crate) = 96f3c487d429eaa928334f7f2ca7b14734f1c2f4020d2b08c1f0b4d9c70e4f17
 SIZE (rust/crates/gc-arena-derive-0.5.0.crate) = 6933
+SHA256 (rust/crates/genawaiter-0.99.1.crate) = c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0
+SIZE (rust/crates/genawaiter-0.99.1.crate) = 20028
+SHA256 (rust/crates/genawaiter-macro-0.99.1.crate) = 0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc
+SIZE (rust/crates/genawaiter-macro-0.99.1.crate) = 1602
+SHA256 (rust/crates/genawaiter-proc-macro-0.99.1.crate) = 784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738
+SIZE (rust/crates/genawaiter-proc-macro-0.99.1.crate) = 2593
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
 SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
@@ -441,6 +543,8 @@ SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b6569
 SIZE (rust/crates/glob-0.3.1.crate) = 18880
 SHA256 (rust/crates/glow-0.12.3.crate) = ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728
 SIZE (rust/crates/glow-0.12.3.crate) = 149996
+SHA256 (rust/crates/governor-0.6.3.crate) = 68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b
+SIZE (rust/crates/governor-0.6.3.crate) = 131110
 SHA256 (rust/crates/gpu-alloc-0.5.4.crate) = 22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62
 SIZE (rust/crates/gpu-alloc-0.5.4.crate) = 19533
 SHA256 (rust/crates/gpu-alloc-types-0.2.0.crate) = 54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5
@@ -451,8 +555,12 @@ SHA256 (rust/crates/gpu-descriptor-0.2.4.crate) = cc11df1ace8e7e564511f53af41f3e
 SIZE (rust/crates/gpu-descriptor-0.2.4.crate) = 6641
 SHA256 (rust/crates/gpu-descriptor-types-0.1.2.crate) = 6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c
 SIZE (rust/crates/gpu-descriptor-types-0.1.2.crate) = 1928
+SHA256 (rust/crates/group-0.13.0.crate) = f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63
+SIZE (rust/crates/group-0.13.0.crate) = 16526
 SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782
 SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
 SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67
 SIZE (rust/crates/hash32-0.2.1.crate) = 11168
 SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
@@ -473,20 +581,60 @@ SHA256 (rust/crates/hexasphere-9.1.0.crate) = 7cb3df16a7bcb1b5bc092abd55e14f77ca
 SIZE (rust/crates/hexasphere-9.1.0.crate) = 21870
 SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df
 SIZE (rust/crates/hexf-parse-0.2.1.crate) = 4662
+SHA256 (rust/crates/hickory-proto-0.24.1.crate) = 07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512
+SIZE (rust/crates/hickory-proto-0.24.1.crate) = 374410
+SHA256 (rust/crates/hickory-resolver-0.24.1.crate) = 28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243
+SIZE (rust/crates/hickory-resolver-0.24.1.crate) = 91134
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/hmac-sha1-0.2.2.crate) = 6b05da5b9e5d4720bfb691eebb2b9d42da3570745da71eac8a1f5bb7e59aab88
+SIZE (rust/crates/hmac-sha1-0.2.2.crate) = 3234
+SHA256 (rust/crates/hmac-sha256-1.1.7.crate) = 3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735
+SIZE (rust/crates/hmac-sha256-1.1.7.crate) = 6283
 SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
 SIZE (rust/crates/home-0.5.9.crate) = 8760
+SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
+SIZE (rust/crates/hostname-0.3.1.crate) = 9272
+SHA256 (rust/crates/hostname-validator-1.1.1.crate) = f558a64ac9af88b5ba400d99b579451af0d39c6d360980045b91aac966d705e2
+SIZE (rust/crates/hostname-validator-1.1.1.crate) = 2377
+SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
+SIZE (rust/crates/http-0.2.12.crate) = 101964
+SHA256 (rust/crates/http-1.1.0.crate) = 21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258
+SIZE (rust/crates/http-1.1.0.crate) = 103144
+SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
+SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-body-1.0.0.crate) = 1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643
+SIZE (rust/crates/http-body-1.0.0.crate) = 5411
+SHA256 (rust/crates/http-body-util-0.1.1.crate) = 0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d
+SIZE (rust/crates/http-body-util-0.1.1.crate) = 11930
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
 SIZE (rust/crates/humantime-2.1.0.crate) = 16749
 SHA256 (rust/crates/humantime-serde-1.1.1.crate) = 57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c
 SIZE (rust/crates/humantime-serde-1.1.1.crate) = 7886
+SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
+SIZE (rust/crates/hyper-0.14.28.crate) = 197204
+SHA256 (rust/crates/hyper-1.3.1.crate) = fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d
+SIZE (rust/crates/hyper-1.3.1.crate) = 148763
+SHA256 (rust/crates/hyper-rustls-0.24.2.crate) = ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590
+SIZE (rust/crates/hyper-rustls-0.24.2.crate) = 30195
+SHA256 (rust/crates/hyper-util-0.1.3.crate) = ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa
+SIZE (rust/crates/hyper-util-0.1.3.crate) = 61647
 SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
 SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c
+SIZE (rust/crates/idna-0.4.0.crate) = 271429
 SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
 SIZE (rust/crates/idna-0.5.0.crate) = 271940
 SHA256 (rust/crates/if-addrs-0.10.2.crate) = cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a
 SIZE (rust/crates/if-addrs-0.10.2.crate) = 10352
+SHA256 (rust/crates/igd-next-0.14.3.crate) = 064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4
+SIZE (rust/crates/igd-next-0.14.3.crate) = 33873
 SHA256 (rust/crates/image-0.24.9.crate) = 5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d
 SIZE (rust/crates/image-0.24.9.crate) = 9261055
 SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
@@ -497,6 +645,10 @@ SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c4
 SIZE (rust/crates/inotify-0.9.6.crate) = 22971
 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
 SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
+SHA256 (rust/crates/inplace-vec-builder-0.1.1.crate) = cf64c2edc8226891a71f127587a2861b132d2b942310843814d5001d99a1d307
+SIZE (rust/crates/inplace-vec-builder-0.1.1.crate) = 4954
 SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
 SIZE (rust/crates/instant-0.1.12.crate) = 6128
 SHA256 (rust/crates/intl-memoizer-0.5.1.crate) = c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f
@@ -505,6 +657,26 @@ SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac87
 SIZE (rust/crates/intl_pluralrules-7.0.2.crate) = 9201
 SHA256 (rust/crates/io-kit-sys-0.3.0.crate) = 9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de
 SIZE (rust/crates/io-kit-sys-0.3.0.crate) = 38799
+SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f
+SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468
+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
+SHA256 (rust/crates/iroh-base-0.16.2.crate) = 02a1a5323b25a181b1434a44f9f59ebc478d21156cf9bf91aa850ad0d626f833
+SIZE (rust/crates/iroh-base-0.16.2.crate) = 15722
+SHA256 (rust/crates/iroh-blake3-1.4.5.crate) = efbba31f40a650f58fa28dd585a8ca76d8ae3ba63aacab4c8269004a0c803930
+SIZE (rust/crates/iroh-blake3-1.4.5.crate) = 164941
+SHA256 (rust/crates/iroh-io-0.6.0.crate) = 74d1047ad5ca29ab4ff316b6830d86e7ea52cea54325e4d4a849692e1274b498
+SIZE (rust/crates/iroh-io-0.6.0.crate) = 20622
+SHA256 (rust/crates/iroh-metrics-0.16.2.crate) = c0b4f668653628979461eabe56853a694b1eb4713e87ed25f2224618165c0e67
+SIZE (rust/crates/iroh-metrics-0.16.2.crate) = 5605
+SHA256 (rust/crates/iroh-net-0.16.2.crate) = 3bea6e221dfbe6301965a5ec9b6bae2c156375a4baafdbdbad7a93c3dcf950d6
+SIZE (rust/crates/iroh-net-0.16.2.crate) = 279695
+SHA256 (rust/crates/iroh-quinn-0.10.4.crate) = b934380145fd5d53a583d01ae9500f4807efe6b0f0fe115c7be4afa2b35db99f
+SIZE (rust/crates/iroh-quinn-0.10.4.crate) = 58648
+SHA256 (rust/crates/iroh-quinn-proto-0.10.7.crate) = 16f2656b322c7f6cf3eb95e632d1c0f2fa546841915b0270da581f918c70c4be
+SIZE (rust/crates/iroh-quinn-proto-0.10.7.crate) = 166851
+SHA256 (rust/crates/iroh-quinn-udp-0.4.1.crate) = 6679979a7271c24f9dae9622c0b4a543881508aa3a7396f55dfbaaa56f01c063
+SIZE (rust/crates/iroh-quinn-udp-0.4.1.crate) = 12463
 SHA256 (rust/crates/is_debug-1.0.1.crate) = 06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89
 SIZE (rust/crates/is_debug-1.0.1.crate) = 1897
 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
@@ -551,6 +723,8 @@ SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/libz-sys-1.1.16.crate) = 5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9
 SIZE (rust/crates/libz-sys-1.1.16.crate) = 3958920
+SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
+SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
 SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
 SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
 SHA256 (rust/crates/litrs-0.4.1.crate) = b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5
@@ -559,6 +733,8 @@ SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae
 SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
 SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
 SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
+SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
 SHA256 (rust/crates/lyon_algorithms-1.0.4.crate) = a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623
 SIZE (rust/crates/lyon_algorithms-1.0.4.crate) = 31806
 SHA256 (rust/crates/lyon_geom-1.0.5.crate) = edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9
@@ -573,14 +749,20 @@ SHA256 (rust/crates/mach2-0.4.2.crate) = 19b955cdeb2a02b9117f121ce63aa52d08ade45
 SIZE (rust/crates/mach2-0.4.2.crate) = 21889
 SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
 SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
+SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
+SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
 SHA256 (rust/crates/matrixmultiply-0.3.8.crate) = 7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2
 SIZE (rust/crates/matrixmultiply-0.3.8.crate) = 57530
 SHA256 (rust/crates/maybe-owned-0.3.4.crate) = 4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4
 SIZE (rust/crates/maybe-owned-0.3.4.crate) = 14308
+SHA256 (rust/crates/md5-0.7.0.crate) = 490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771
+SIZE (rust/crates/md5-0.7.0.crate) = 6671
 SHA256 (rust/crates/mdns-sd-0.10.5.crate) = d8031297470465389c1349c399b927505d0cc4503be7a997c3541765bca82b4d
 SIZE (rust/crates/mdns-sd-0.10.5.crate) = 60134
+SHA256 (rust/crates/memalloc-0.1.0.crate) = df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1
+SIZE (rust/crates/memalloc-0.1.0.crate) = 2410
 SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
 SIZE (rust/crates/memchr-2.7.2.crate) = 96220
 SHA256 (rust/crates/memmap2-0.5.10.crate) = 83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327
@@ -589,6 +771,8 @@ SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1
 SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
 SHA256 (rust/crates/metal-0.24.0.crate) = de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060
 SIZE (rust/crates/metal-0.24.0.crate) = 684270
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
 SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
@@ -605,6 +789,8 @@ SHA256 (rust/crates/nalgebra-0.32.5.crate) = 3ea4908d4f23254adda3daa60ffef0f1ac7
 SIZE (rust/crates/nalgebra-0.32.5.crate) = 374729
 SHA256 (rust/crates/nalgebra-macros-0.2.1.crate) = 91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998
 SIZE (rust/crates/nalgebra-macros-0.2.1.crate) = 6378
+SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
+SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
 SHA256 (rust/crates/natord-1.0.9.crate) = 308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c
 SIZE (rust/crates/natord-1.0.9.crate) = 3866
 SHA256 (rust/crates/ndk-0.7.0.crate) = 451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0
@@ -617,24 +803,46 @@ SHA256 (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 3cf2aae958bd232cac506985
 SIZE (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 291699
 SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691
 SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233
+SHA256 (rust/crates/netdev-0.25.0.crate) = fb353f5a5a852d5cc779c1c80bec0bd14a696ef832f3a761cb10091802c37109
+SIZE (rust/crates/netdev-0.25.0.crate) = 31845
+SHA256 (rust/crates/netlink-packet-core-0.7.0.crate) = 72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4
+SIZE (rust/crates/netlink-packet-core-0.7.0.crate) = 16718
+SHA256 (rust/crates/netlink-packet-route-0.17.1.crate) = 053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66
+SIZE (rust/crates/netlink-packet-route-0.17.1.crate) = 115709
+SHA256 (rust/crates/netlink-packet-utils-0.5.2.crate) = 0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34
+SIZE (rust/crates/netlink-packet-utils-0.5.2.crate) = 7970
+SHA256 (rust/crates/netlink-proto-0.11.3.crate) = 86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21
+SIZE (rust/crates/netlink-proto-0.11.3.crate) = 23776
+SHA256 (rust/crates/netlink-sys-0.8.6.crate) = 416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307
+SIZE (rust/crates/netlink-sys-0.8.6.crate) = 23580
 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069
 SIZE (rust/crates/nix-0.24.3.crate) = 266843
 SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4
 SIZE (rust/crates/nix-0.25.1.crate) = 272312
 SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
 SIZE (rust/crates/nix-0.26.4.crate) = 279099
+SHA256 (rust/crates/no-std-compat-0.4.1.crate) = b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c
+SIZE (rust/crates/no-std-compat-0.4.1.crate) = 7600
+SHA256 (rust/crates/no-std-net-0.6.0.crate) = 43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65
+SIZE (rust/crates/no-std-net-0.6.0.crate) = 30191
 SHA256 (rust/crates/nohash-hasher-0.2.0.crate) = 2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451
 SIZE (rust/crates/nohash-hasher-0.2.0.crate) = 8051
 SHA256 (rust/crates/noise-0.9.0.crate) = 6da45c8333f2e152fc665d78a380be060eb84fad8ca4c9f7ac8ca29216cff0cc
 SIZE (rust/crates/noise-0.9.0.crate) = 82369
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/nonzero_ext-0.3.0.crate) = 38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21
+SIZE (rust/crates/nonzero_ext-0.3.0.crate) = 15855
 SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d
 SIZE (rust/crates/notify-6.1.1.crate) = 40117
 SHA256 (rust/crates/ntapi-0.4.1.crate) = e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4
 SIZE (rust/crates/ntapi-0.4.1.crate) = 126552
 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-bigint-0.4.5.crate) = c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7
+SIZE (rust/crates/num-bigint-0.4.5.crate) = 102281
+SHA256 (rust/crates/num-bigint-dig-0.8.4.crate) = dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151
+SIZE (rust/crates/num-bigint-dig-0.8.4.crate) = 123825
 SHA256 (rust/crates/num-complex-0.4.5.crate) = 23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6
 SIZE (rust/crates/num-complex-0.4.5.crate) = 29614
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
@@ -643,10 +851,14 @@ SHA256 (rust/crates/num-derive-0.4.2.crate) = ed3955f1a9c7c0c15e092f9c887db08b1f
 SIZE (rust/crates/num-derive-0.4.2.crate) = 14709
 SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
 SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-iter-0.1.45.crate) = 1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf
+SIZE (rust/crates/num-iter-0.1.45.crate) = 10320
 SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0
 SIZE (rust/crates/num-rational-0.4.1.crate) = 27889
 SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
 SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
 SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9
 SIZE (rust/crates/num_enum-0.5.11.crate) = 16772
 SHA256 (rust/crates/num_enum-0.6.1.crate) = 7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1
@@ -683,10 +895,16 @@ SHA256 (rust/crates/oboe-0.6.1.crate) = e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7
 SIZE (rust/crates/oboe-0.6.1.crate) = 24588
 SHA256 (rust/crates/oboe-sys-0.6.1.crate) = 6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d
 SIZE (rust/crates/oboe-sys-0.6.1.crate) = 169091
+SHA256 (rust/crates/oid-registry-0.6.1.crate) = 9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff
+SIZE (rust/crates/oid-registry-0.6.1.crate) = 15068
+SHA256 (rust/crates/oid-registry-0.7.0.crate) = 1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d
+SIZE (rust/crates/oid-registry-0.7.0.crate) = 15115
 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
 SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
 SHA256 (rust/crates/once_map-0.4.16.crate) = fd3f380826b5feafede7e6a948ddf18bc3d43ac423b278cab0a94d786a68a955
 SIZE (rust/crates/once_map-0.4.16.crate) = 12397
+SHA256 (rust/crates/opaque-debug-0.3.1.crate) = c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381
+SIZE (rust/crates/opaque-debug-0.3.1.crate) = 7066
 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
 SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
@@ -695,10 +913,18 @@ SHA256 (rust/crates/orbclient-0.3.47.crate) = 52f0d54bde9774d3a51dcf281a5def240c
 SIZE (rust/crates/orbclient-0.3.47.crate) = 1324509
 SHA256 (rust/crates/ordered-float-3.9.2.crate) = f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc
 SIZE (rust/crates/ordered-float-3.9.2.crate) = 19788
+SHA256 (rust/crates/os_pipe-1.1.5.crate) = 57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9
+SIZE (rust/crates/os_pipe-1.1.5.crate) = 11430
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
 SHA256 (rust/crates/owned_ttf_parser-0.20.0.crate) = d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7
 SIZE (rust/crates/owned_ttf_parser-0.20.0.crate) = 150890
+SHA256 (rust/crates/p256-0.13.2.crate) = c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b
+SIZE (rust/crates/p256-0.13.2.crate) = 63434
+SHA256 (rust/crates/p384-0.13.0.crate) = 70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209
+SIZE (rust/crates/p384-0.13.0.crate) = 236495
+SHA256 (rust/crates/p521-0.13.3.crate) = 0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2
+SIZE (rust/crates/p521-0.13.3.crate) = 138499
 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
 SIZE (rust/crates/parking-2.2.0.crate) = 9730
 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
@@ -721,8 +947,18 @@ SHA256 (rust/crates/peg-runtime-0.8.2.crate) = 36bae92c60fa2398ce4678b98b2c4b5a7
 SIZE (rust/crates/peg-runtime-0.8.2.crate) = 4150
 SHA256 (rust/crates/pem-3.0.4.crate) = 8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae
 SIZE (rust/crates/pem-3.0.4.crate) = 13040
+SHA256 (rust/crates/pem-rfc7468-0.7.0.crate) = 88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412
+SIZE (rust/crates/pem-rfc7468-0.7.0.crate) = 24159
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/pest-2.7.10.crate) = 560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8
+SIZE (rust/crates/pest-2.7.10.crate) = 123707
+SHA256 (rust/crates/pest_derive-2.7.10.crate) = 26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459
+SIZE (rust/crates/pest_derive-2.7.10.crate) = 36221
+SHA256 (rust/crates/pest_generator-2.7.10.crate) = 3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687
+SIZE (rust/crates/pest_generator-2.7.10.crate) = 18411
+SHA256 (rust/crates/pest_meta-2.7.10.crate) = d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd
+SIZE (rust/crates/pest_meta-2.7.10.crate) = 41550
 SHA256 (rust/crates/petgraph-0.6.4.crate) = e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9
 SIZE (rust/crates/petgraph-0.6.4.crate) = 185895
 SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
@@ -745,42 +981,82 @@ SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/ping-rs-0.1.2.crate) = d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b
 SIZE (rust/crates/ping-rs-0.1.2.crate) = 12996
+SHA256 (rust/crates/pkarr-1.1.5.crate) = 242ae92dfb9d2ba3aaa9caf4723e72043bc50729ad05a763771771ba03196ffb
+SIZE (rust/crates/pkarr-1.1.5.crate) = 22114
+SHA256 (rust/crates/pkcs1-0.7.5.crate) = c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f
+SIZE (rust/crates/pkcs1-0.7.5.crate) = 35790
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
 SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
 SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/platforms-3.4.0.crate) = db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7
+SIZE (rust/crates/platforms-3.4.0.crate) = 29298
+SHA256 (rust/crates/pnet_base-0.34.0.crate) = fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c
+SIZE (rust/crates/pnet_base-0.34.0.crate) = 10239
+SHA256 (rust/crates/pnet_macros-0.34.0.crate) = 688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804
+SIZE (rust/crates/pnet_macros-0.34.0.crate) = 29179
+SHA256 (rust/crates/pnet_macros_support-0.34.0.crate) = eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56
+SIZE (rust/crates/pnet_macros_support-0.34.0.crate) = 10735
+SHA256 (rust/crates/pnet_packet-0.34.0.crate) = a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba
+SIZE (rust/crates/pnet_packet-0.34.0.crate) = 33979
 SHA256 (rust/crates/png-0.17.13.crate) = 06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1
 SIZE (rust/crates/png-0.17.13.crate) = 103176
 SHA256 (rust/crates/polling-2.8.0.crate) = 4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce
 SIZE (rust/crates/polling-2.8.0.crate) = 43554
-SHA256 (rust/crates/polling-3.6.0.crate) = e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6
-SIZE (rust/crates/polling-3.6.0.crate) = 58128
+SHA256 (rust/crates/poly1305-0.8.0.crate) = 8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf
+SIZE (rust/crates/poly1305-0.8.0.crate) = 32633
+SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
+SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
+SHA256 (rust/crates/positioned-io-0.3.3.crate) = ccabfeeb89c73adf4081f0dca7f8e28dbda90981a222ceea37f619e93ea6afe9
+SIZE (rust/crates/positioned-io-0.3.3.crate) = 487765
 SHA256 (rust/crates/postcard-1.0.8.crate) = a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8
 SIZE (rust/crates/postcard-1.0.8.crate) = 53813
+SHA256 (rust/crates/postcard-derive-0.1.1.crate) = fc4b01218787dd4420daf63875163a787a78294ad48a24e9f6fa8c6507759a79
+SIZE (rust/crates/postcard-derive-0.1.1.crate) = 4611
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/pp-rs-0.2.1.crate) = bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee
 SIZE (rust/crates/pp-rs-0.2.1.crate) = 25905
 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/precis-core-0.1.9.crate) = d73e9dd26361c32e7cd13d1032bb01c4e26a23287274e8a4e2f228cf2c9ff77b
+SIZE (rust/crates/precis-core-0.1.9.crate) = 455170
+SHA256 (rust/crates/precis-profiles-0.1.10.crate) = bde4bd6624c60cb0abe2bea1dbdbb9085f629a853861e64df4abb099f8076ad4
+SIZE (rust/crates/precis-profiles-0.1.10.crate) = 284559
+SHA256 (rust/crates/precis-tools-0.1.7.crate) = d07ecadec70b0f560f09abf815ae0ee1a940d38d2354c938ba7229ac7c9f5f52
+SIZE (rust/crates/precis-tools-0.1.7.crate) = 18228
+SHA256 (rust/crates/primeorder-0.13.6.crate) = 353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6
+SIZE (rust/crates/primeorder-0.13.6.crate) = 21296
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
+SHA256 (rust/crates/proc-macro-error-0.4.12.crate) = 18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7
+SIZE (rust/crates/proc-macro-error-0.4.12.crate) = 21979
+SHA256 (rust/crates/proc-macro-error-attr-0.4.12.crate) = 8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de
+SIZE (rust/crates/proc-macro-error-attr-0.4.12.crate) = 6934
+SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
+SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
 SHA256 (rust/crates/proc-macro2-1.0.80.crate) = a56dea16b0a29e94408b9aa5e2940a4eedbd128a1ba20e8f7ae60fd3d465af0e
 SIZE (rust/crates/proc-macro2-1.0.80.crate) = 48227
 SHA256 (rust/crates/profiling-1.0.15.crate) = 43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58
 SIZE (rust/crates/profiling-1.0.15.crate) = 14255
+SHA256 (rust/crates/prometheus-client-0.22.2.crate) = c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa
+SIZE (rust/crates/prometheus-client-0.22.2.crate) = 60386
+SHA256 (rust/crates/prometheus-client-derive-encode-0.4.2.crate) = 440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8
+SIZE (rust/crates/prometheus-client-derive-encode-0.4.2.crate) = 3662
 SHA256 (rust/crates/puffin-0.17.0.crate) = 39009d69b9d547c3ffa974a20648fa02f447c05bd0a664012b1ba5a5b06fb14e
 SIZE (rust/crates/puffin-0.17.0.crate) = 20741
 SHA256 (rust/crates/puffin_egui-0.23.0.crate) = c5af236782d21bdd5a6eb2f8cc9a91f8d601c073b7f7d568c95c26604cc12b87
 SIZE (rust/crates/puffin_egui-0.23.0.crate) = 31908
-SHA256 (rust/crates/quinn-0.10.2.crate) = 8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75
-SIZE (rust/crates/quinn-0.10.2.crate) = 59964
-SHA256 (rust/crates/quinn-proto-0.10.6.crate) = 141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a
-SIZE (rust/crates/quinn-proto-0.10.6.crate) = 166677
-SHA256 (rust/crates/quinn-udp-0.4.1.crate) = 055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7
-SIZE (rust/crates/quinn-udp-0.4.1.crate) = 12467
+SHA256 (rust/crates/quanta-0.12.3.crate) = 8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5
+SIZE (rust/crates/quanta-0.12.3.crate) = 28306
+SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
 SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
 SIZE (rust/crates/quote-1.0.36.crate) = 28507
+SHA256 (rust/crates/quoted-string-parser-0.1.0.crate) = 0dc75379cdb451d001f1cb667a9f74e8b355e9df84cc5193513cbe62b96fc5e9
+SIZE (rust/crates/quoted-string-parser-0.1.0.crate) = 3623
 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
 SIZE (rust/crates/radium-0.7.0.crate) = 10906
 SHA256 (rust/crates/radsort-0.1.0.crate) = 17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b
@@ -795,10 +1071,16 @@ SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a
 SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
 SHA256 (rust/crates/range-alloc-0.1.3.crate) = 9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab
 SIZE (rust/crates/range-alloc-0.1.3.crate) = 7664
+SHA256 (rust/crates/range-collections-0.4.5.crate) = ca9edd21e2db51000ac63eccddabba622f826e631a60be7bade9bd6a76b69537
+SIZE (rust/crates/range-collections-0.4.5.crate) = 28532
+SHA256 (rust/crates/raw-cpuid-11.0.2.crate) = e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd
+SIZE (rust/crates/raw-cpuid-11.0.2.crate) = 108794
 SHA256 (rust/crates/raw-window-handle-0.5.2.crate) = f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9
 SIZE (rust/crates/raw-window-handle-0.5.2.crate) = 17063
 SHA256 (rust/crates/rawpointer-0.2.1.crate) = 60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3
 SIZE (rust/crates/rawpointer-0.2.1.crate) = 7490
+SHA256 (rust/crates/rcgen-0.11.3.crate) = 52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6
+SIZE (rust/crates/rcgen-0.11.3.crate) = 55311
 SHA256 (rust/crates/rcgen-0.12.1.crate) = 48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1
 SIZE (rust/crates/rcgen-0.12.1.crate) = 63815
 SHA256 (rust/crates/rectangle-pack-0.4.2.crate) = a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb
@@ -809,18 +1091,30 @@ SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f
 SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
 SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
 SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/ref-cast-1.0.23.crate) = ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931
+SIZE (rust/crates/ref-cast-1.0.23.crate) = 12795
+SHA256 (rust/crates/ref-cast-impl-1.0.23.crate) = bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6
+SIZE (rust/crates/ref-cast-impl-1.0.23.crate) = 9360
 SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
 SIZE (rust/crates/regex-1.10.4.crate) = 253191
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
 SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
 SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-lite-0.1.5.crate) = 30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e
+SIZE (rust/crates/regex-lite-0.1.5.crate) = 95262
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
 SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
 SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
 SHA256 (rust/crates/renderdoc-sys-1.1.0.crate) = 19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832
 SIZE (rust/crates/renderdoc-sys-1.1.0.crate) = 10366
+SHA256 (rust/crates/reqwest-0.11.27.crate) = dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62
+SIZE (rust/crates/reqwest-0.11.27.crate) = 163155
+SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
+SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
+SHA256 (rust/crates/rfc6979-0.4.0.crate) = f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2
+SIZE (rust/crates/rfc6979-0.4.0.crate) = 9140
 SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
 SIZE (rust/crates/ring-0.16.20.crate) = 5082615
 SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d
@@ -831,12 +1125,18 @@ SHA256 (rust/crates/robust-1.1.0.crate) = cbf4a6aa5f6d6888f39e980649f3ad6b666acd
 SIZE (rust/crates/robust-1.1.0.crate) = 476312
 SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94
 SIZE (rust/crates/ron-0.8.1.crate) = 63251
+SHA256 (rust/crates/rsa-0.9.6.crate) = 5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc
+SIZE (rust/crates/rsa-0.9.6.crate) = 80048
+SHA256 (rust/crates/rtnetlink-0.13.1.crate) = 7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0
+SIZE (rust/crates/rtnetlink-0.13.1.crate) = 42517
 SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
 SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rusticata-macros-4.1.0.crate) = faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632
+SIZE (rust/crates/rusticata-macros-4.1.0.crate) = 11746
 SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
 SIZE (rust/crates/rustix-0.38.32.crate) = 376999
 SHA256 (rust/crates/rustls-0.21.11.crate) = 7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4
@@ -859,6 +1159,8 @@ SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b8
 SIZE (rust/crates/ryu-1.0.17.crate) = 47537
 SHA256 (rust/crates/safe_arch-0.7.1.crate) = f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354
 SIZE (rust/crates/safe_arch-0.7.1.crate) = 76930
+SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213
+SIZE (rust/crates/salsa20-0.10.2.crate) = 12780
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
@@ -871,6 +1173,8 @@ SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0
 SIZE (rust/crates/sct-0.7.1.crate) = 27501
 SHA256 (rust/crates/sctk-adwaita-0.5.4.crate) = cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09
 SIZE (rust/crates/sctk-adwaita-0.5.4.crate) = 45888
+SHA256 (rust/crates/sec1-0.7.3.crate) = d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc
+SIZE (rust/crates/sec1-0.7.3.crate) = 17979
 SHA256 (rust/crates/security-framework-2.10.0.crate) = 770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6
 SIZE (rust/crates/security-framework-2.10.0.crate) = 79723
 SHA256 (rust/crates/security-framework-sys-2.10.0.crate) = 41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef
@@ -885,26 +1189,42 @@ SHA256 (rust/crates/send_wrapper-0.6.0.crate) = cd0b0ec5f1c1ca621c432a25813d8d60
 SIZE (rust/crates/send_wrapper-0.6.0.crate) = 10519
 SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
 SIZE (rust/crates/serde-1.0.197.crate) = 77087
+SHA256 (rust/crates/serde-error-0.1.2.crate) = e988182713aeed6a619a88bca186f6d6407483485ffe44c869ee264f8eabd13f
+SIZE (rust/crates/serde-error-0.1.2.crate) = 3028
 SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
 SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
 SHA256 (rust/crates/serde_json-1.0.115.crate) = 12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd
 SIZE (rust/crates/serde_json-1.0.115.crate) = 147100
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
 SHA256 (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47
 SIZE (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 65290
+SHA256 (rust/crates/serdect-0.2.0.crate) = a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177
+SIZE (rust/crates/serdect-0.2.0.crate) = 11691
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
 SIZE (rust/crates/sha2-0.10.8.crate) = 26357
 SHA256 (rust/crates/shadow-rs-0.25.0.crate) = 615d846f7174a0850dca101bca72f6913e3376a64c5fda2b965d7fc3d1ff60cb
 SIZE (rust/crates/shadow-rs-0.25.0.crate) = 27393
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
+SHA256 (rust/crates/shared_child-1.0.0.crate) = b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef
+SIZE (rust/crates/shared_child-1.0.0.crate) = 8939
 SHA256 (rust/crates/shiftnanigans-0.3.3.crate) = 9635466532d454fa020acbb12f629f1fc02fc9b4d5b39cc72ca478be37e314bc
 SIZE (rust/crates/shiftnanigans-0.3.3.crate) = 64372
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
+SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
+SIZE (rust/crates/signature-2.2.0.crate) = 15531
 SHA256 (rust/crates/simba-0.8.1.crate) = 061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae
 SIZE (rust/crates/simba-0.8.1.crate) = 52545
 SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
 SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
+SHA256 (rust/crates/simple-dns-0.6.2.crate) = 01607fe2e61894468c6dc0b26103abb073fb08b79a3d9e4b6d76a1a341549958
+SIZE (rust/crates/simple-dns-0.6.2.crate) = 38285
 SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
 SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
@@ -927,22 +1247,46 @@ SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613
 SIZE (rust/crates/spin-0.5.2.crate) = 12004
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/spinning_top-0.3.0.crate) = d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300
+SIZE (rust/crates/spinning_top-0.3.0.crate) = 52579
 SHA256 (rust/crates/spirv-0.2.0+1.5.4.crate) = 246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830
 SIZE (rust/crates/spirv-0.2.0+1.5.4.crate) = 30491
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
 SHA256 (rust/crates/sptr-0.3.2.crate) = 3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a
 SIZE (rust/crates/sptr-0.3.2.crate) = 14598
+SHA256 (rust/crates/ssh-cipher-0.2.0.crate) = caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f
+SIZE (rust/crates/ssh-cipher-0.2.0.crate) = 10843
+SHA256 (rust/crates/ssh-encoding-0.2.0.crate) = eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15
+SIZE (rust/crates/ssh-encoding-0.2.0.crate) = 13600
+SHA256 (rust/crates/ssh-key-0.6.6.crate) = ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc
+SIZE (rust/crates/ssh-key-0.6.6.crate) = 111935
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
 SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
 SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731
 SIZE (rust/crates/strict-num-0.1.1.crate) = 5104
+SHA256 (rust/crates/struct_iterable-0.1.1.crate) = 849a064c6470a650b72e41fa6c057879b68f804d113af92900f27574828e7712
+SIZE (rust/crates/struct_iterable-0.1.1.crate) = 3233
+SHA256 (rust/crates/struct_iterable_derive-0.1.0.crate) = 8bb939ce88a43ea4e9d012f2f6b4cc789deb2db9d47bad697952a85d6978662c
+SIZE (rust/crates/struct_iterable_derive-0.1.0.crate) = 2045
+SHA256 (rust/crates/struct_iterable_internal-0.1.1.crate) = e9426b2a0c03e6cc2ea8dbc0168dbbf943f88755e409fb91bcb8f6a268305f4a
+SIZE (rust/crates/struct_iterable_internal-0.1.1.crate) = 1625
 SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125
 SIZE (rust/crates/strum-0.25.0.crate) = 5539
+SHA256 (rust/crates/strum-0.26.2.crate) = 5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29
+SIZE (rust/crates/strum-0.26.2.crate) = 7189
 SHA256 (rust/crates/strum_macros-0.25.3.crate) = 23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0
 SIZE (rust/crates/strum_macros-0.25.3.crate) = 22570
+SHA256 (rust/crates/strum_macros-0.26.2.crate) = c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946
+SIZE (rust/crates/strum_macros-0.26.2.crate) = 27056
+SHA256 (rust/crates/stun-rs-0.1.8.crate) = 0adebf9fb8fba5c39ee34092b0383f247e4d1255b98fcffec94b4b797b85b677
+SIZE (rust/crates/stun-rs-0.1.8.crate) = 69182
 SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
 SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/surge-ping-0.8.1.crate) = efbf95ce4c7c5b311d2ce3f088af2b93edef0f09727fa50fbe03c7a979afce77
+SIZE (rust/crates/surge-ping-0.8.1.crate) = 21311
 SHA256 (rust/crates/svg_fmt-0.4.2.crate) = f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499
 SIZE (rust/crates/svg_fmt-0.4.2.crate) = 4058
 SHA256 (rust/crates/svgtypes-0.8.2.crate) = 22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564
@@ -963,12 +1307,26 @@ SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
 SHA256 (rust/crates/syn-2.0.58.crate) = 44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687
 SIZE (rust/crates/syn-2.0.58.crate) = 254920
+SHA256 (rust/crates/syn-mid-0.5.4.crate) = fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed
+SIZE (rust/crates/syn-mid-0.5.4.crate) = 11862
+SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
+SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
+SHA256 (rust/crates/synstructure-0.12.6.crate) = f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f
+SIZE (rust/crates/synstructure-0.12.6.crate) = 18429
 SHA256 (rust/crates/synstructure-0.13.1.crate) = c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971
 SIZE (rust/crates/synstructure-0.13.1.crate) = 18327
 SHA256 (rust/crates/sys-locale-0.3.1.crate) = e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0
 SIZE (rust/crates/sys-locale-0.3.1.crate) = 15681
 SHA256 (rust/crates/sysinfo-0.29.11.crate) = cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666
 SIZE (rust/crates/sysinfo-0.29.11.crate) = 156557
+SHA256 (rust/crates/system-configuration-0.5.1.crate) = ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7
+SIZE (rust/crates/system-configuration-0.5.1.crate) = 12618
+SHA256 (rust/crates/system-configuration-0.6.0.crate) = 658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42
+SIZE (rust/crates/system-configuration-0.6.0.crate) = 17306
+SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9
+SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730
+SHA256 (rust/crates/system-configuration-sys-0.6.0.crate) = 8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4
+SIZE (rust/crates/system-configuration-sys-0.6.0.crate) = 11090
 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
 SIZE (rust/crates/tap-1.0.1.crate) = 11316
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
@@ -999,12 +1357,22 @@ SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
 SHA256 (rust/crates/tokio-1.37.0.crate) = 1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787
 SIZE (rust/crates/tokio-1.37.0.crate) = 764297
+SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
+SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
+SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-rustls-acme-0.3.0.crate) = 2ebc06d846f8367f24c3a8882328707d1a5e507ef4f40943723ddbe2c17b9f24
+SIZE (rust/crates/tokio-rustls-acme-0.3.0.crate) = 41088
+SHA256 (rust/crates/tokio-util-0.7.11.crate) = 9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1
+SIZE (rust/crates/tokio-util-0.7.11.crate) = 113421
 SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
 SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
 SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
 SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
 SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
 SIZE (rust/crates/tracing-0.1.40.crate) = 79459
 SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
@@ -1019,8 +1387,12 @@ SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df563
 SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
 SHA256 (rust/crates/tracing-wasm-0.2.1.crate) = 4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07
 SIZE (rust/crates/tracing-wasm-0.2.1.crate) = 9372
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
 SHA256 (rust/crates/ttf-parser-0.20.0.crate) = 17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4
 SIZE (rust/crates/ttf-parser-0.20.0.crate) = 161769
+SHA256 (rust/crates/ttl_cache-0.5.1.crate) = 4189890526f0168710b6ee65ceaedf1460c48a14318ceec933cb26baa492096a
+SIZE (rust/crates/ttl_cache-0.5.1.crate) = 9923
 SHA256 (rust/crates/turborand-0.10.1.crate) = ffa9ae3c65785079fa553e8aea4ae4b12579b5c5029b4133b54ea3afb2e3e9fa
 SIZE (rust/crates/turborand-0.10.1.crate) = 47428
 SHA256 (rust/crates/type-map-0.4.0.crate) = b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46
@@ -1035,6 +1407,10 @@ SHA256 (rust/crates/tzdb-0.6.1.crate) = 1b580f6b365fa89f5767cdb619a55d534d04a4e1
 SIZE (rust/crates/tzdb-0.6.1.crate) = 12526
 SHA256 (rust/crates/tzdb_data-0.1.2.crate) = d1889fdffac09d65c1d95c42d5202e9b21ad8c758f426e9fe09088817ea998d6
 SIZE (rust/crates/tzdb_data-0.1.2.crate) = 255358
+SHA256 (rust/crates/ucd-parse-0.1.13.crate) = c06ff81122fcbf4df4c1660b15f7e3336058e7aec14437c9f85c6b31a0f279b9
+SIZE (rust/crates/ucd-parse-0.1.13.crate) = 29550
+SHA256 (rust/crates/ucd-trie-0.1.6.crate) = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
+SIZE (rust/crates/ucd-trie-0.1.6.crate) = 45790
 SHA256 (rust/crates/ulid-1.1.2.crate) = 34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259
 SIZE (rust/crates/ulid-1.1.2.crate) = 11517
 SHA256 (rust/crates/unic-langid-0.9.4.crate) = 238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516
@@ -1051,6 +1427,8 @@ SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c1600082468
 SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
 SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
 SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
+SHA256 (rust/crates/universal-hash-0.5.1.crate) = fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea
+SIZE (rust/crates/universal-hash-0.5.1.crate) = 9146
 SHA256 (rust/crates/unsafe-libyaml-0.2.11.crate) = 673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861
 SIZE (rust/crates/unsafe-libyaml-0.2.11.crate) = 62101
 SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
@@ -1083,6 +1461,8 @@ SHA256 (rust/crates/waker-fn-1.1.1.crate) = f3c4517f54858c779bbcbf228f4fca63d121
 SIZE (rust/crates/waker-fn-1.1.1.crate) = 6323
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
+SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
+SIZE (rust/crates/want-0.3.1.crate) = 6398
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
 SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
@@ -1097,6 +1477,8 @@ SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a
 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
 SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
 SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/watchable-1.1.2.crate) = 45b42a2f611916b5965120a9cde2b60f2db4454826dd9ad5e6f47c24a5b3b259
+SIZE (rust/crates/watchable-1.1.2.crate) = 16318
 SHA256 (rust/crates/wayland-client-0.29.5.crate) = 3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715
 SIZE (rust/crates/wayland-client-0.29.5.crate) = 71041
 SHA256 (rust/crates/wayland-commons-0.29.5.crate) = 8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902
@@ -1117,6 +1499,8 @@ SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10
 SIZE (rust/crates/web-time-1.1.0.crate) = 18026
 SHA256 (rust/crates/webbrowser-0.8.15.crate) = db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b
 SIZE (rust/crates/webbrowser-0.8.15.crate) = 39264
+SHA256 (rust/crates/webpki-roots-0.25.4.crate) = 5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1
+SIZE (rust/crates/webpki-roots-0.25.4.crate) = 253559
 SHA256 (rust/crates/webpki-roots-0.26.1.crate) = b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009
 SIZE (rust/crates/webpki-roots-0.26.1.crate) = 249748
 SHA256 (rust/crates/weezl-0.1.8.crate) = 53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082
@@ -1147,16 +1531,26 @@ SHA256 (rust/crates/windows-0.44.0.crate) = 9e745dab35a0c4c77aa3ce42d595e13d2003
 SIZE (rust/crates/windows-0.44.0.crate) = 11502336
 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
 SIZE (rust/crates/windows-0.48.0.crate) = 11864177
+SHA256 (rust/crates/windows-0.51.1.crate) = ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9
+SIZE (rust/crates/windows-0.51.1.crate) = 12250614
+SHA256 (rust/crates/windows-0.52.0.crate) = e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be
+SIZE (rust/crates/windows-0.52.0.crate) = 11843715
 SHA256 (rust/crates/windows-0.54.0.crate) = 9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49
 SIZE (rust/crates/windows-0.54.0.crate) = 11096265
+SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64
+SIZE (rust/crates/windows-core-0.51.1.crate) = 42364
 SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
 SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65
 SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
 SHA256 (rust/crates/windows-implement-0.48.0.crate) = 5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c
 SIZE (rust/crates/windows-implement-0.48.0.crate) = 8468
+SHA256 (rust/crates/windows-implement-0.52.0.crate) = 12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946
+SIZE (rust/crates/windows-implement-0.52.0.crate) = 8705
 SHA256 (rust/crates/windows-interface-0.48.0.crate) = e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7
 SIZE (rust/crates/windows-interface-0.48.0.crate) = 9533
+SHA256 (rust/crates/windows-interface-0.52.0.crate) = 9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1
+SIZE (rust/crates/windows-interface-0.52.0.crate) = 9685
 SHA256 (rust/crates/windows-result-0.1.1.crate) = 749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b
 SIZE (rust/crates/windows-result-0.1.1.crate) = 10460
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
@@ -1219,6 +1613,10 @@ SHA256 (rust/crates/winit-0.28.7.crate) = 9596d90b45384f5281384ab204224876e8e8bf
 SIZE (rust/crates/winit-0.28.7.crate) = 407921
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
+SIZE (rust/crates/winreg-0.50.0.crate) = 29703
+SHA256 (rust/crates/wmi-0.13.3.crate) = fc2f0a4062ca522aad4705a2948fd4061b3857537990202a8ddd5af21607f79a
+SIZE (rust/crates/wmi-0.13.3.crate) = 53050
 SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
 SIZE (rust/crates/wyz-0.5.1.crate) = 18790
 SHA256 (rust/crates/x11-dl-2.21.0.crate) = 38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f
@@ -1227,12 +1625,20 @@ SHA256 (rust/crates/x11rb-0.13.0.crate) = f8f25ead8c7e4cba123243a6367da5d3990e0d
 SIZE (rust/crates/x11rb-0.13.0.crate) = 222396
 SHA256 (rust/crates/x11rb-protocol-0.13.0.crate) = e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34
 SIZE (rust/crates/x11rb-protocol-0.13.0.crate) = 507838
+SHA256 (rust/crates/x509-parser-0.15.1.crate) = 7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da
+SIZE (rust/crates/x509-parser-0.15.1.crate) = 91123
+SHA256 (rust/crates/x509-parser-0.16.0.crate) = fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69
+SIZE (rust/crates/x509-parser-0.16.0.crate) = 92925
 SHA256 (rust/crates/xcursor-0.3.5.crate) = 6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911
 SIZE (rust/crates/xcursor-0.3.5.crate) = 6256
 SHA256 (rust/crates/xml-rs-0.8.20.crate) = 791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193
 SIZE (rust/crates/xml-rs-0.8.20.crate) = 54443
+SHA256 (rust/crates/xmltree-0.10.3.crate) = d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb
+SIZE (rust/crates/xmltree-0.10.3.crate) = 9219
 SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
 SIZE (rust/crates/yasna-0.5.2.crate) = 34859
+SHA256 (rust/crates/z32-1.1.1.crate) = edb37266251c28b03d08162174a91c3a092e3bd4f476f8205ee1c507b78b7bdc
+SIZE (rust/crates/z32-1.1.1.crate) = 3947
 SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
 SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
 SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
@@ -1241,9 +1647,9 @@ SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca
 SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
 SHA256 (MaxCWhitehead-rapier-29c72c6c282e7c40987c0d0d0ce3089ea019a532_GH0.tar.gz) = 25dd450213642168e4f530597648c9fa1190420e31a6672ded7a440b503bf34d
 SIZE (MaxCWhitehead-rapier-29c72c6c282e7c40987c0d0d0ce3089ea019a532_GH0.tar.gz) = 2535622
+SHA256 (fishfolk-bones-3cb6a880284514c8367ededa62d45e90f48c60b6_GH0.tar.gz) = 2a45068252ae870692bad295c84c3c2959de92dad7725ba11cb349b7caad5bb0
+SIZE (fishfolk-bones-3cb6a880284514c8367ededa62d45e90f48c60b6_GH0.tar.gz) = 609022
 SHA256 (MaxCWhitehead-ggrs-96499377407ce55805a9d0367b86860b74c233bd_GH0.tar.gz) = 843e6d00fd7dcd51d6ebcbf6aa9b44b77bc9a03a83dbbc949bb88440bcd1d66b
 SIZE (MaxCWhitehead-ggrs-96499377407ce55805a9d0367b86860b74c233bd_GH0.tar.gz) = 192970
-SHA256 (fishfolk-bones-b7db196ae92898e79575bdfe268c87f07585819d_GH0.tar.gz) = d742f24c4df872f0bfb58f0d12f4e12b3965884d171f258d1bf5e03d53360e77
-SIZE (fishfolk-bones-b7db196ae92898e79575bdfe268c87f07585819d_GH0.tar.gz) = 599042
-SHA256 (fishfolk-jumpy-v0.12.0_GH0.tar.gz) = ae8cd79521ee96e5fb1eb874132ea93cc97c3dffa174ce371327db1619dbf35f
-SIZE (fishfolk-jumpy-v0.12.0_GH0.tar.gz) = 43390814
+SHA256 (fishfolk-jumpy-v0.12.1_GH0.tar.gz) = dd893faea16bfb1636d25119286f5bffe0bd6c2aee202639ca176685fae716f0
+SIZE (fishfolk-jumpy-v0.12.1_GH0.tar.gz) = 43475939
diff --git a/games/jumpy/files/patch-gilrs b/games/jumpy/files/patch-gilrs
index e5c9a4995293..bdd92efc3c9c 100644
--- a/games/jumpy/files/patch-gilrs
+++ b/games/jumpy/files/patch-gilrs
@@ -23,9 +23,9 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
    |                |      help: a similar name exists in the module: `event`
    |                no `epoll` in `sys`
 
---- Cargo.lock.orig	2024-04-22 05:52:33 UTC
+--- Cargo.lock.orig	2024-05-18 20:08:41 UTC
 +++ Cargo.lock
-@@ -2483,9 +2483,9 @@ dependencies = [
+@@ -3042,9 +3042,9 @@ name = "gilrs"
  
  [[package]]
  name = "gilrs"
@@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "fnv",
   "gilrs-core",
-@@ -2496,12 +2496,11 @@ dependencies = [
+@@ -3055,18 +3055,17 @@ name = "gilrs-core"
  
  [[package]]
  name = "gilrs-core"
@@ -52,34 +52,32 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "io-kit-sys",
   "js-sys",
   "libc",
-@@ -2512,7 +2511,7 @@ dependencies = [
+  "libudev-sys",
+  "log",
+- "nix 0.28.0",
++ "nix 0.26.4",
+  "uuid",
   "vec_map",
   "wasm-bindgen",
-  "web-sys",
-- "windows 0.54.0",
-+ "windows 0.48.0",
- ]
- 
- [[package]]
-@@ -2836,17 +2835,6 @@ dependencies = [
-  "libc",
- ]
- 
--[[package]]
--name = "inotify"
--version = "0.10.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+@@ -3697,17 +3696,6 @@ checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104
+ version = "0.9.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
 -dependencies = [
 - "bitflags 1.3.2",
 - "inotify-sys",
 - "libc",
 -]
 -
- [[package]]
- name = "inotify-sys"
- version = "0.1.5"
-@@ -2889,9 +2877,9 @@ dependencies = [
+-[[package]]
+-name = "inotify"
+-version = "0.10.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+ dependencies = [
+  "bitflags 1.3.2",
+  "inotify-sys",
+@@ -3774,9 +3762,9 @@ name = "io-kit-sys"
  
  [[package]]
  name = "io-kit-sys"
@@ -91,33 +89,27 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "core-foundation-sys",
   "mach2",
-@@ -3091,7 +3079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+@@ -4693,19 +4681,7 @@ dependencies = [
+ checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
  dependencies = [
-  "cfg-if",
-- "windows-targets 0.52.5",
-+ "windows-targets 0.48.5",
- ]
- 
- [[package]]
-@@ -3457,13 +3445,12 @@ dependencies = [
- 
- [[package]]
- name = "nix"
+  "bitflags 1.3.2",
+- "cfg-if",
+- "libc",
+-]
+-
+-[[package]]
+-name = "nix"
 -version = "0.28.0"
-+version = "0.26.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
- dependencies = [
+-dependencies = [
 - "bitflags 2.5.0",
-+ "bitflags 1.3.2",
   "cfg-if",
 - "cfg_aliases",
   "libc",
  ]
  
-@@ -3504,7 +3491,7 @@ dependencies = [
+@@ -4764,7 +4740,7 @@ dependencies = [
   "crossbeam-channel",
   "filetime",
   "fsevent-sys",
diff --git a/games/jumpy/files/patch-iroh b/games/jumpy/files/patch-iroh
new file mode 100644
index 000000000000..1a9e339bf41e
--- /dev/null
+++ b/games/jumpy/files/patch-iroh
@@ -0,0 +1,177 @@
+https://github.com/n0-computer/iroh/issues/2306
+
+--- cargo-crates/iroh-net-0.16.2/src/net/interfaces/bsd.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/iroh-net-0.16.2/src/net/interfaces/bsd.rs
+@@ -14,6 +14,8 @@ use macos::*;
+ 
+ #[cfg(any(target_os = "macos", target_os = "ios"))]
+ use macos::*;
++#[cfg(target_os = "freebsd")]
++use freebsd::*;
+ 
+ pub async fn default_route() -> Option<DefaultRouteDetails> {
+     let idx = default_route_interface_index()?;
+@@ -82,6 +84,7 @@ fn is_default_gateway(rm: &RouteMessage) -> bool {
+         return false;
+     }
+ 
++#[cfg(any(target_os = "macos", target_os = "ios"))]
+     if rm.flags & libc::RTF_IFSCOPE as u32 != 0 {
+         return false;
+     }
+@@ -128,7 +131,16 @@ fn parse_routing_table(rib: &[u8]) -> Option<Vec<Route
+ #[cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd",))]
+ fn parse_routing_table(rib: &[u8]) -> Option<Vec<RouteMessage>> {
+     match parse_rib(libc::NET_RT_IFLIST, rib) {
+-        Ok(res) => Some(res),
++        Ok(res) => {
++            let res = res
++                .into_iter()
++                .filter_map(|m| match m {
++                    WireMessage::Route(r) => Some(r),
++                    _ => None,
++                })
++                .collect();
++            Some(res)
++        }
+         Err(err) => {
+             warn!("parse_rib failed: {:?}", err);
+             None
+@@ -178,7 +190,7 @@ const fn is_valid_rib_type(typ: RIBType) -> bool {
+     true
+ }
+ 
+-#[cfg(any(target_os = "free", target_os = "netbsd"))]
++#[cfg(any(target_os = "freebsd", target_os = "netbsd"))]
+ const fn is_valid_rib_type(typ: RIBType) -> bool {
+     true
+ }
+@@ -305,9 +317,9 @@ impl WireFormat {
+                     return Err(RouteError::InvalidMessage);
+                 }
+ 
+-                #[cfg(target_arch = "netbsd")]
++                #[cfg(target_os = "netbsd")]
+                 let index = u16_from_ne_range(data, 16..18)?;
+-                #[cfg(not(target_arch = "netbsd"))]
++                #[cfg(not(target_os = "netbsd"))]
+                 let index = u16_from_ne_range(data, 12..14)?;
+ 
+                 let addrs = parse_addrs(
+@@ -594,6 +606,116 @@ mod macos {
+             (libc::RTM_IFINFO2, ifm2),
+             (libc::RTM_NEWMADDR2, ifmam2),
+             (libc::RTM_GET2, rtm2),
++        ]
++        .into_iter()
++        .collect();
++
++        RoutingStack {
++            rtm_version,
++            wire_formats,
++            kernel_align: 4,
++        }
++    }
++}
++
++#[cfg(target_os = "freebsd")]
++mod freebsd {
++    use super::*;
++
++    // Hardcoded based on the generated values here: https://cs.opensource.google/go/x/net/+/master:route/zsys_freebsd_amd64.go
++
++    pub(super) const SIZEOF_IF_MSGHDRL_FREEBSD10: usize = 0xb0; // 0x68 for target_pointer_width = 32
++    pub(super) const SIZEOF_IFA_MSGHDR_FREEBSD10: usize = 0x14;
++    pub(super) const SIZEOF_IFA_MSGHDRL_FREEBSD10: usize = 0xb0; // 0x6c for target_pointer_width = 32
++    pub(super) const SIZEOF_IFMA_MSGHDR_FREEBSD10: usize = 0x10;
++    pub(super) const SIZEOF_IF_ANNOUNCEMSGHDR_FREEBSD10: usize = 0x18;
++
++    pub(super) const SIZEOF_RT_MSGHDR_FREEBSD10: usize = 0x98; // 0x5c for target_pointer_width = 32
++    pub(super) const SIZEOF_RT_METRICS_FREEBSD10: usize = 0x70; // 0x38 for target_pointer_width = 32
++
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD7: usize = 0xa8; // 0x60 for target_arch = x86, 0x70 for target_arch = arm
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD8: usize = 0xa8; // 0x60 for target_arch = x86, 0x70 for target_arch = arm
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD9: usize = 0xa8; // 0x60 for target_arch = x86, 0x70 for target_arch = arm
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD10: usize = 0xa8; // 0x64 (!) for target_arch = x86, 0x70 for target_arch = arm
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD11: usize = 0xa8;
++
++    pub(super) const SIZEOF_IF_DATA_FREEBSD7: usize = 0x98; // 0x50 for target_arch = x86, 0x60 for target_arch = arm
++    pub(super) const SIZEOF_IF_DATA_FREEBSD8: usize = 0x98; // 0x50 for target_arch = x86, 0x60 for target_arch = arm
++    pub(super) const SIZEOF_IF_DATA_FREEBSD9: usize = 0x98; // 0x50 for target_arch = x86, 0x60 for target_arch = arm
++    pub(super) const SIZEOF_IF_DATA_FREEBSD10: usize = 0x98; // 0x54 (!) for target_arch = x86, 0x60 for target_arch = arm
++    pub(super) const SIZEOF_IF_DATA_FREEBSD11: usize = 0x98;
++
++    pub(super) const SIZEOF_IF_MSGHDRL_FREEBSD10_EMU: usize = 0xb0;
++    pub(super) const SIZEOF_IFA_MSGHDR_FREEBSD10_EMU: usize = 0x14;
++    pub(super) const SIZEOF_IFA_MSGHDRL_FREEBSD10_EMU: usize = 0xb0;
++    pub(super) const SIZEOF_IFMA_MSGHDR_FREEBSD10_EMU: usize = 0x10;
++    pub(super) const SIZEOF_IF_ANNOUNCEMSGHDR_FREEBSD10_EMU: usize = 0x18;
++
++    pub(super) const SIZEOF_RT_MSGHDR_FREEBSD10_EMU: usize = 0x98;
++    pub(super) const SIZEOF_RT_METRICS_FREEBSD10_EMU: usize = 0x70;
++
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD7_EMU: usize = 0xa8;
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD8_EMU: usize = 0xa8;
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD9_EMU: usize = 0xa8;
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD10_EMU: usize = 0xa8;
++    pub(super) const SIZEOF_IF_MSGHDR_FREEBSD11_EMU: usize = 0xa8;
++
++    pub(super) const SIZEOF_IF_DATA_FREEBSD7_EMU: usize = 0x98;
++    pub(super) const SIZEOF_IF_DATA_FREEBSD8_EMU: usize = 0x98;
++    pub(super) const SIZEOF_IF_DATA_FREEBSD9_EMU: usize = 0x98;
++    pub(super) const SIZEOF_IF_DATA_FREEBSD10_EMU: usize = 0x98;
++    pub(super) const SIZEOF_IF_DATA_FREEBSD11_EMU: usize = 0x98;
++
++    pub(super) const SIZEOF_SOCKADDR_STORAGE: usize = 0x80;
++    pub(super) const SIZEOF_SOCKADDR_INET: usize = 0x10;
++    pub(super) const SIZEOF_SOCKADDR_INET6: usize = 0x1c;
++
++    pub(super) fn probe_routing_stack() -> RoutingStack {
++        let rtm_version = libc::RTM_VERSION;
++
++        let rtm = WireFormat {
++            ext_off: SIZEOF_RT_MSGHDR_FREEBSD10,
++            body_off: SIZEOF_RT_MSGHDR_FREEBSD10,
++            typ: MessageType::Route,
++        };
++        let ifm = WireFormat {
++            ext_off: SIZEOF_IF_MSGHDR_FREEBSD11,
++            body_off: SIZEOF_IF_MSGHDR_FREEBSD11,
++            typ: MessageType::Interface,
++        };
++        let ifam = WireFormat {
++            ext_off: SIZEOF_IFA_MSGHDR_FREEBSD10,
++            body_off: SIZEOF_IFA_MSGHDR_FREEBSD10,
++            typ: MessageType::InterfaceAddr,
++        };
++        let ifmam = WireFormat {
++            ext_off: SIZEOF_IFMA_MSGHDR_FREEBSD10,
++            body_off: SIZEOF_IFMA_MSGHDR_FREEBSD10,
++            typ: MessageType::InterfaceMulticastAddr,
++        };
++        let ifannm = WireFormat {
++            ext_off: SIZEOF_IF_ANNOUNCEMSGHDR_FREEBSD10,
++            body_off: SIZEOF_IF_ANNOUNCEMSGHDR_FREEBSD10,
++            typ: MessageType::Interface,
++        };
++
++        let wire_formats = [
++            (libc::RTM_ADD, rtm),
++            (libc::RTM_DELETE, rtm),
++            (libc::RTM_CHANGE, rtm),
++            (libc::RTM_GET, rtm),
++            (libc::RTM_LOSING, rtm),
++            (libc::RTM_REDIRECT, rtm),
++            (libc::RTM_MISS, rtm),
++            (libc::RTM_LOCK, rtm),
++            (libc::RTM_RESOLVE, rtm),
++            (libc::RTM_NEWADDR, ifam),
++            (libc::RTM_DELADDR, ifam),
++            (libc::RTM_IFINFO, ifm),
++            (libc::RTM_NEWMADDR, ifmam),
++            (libc::RTM_DELMADDR, ifmam),
++            (libc::RTM_IFANNOUNCE, ifannm),
++            (libc::RTM_IEEE80211, ifannm),
+         ]
+         .into_iter()
+         .collect();
diff --git a/games/jumpy/files/patch-libc b/games/jumpy/files/patch-libc
new file mode 100644
index 000000000000..827181207ead
--- /dev/null
+++ b/games/jumpy/files/patch-libc
@@ -0,0 +1,42 @@
+https://github.com/rust-lang/libc/issues/3711
+
+--- cargo-crates/libc-0.2.153/src/unix/bsd/freebsdlike/mod.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/libc-0.2.153/src/unix/bsd/freebsdlike/mod.rs
+@@ -1015,6 +1015,37 @@ pub const LOCAL_PEERCRED: ::c_int = 1;
+ 
+ pub const LOCAL_PEERCRED: ::c_int = 1;
+ 
++// net/route.h
++pub const RTF_GATEWAY: ::c_int = 0x2;
++pub const RTA_IFP: ::c_int = 0x10;
++pub const RTAX_DST: ::c_int = 0;
++pub const RTAX_GATEWAY: ::c_int = 1;
++pub const RTAX_NETMASK: ::c_int = 2;
++pub const RTAX_IFP: ::c_int = 4;
++pub const RTAX_BRD: ::c_int = 7;
++pub const RTAX_MAX: ::c_int = 8;
++pub const RTM_VERSION: ::c_int = 5;
++
++// Message types
++pub const RTM_ADD: ::c_int = 0x1;
++pub const RTM_DELETE: ::c_int = 0x2;
++pub const RTM_CHANGE: ::c_int = 0x3;
++pub const RTM_GET: ::c_int = 0x4;
++pub const RTM_LOSING: ::c_int = 0x5;
++pub const RTM_REDIRECT: ::c_int = 0x6;
++pub const RTM_MISS: ::c_int = 0x7;
++pub const RTM_LOCK: ::c_int = 0x8;
++pub const RTM_OLDADD: ::c_int = 0x9;
++pub const RTM_OLDDEL: ::c_int = 0xa;
++pub const RTM_RESOLVE: ::c_int = 0xb;
++pub const RTM_NEWADDR: ::c_int = 0xc;
++pub const RTM_DELADDR: ::c_int = 0xd;
++pub const RTM_IFINFO: ::c_int = 0xe;
++pub const RTM_NEWMADDR: ::c_int = 0xf;
++pub const RTM_DELMADDR: ::c_int = 0x10;
++pub const RTM_IFANNOUNCE: ::c_int = 0x11;
++pub const RTM_IEEE80211: ::c_int = 0x12;
++
+ pub const SHUT_RD: ::c_int = 0;
+ pub const SHUT_WR: ::c_int = 1;
+ pub const SHUT_RDWR: ::c_int = 2;
diff --git a/games/jumpy/files/patch-wayland b/games/jumpy/files/patch-wayland
index 56721e75162d..960ebe7c4361 100644
--- a/games/jumpy/files/patch-wayland
+++ b/games/jumpy/files/patch-wayland
@@ -1,24 +1,12 @@
 https://github.com/bevyengine/bevy/issues/4106
 
---- Cargo.lock.orig	2024-04-22 05:52:33 UTC
+--- Cargo.lock.orig	2024-05-18 20:08:41 UTC
 +++ Cargo.lock
-@@ -219,6 +219,12 @@ dependencies = [
-  "x11rb",
- ]
- 
-+[[package]]
-+name = "arrayref"
-+version = "0.3.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-+
- [[package]]
- name = "arrayvec"
- version = "0.7.4"
-@@ -1382,6 +1388,20 @@ version = "1.6.0"
+@@ -1527,6 +1527,20 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa
+ version = "1.6.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
- 
++
 +[[package]]
 +name = "calloop"
 +version = "0.10.6"
@@ -32,54 +20,30 @@ https://github.com/bevyengine/bevy/issues/4106
 + "thiserror",
 + "vec_map",
 +]
-+
+ 
  [[package]]
  name = "cc"
- version = "1.0.94"
-@@ -1831,6 +1851,15 @@ dependencies = [
+@@ -2184,6 +2198,15 @@ dependencies = [
+  "proc-macro2",
+  "quote",
   "syn 2.0.58",
- ]
- 
++]
++
 +[[package]]
 +name = "dlib"
 +version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 +dependencies = [
-+ "libloading 0.7.4",
-+]
-+
- [[package]]
- name = "document-features"
- version = "0.2.8"
-@@ -2506,12 +2535,12 @@ dependencies = [
-  "libc",
-  "libudev-sys",
-  "log",
-- "nix",
-+ "nix 0.26.4",
-  "uuid",
-  "vec_map",
-  "wasm-bindgen",
-  "web-sys",
-- "windows 0.48.0",
-+ "windows 0.44.0",
++ "libloading 0.8.3",
  ]
  
  [[package]]
-@@ -3079,7 +3108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
- dependencies = [
-  "cfg-if",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.5",
- ]
- 
- [[package]]
-@@ -3268,6 +3297,24 @@ version = "2.7.2"
+@@ -4413,8 +4436,26 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec5
+ version = "2.7.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
- 
++
 +[[package]]
 +name = "memmap2"
 +version = "0.5.10"
@@ -88,8 +52,8 @@ https://github.com/bevyengine/bevy/issues/4106
 +dependencies = [
 + "libc",
 +]
-+
-+[[package]]
+ 
+ [[package]]
 +name = "memoffset"
 +version = "0.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -98,13 +62,16 @@ https://github.com/bevyengine/bevy/issues/4106
 + "autocfg",
 +]
 +
- [[package]]
++[[package]]
  name = "metal"
  version = "0.24.0"
-@@ -3443,6 +3490,31 @@ dependencies = [
-  "jni-sys",
- ]
- 
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -4684,10 +4725,35 @@ dependencies = [
+  "libc",
+  "log",
+  "tokio",
++]
++
 +[[package]]
 +name = "nix"
 +version = "0.24.3"
@@ -115,10 +82,10 @@ https://github.com/bevyengine/bevy/issues/4106
 + "cfg-if",
 + "libc",
 + "memoffset",
-+]
-+
-+[[package]]
-+name = "nix"
+ ]
+ 
+ [[package]]
+ name = "nix"
 +version = "0.25.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
@@ -130,27 +97,28 @@ https://github.com/bevyengine/bevy/issues/4106
 + "memoffset",
 +]
 +
- [[package]]
- name = "nix"
++[[package]]
++name = "nix"
  version = "0.26.4"
-@@ -4654,6 +4726,12 @@ dependencies = [
-  "windows-sys 0.52.0",
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
+@@ -6457,6 +6523,12 @@ dependencies = [
  ]
  
-+[[package]]
+ [[package]]
 +name = "scoped-tls"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 +
- [[package]]
++[[package]]
  name = "scopeguard"
  version = "1.2.0"
-@@ -4670,6 +4748,19 @@ dependencies = [
-  "untrusted 0.9.0",
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -6473,6 +6545,19 @@ dependencies = [
  ]
  
-+[[package]]
+ [[package]]
 +name = "sctk-adwaita"
 +version = "0.5.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -163,13 +131,16 @@ https://github.com/bevyengine/bevy/issues/4106
 + "tiny-skia",
 +]
 +
- [[package]]
- name = "security-framework"
- version = "2.10.0"
-@@ -4872,6 +4963,25 @@ dependencies = [
++[[package]]
+ name = "sec1"
+ version = "0.7.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -6766,6 +6851,25 @@ dependencies = [
+ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+ dependencies = [
   "serde",
- ]
- 
++]
++
 +[[package]]
 +name = "smithay-client-toolkit"
 +version = "0.16.1"
@@ -187,28 +158,28 @@ https://github.com/bevyengine/bevy/issues/4106
 + "wayland-client",
 + "wayland-cursor",
 + "wayland-protocols",
-+]
-+
+ ]
+ 
  [[package]]
- name = "smol_str"
- version = "0.2.1"
-@@ -4956,6 +5066,12 @@ version = "1.1.0"
+@@ -6912,6 +7016,12 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69
+ version = "1.1.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
- 
++
 +[[package]]
 +name = "strict-num"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-+
+ 
  [[package]]
- name = "strum"
- version = "0.25.0"
-@@ -5215,6 +5331,31 @@ dependencies = [
+ name = "struct_iterable"
+@@ -7332,6 +7442,31 @@ dependencies = [
+ dependencies = [
+  "num-conv",
   "time-core",
- ]
- 
++]
++
 +[[package]]
 +name = "tiny-skia"
 +version = "0.8.4"
@@ -232,15 +203,15 @@ https://github.com/bevyengine/bevy/issues/4106
 + "arrayref",
 + "bytemuck",
 + "strict-num",
+ ]
+ 
+ [[package]]
+@@ -7954,9 +8089,60 @@ dependencies = [
+  "futures-util",
+  "parking_lot",
+  "thiserror",
 +]
 +
- [[package]]
- name = "tinystr"
- version = "0.7.5"
-@@ -5698,6 +5839,57 @@ version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
- 
 +[[package]]
 +name = "wayland-client"
 +version = "0.29.5"
@@ -267,9 +238,9 @@ https://github.com/bevyengine/bevy/issues/4106
 + "once_cell",
 + "smallvec",
 + "wayland-sys",
-+]
-+
-+[[package]]
+ ]
+ 
+ [[package]]
 +name = "wayland-cursor"
 +version = "0.29.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -292,14 +263,14 @@ https://github.com/bevyengine/bevy/issues/4106
 + "wayland-scanner",
 +]
 +
- [[package]]
++[[package]]
  name = "wayland-scanner"
  version = "0.29.5"
-@@ -5709,6 +5901,17 @@ dependencies = [
-  "xml-rs",
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -7968,6 +8154,17 @@ dependencies = [
  ]
  
-+[[package]]
+ [[package]]
 +name = "wayland-sys"
 +version = "0.29.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -310,10 +281,11 @@ https://github.com/bevyengine/bevy/issues/4106
 + "pkg-config",
 +]
 +
- [[package]]
++[[package]]
  name = "web-sys"
  version = "0.3.69"
-@@ -6241,7 +6444,12 @@ dependencies = [
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -8558,7 +8755,12 @@ dependencies = [
   "percent-encoding",
   "raw-window-handle",
   "redox_syscall 0.3.5",
@@ -326,21 +298,21 @@ https://github.com/bevyengine/bevy/issues/4106
   "wayland-scanner",
   "web-sys",
   "windows-sys 0.45.0",
-@@ -6294,6 +6502,12 @@ version = "0.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+@@ -8670,6 +8872,12 @@ dependencies = [
+ ]
  
-+[[package]]
+ [[package]]
 +name = "xcursor"
 +version = "0.3.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
 +
- [[package]]
++[[package]]
  name = "xml-rs"
  version = "0.8.20"
---- ../bones-b7db196ae92898e79575bdfe268c87f07585819d/framework_crates/bones_bevy_renderer/Cargo.toml.orig	2024-04-22 04:54:42 UTC
-+++ ../bones-b7db196ae92898e79575bdfe268c87f07585819d/framework_crates/bones_bevy_renderer/Cargo.toml
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- ../bones-3cb6a880284514c8367ededa62d45e90f48c60b6/framework_crates/bones_bevy_renderer/Cargo.toml.orig	2024-05-17 23:28:12 UTC
++++ ../bones-3cb6a880284514c8367ededa62d45e90f48c60b6/framework_crates/bones_bevy_renderer/Cargo.toml
 @@ -26,7 +26,7 @@ default-features = false
  
  [dependencies.bevy]
diff --git a/games/neo-cowsay/Makefile b/games/neo-cowsay/Makefile
index f228ff262087..648265fde134 100644
--- a/games/neo-cowsay/Makefile
+++ b/games/neo-cowsay/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	neo-cowsay
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.4
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	games
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile
index d45ca7f913ba..a0ede290affc 100644
--- a/games/openfodder/Makefile
+++ b/games/openfodder/Makefile
@@ -2,6 +2,9 @@ PORTNAME=	OpenFodder
 DISTVERSION=	1.8.0
 CATEGORIES=	games
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	a5eac175f940.patch:-p1 # https://github.com/OpenFodder/openfodder/issues/89
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Open source port of Cannon Fodder
 WWW=		http://openfodder.com/
diff --git a/games/openfodder/distinfo b/games/openfodder/distinfo
index 04733020fd03..3335dacb9258 100644
--- a/games/openfodder/distinfo
+++ b/games/openfodder/distinfo
@@ -5,3 +5,5 @@ SHA256 (OpenFodder-data-1.7.0_GH0.tar.gz) = a5d39084e4d0e272ac8fa86f931e86923b70
 SIZE (OpenFodder-data-1.7.0_GH0.tar.gz) = 3384943
 SHA256 (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 3fbb82605c8bfbc3404220cee2044c368f0f82cdf23f9adcb6144e7743cf9c71
 SIZE (OpenFodder-scripts-c6f3076_GH0.tar.gz) = 50622
+SHA256 (a5eac175f940.patch) = 13a656f7548e31ea9cb296534545dd2e5dde322f2df6e2e799dc905d3d265bcf
+SIZE (a5eac175f940.patch) = 1141
diff --git a/games/openra/Makefile b/games/openra/Makefile
index aa1d4540e05e..b07d63c0d8e0 100644
--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openra
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	20210321
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	https://download.ip2location.com/lite/:ip2location
 DISTFILES=	IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP:ip2location
diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile
index 865b7dab1c9c..c994d5b44d50 100644
--- a/games/veloren-weekly/Makefile
+++ b/games/veloren-weekly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	veloren
-PORTVERSION=	s20240502
+PORTVERSION=	s20240630
 CATEGORIES=	games wayland
 PKGNAMESUFFIX=	-weekly
 
@@ -18,14 +18,15 @@ ONLY_FOR_ARCHS_REASON=	unsupported platform by https://github.com/wasmerio/wasme
 LIB_DEPENDS=	libzstd.so:archivers/zstd \
 		libasound.so:audio/alsa-lib \
 		libudev.so:devel/libudev-devd \
-		libshaderc_shared.so:graphics/shaderc
+		libshaderc_shared.so:graphics/shaderc \
+		libxkbcommon-x11.so:x11/libxkbcommon
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 		${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
 
 USES=		cargo xorg
 USE_XORG=	xcb
 USE_GITLAB=	yes
-GL_TAGNAME=	v0.16.0-130-g0b9c2621f # git describe --match='v[0-9]*' weekly
+GL_TAGNAME=	v0.16.0-306-ga3ef7ddf9 # git describe --match='v[0-9]*' weekly
 CARGO_ENV=	VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib"
 PLIST_FILES=	bin/${PORTNAME}-server-cli \
 		bin/${PORTNAME}-voxygen \
diff --git a/games/veloren-weekly/Makefile.crates b/games/veloren-weekly/Makefile.crates
index 4c0a53c3096a..7aae735153ea 100644
--- a/games/veloren-weekly/Makefile.crates
+++ b/games/veloren-weekly/Makefile.crates
@@ -1,13 +1,13 @@
-CARGO_CRATES=	ab_glyph-0.2.23 \
+CARGO_CRATES=	ab_glyph-0.2.27 \
 		ab_glyph_rasterizer-0.1.8 \
 		addr2line-0.21.0 \
+		addr2line-0.22.0 \
 		adler-1.0.2 \
 		adler32-1.2.0 \
 		ahash-0.4.8 \
-		ahash-0.7.8 \
 		ahash-0.8.11 \
 		aho-corasick-1.1.3 \
-		allocator-api2-0.2.16 \
+		allocator-api2-0.2.18 \
 		alsa-0.9.0 \
 		alsa-sys-0.3.1 \
 		ambient-authority-0.0.2 \
@@ -16,12 +16,12 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
 		anes-0.1.6 \
-		anstream-0.6.13 \
-		anstyle-1.0.6 \
-		anstyle-parse-0.2.3 \
-		anstyle-query-1.0.2 \
-		anstyle-wincon-3.0.2 \
-		anyhow-1.0.81 \
+		anstream-0.6.14 \
+		anstyle-1.0.7 \
+		anstyle-parse-0.2.4 \
+		anstyle-query-1.1.0 \
+		anstyle-wincon-3.0.3 \
+		anyhow-1.0.86 \
 		anymap2-0.13.0 \
 		app_dirs2-2.5.5 \
 		approx-0.3.2 \
@@ -35,134 +35,136 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		as-raw-xcb-connection-1.0.1 \
 		ascii-1.1.0 \
 		ash-0.37.3+1.3.251 \
-		assets_manager-0.11.3 \
-		async-channel-2.2.0 \
-		async-trait-0.1.78 \
-		atomic-polyfill-1.0.3 \
+		assets_manager-0.11.6 \
+		async-channel-2.3.1 \
+		async-trait-0.1.80 \
 		atomic_refcell-0.1.13 \
 		atomicwrites-0.4.3 \
-		autocfg-1.1.0 \
-		axum-0.6.20 \
-		axum-core-0.3.4 \
-		backtrace-0.3.69 \
+		autocfg-1.3.0 \
+		axum-0.7.5 \
+		axum-core-0.4.3 \
+		az-1.2.1 \
+		backtrace-0.3.73 \
 		base64-0.21.7 \
+		base64-0.22.1 \
 		bincode-1.3.3 \
 		bindgen-0.69.4 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bitflags-1.3.2 \
-		bitflags-2.5.0 \
+		bitflags-2.6.0 \
 		bitvec-1.0.1 \
 		blake2b_simd-1.0.2 \
 		block-0.1.6 \
 		block-buffer-0.10.4 \
 		block-sys-0.1.0-beta.1 \
 		block2-0.2.0-alpha.6 \
-		bumpalo-3.15.4 \
-		bytemuck-1.15.0 \
-		bytemuck_derive-1.6.0 \
+		bumpalo-3.16.0 \
+		bytemuck-1.16.1 \
+		bytemuck_derive-1.7.0 \
 		byteorder-1.5.0 \
-		bytes-1.5.0 \
+		bytes-1.6.0 \
 		calloop-0.10.6 \
+		calloop-0.12.4 \
+		calloop-wayland-source-0.2.0 \
 		cansi-2.2.1 \
-		cap-fs-ext-2.0.1 \
-		cap-net-ext-2.0.1 \
-		cap-primitives-2.0.1 \
-		cap-rand-2.0.1 \
-		cap-std-2.0.1 \
-		cap-time-ext-2.0.1 \
+		cap-fs-ext-3.1.0 \
+		cap-net-ext-3.1.0 \
+		cap-primitives-3.1.0 \
+		cap-rand-3.1.0 \
+		cap-std-3.1.0 \
+		cap-time-ext-3.1.0 \
 		cassowary-0.3.0 \
 		cast-0.3.0 \
 		castaway-0.2.2 \
-		cc-1.0.90 \
+		cc-1.0.102 \
 		censor-0.3.0 \
 		cesu8-1.1.0 \
 		cexpr-0.6.0 \
 		cfg-if-0.1.10 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
-		chrono-0.4.35 \
-		chrono-tz-0.8.6 \
-		chrono-tz-build-0.2.1 \
+		chrono-0.4.38 \
+		chrono-tz-0.9.0 \
+		chrono-tz-build-0.3.0 \
 		chumsky-0.9.3 \
 		ciborium-0.2.2 \
 		ciborium-io-0.2.2 \
 		ciborium-ll-0.2.2 \
-		clang-sys-1.7.0 \
-		clap-4.5.3 \
-		clap_builder-4.5.2 \
-		clap_derive-4.5.3 \
-		clap_lex-0.7.0 \
+		clang-sys-1.8.1 \
+		clap-4.5.8 \
+		clap_builder-4.5.8 \
+		clap_derive-4.5.8 \
+		clap_lex-0.7.1 \
 		clipboard-win-3.1.1 \
 		clipboard-win-4.5.0 \
-		clipboard-win-5.3.0 \
+		clipboard-win-5.3.1 \
 		clipboard_macos-0.1.0 \
-		clipboard_wayland-0.2.0 \
+		clipboard_wayland-0.2.2 \
 		clipboard_x11-0.4.2 \
-		cmake-0.1.45 \
-		cocoa-0.24.1 \
+		cmake-0.1.50 \
+		cocoa-0.25.0 \
 		cocoa-foundation-0.1.2 \
 		codespan-reporting-0.11.1 \
-		color_quant-1.1.0 \
-		colorchoice-1.0.0 \
+		colorchoice-1.0.1 \
 		com-rs-0.2.1 \
-		combine-4.6.6 \
+		combine-4.6.7 \
 		compact_str-0.7.1 \
-		concurrent-queue-2.4.0 \
+		concurrent-queue-2.5.0 \
 		console-0.15.8 \
 		constant_time_eq-0.3.0 \
 		copypasta-0.8.2 \
 		core-foundation-0.9.4 \
 		core-foundation-sys-0.8.6 \
 		core-graphics-0.22.3 \
+		core-graphics-0.23.2 \
 		core-graphics-types-0.1.3 \
 		coreaudio-rs-0.11.3 \
 		coreaudio-sys-0.2.15 \
 		cpal-0.15.3 \
-		cpp_demangle-0.3.5 \
+		cpp_demangle-0.4.3 \
 		cpufeatures-0.2.12 \
-		cranelift-bforest-0.104.2 \
-		cranelift-codegen-0.104.2 \
-		cranelift-codegen-meta-0.104.2 \
-		cranelift-codegen-shared-0.104.2 \
-		cranelift-control-0.104.2 \
-		cranelift-entity-0.104.2 \
-		cranelift-frontend-0.104.2 \
-		cranelift-isle-0.104.2 \
-		cranelift-native-0.104.2 \
-		cranelift-wasm-0.104.2 \
-		crc32fast-1.4.0 \
+		cranelift-bforest-0.107.2 \
+		cranelift-codegen-0.107.2 \
+		cranelift-codegen-meta-0.107.2 \
+		cranelift-codegen-shared-0.107.2 \
+		cranelift-control-0.107.2 \
+		cranelift-entity-0.107.2 \
+		cranelift-frontend-0.107.2 \
+		cranelift-isle-0.107.2 \
+		cranelift-native-0.107.2 \
+		cranelift-wasm-0.107.2 \
+		crc32fast-1.4.2 \
 		criterion-0.5.1 \
 		criterion-plot-0.5.0 \
-		critical-section-1.1.2 \
-		crossbeam-channel-0.5.12 \
+		crossbeam-channel-0.5.13 \
 		crossbeam-deque-0.7.4 \
 		crossbeam-deque-0.8.5 \
 		crossbeam-epoch-0.8.2 \
 		crossbeam-epoch-0.9.18 \
 		crossbeam-queue-0.3.11 \
 		crossbeam-utils-0.7.2 \
-		crossbeam-utils-0.8.19 \
+		crossbeam-utils-0.8.20 \
 		crossterm-0.27.0 \
 		crossterm_winapi-0.9.1 \
 		crunchy-0.2.2 \
 		crypto-common-0.1.6 \
 		csv-1.3.0 \
 		csv-core-0.1.11 \
-		cty-0.2.2 \
 		culpa-1.0.2 \
 		culpa-macros-1.0.2 \
+		cursor-icon-1.1.0 \
 		d3d12-0.7.0 \
 		daggy-0.5.0 \
-		darling-0.20.8 \
-		darling_core-0.20.8 \
-		darling_macro-0.20.8 \
+		darling-0.20.9 \
+		darling_core-0.20.9 \
+		darling_macro-0.20.9 \
 		dasp_sample-0.11.0 \
-		data-encoding-2.5.0 \
+		data-encoding-2.6.0 \
 		debugid-0.8.0 \
 		deflate-1.0.0 \
 		deranged-0.3.11 \
-		deunicode-1.4.3 \
+		deunicode-1.6.0 \
 		digest-0.10.7 \
 		directories-next-2.0.0 \
 		dirs-4.0.0 \
@@ -172,21 +174,23 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		dirs-sys-0.4.1 \
 		dirs-sys-next-0.1.2 \
 		discord-sdk-0.3.6 \
-		dispatch-0.1.4 \
 		dispatch-0.2.0 \
-		displaydoc-0.2.4 \
+		displaydoc-0.2.5 \
+		divrem-1.0.0 \
 		dlib-0.5.2 \
+		doc-comment-0.3.3 \
 		dot_vox-5.1.1 \
-		downcast-rs-1.2.0 \
+		downcast-rs-1.2.1 \
 		drop_guard-0.3.0 \
 		ecolor-0.23.0 \
 		egui-0.23.0 \
 		egui_plot-0.23.0 \
 		egui_winit_platform-0.20.0 \
-		either-1.10.0 \
+		either-1.13.0 \
+		elapsed-0.1.2 \
 		emath-0.23.0 \
 		encode_unicode-0.3.6 \
-		encoding_rs-0.8.33 \
+		encoding_rs-0.8.34 \
 		endian-type-0.1.2 \
 		enum-as-inner-0.6.0 \
 		enum-map-2.7.3 \
@@ -195,23 +199,25 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		enumset_derive-0.8.1 \
 		epaint-0.23.0 \
 		equivalent-1.0.1 \
-		errno-0.3.8 \
+		errno-0.3.9 \
+		error-chain-0.12.4 \
 		error-code-2.3.1 \
 		error-code-3.2.0 \
 		euc-0.5.3 \
-		euclid-0.22.9 \
-		event-listener-5.2.0 \
-		event-listener-strategy-0.5.0 \
+		euclid-0.22.10 \
+		event-listener-5.3.1 \
+		event-listener-strategy-0.5.2 \
 		fallible-iterator-0.3.0 \
 		fallible-streaming-iterator-0.1.9 \
-		fastrand-2.0.1 \
+		fastrand-2.1.0 \
 		fd-lock-4.0.2 \
 		fdeflate-0.3.4 \
 		filetime-0.2.23 \
 		find_folder-0.3.0 \
+		fixed-1.27.0 \
 		fixedbitset-0.1.9 \
 		fixedbitset-0.4.2 \
-		flate2-1.0.28 \
+		flate2-1.0.30 \
 		float-cmp-0.9.0 \
 		fluent-langneg-0.13.0 \
 		flume-0.11.0 \
@@ -237,114 +243,119 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		fxhash-0.2.1 \
 		fxprof-processed-profile-0.6.0 \
 		generator-0.7.5 \
+		generator-0.8.1 \
 		generic-array-0.14.7 \
 		gethostname-0.2.3 \
 		gethostname-0.4.3 \
-		getrandom-0.1.16 \
-		getrandom-0.2.12 \
+		getrandom-0.2.15 \
 		gilrs-0.10.2 \
 		gilrs-core-0.5.7 \
 		gimli-0.28.1 \
+		gimli-0.29.0 \
 		gl_generator-0.14.0 \
 		glam-0.10.2 \
 		glob-0.3.1 \
 		glow-0.13.1 \
 		glutin_wgl_sys-0.5.0 \
-		glyph_brush-0.7.8 \
-		glyph_brush_draw_cache-0.1.5 \
-		glyph_brush_layout-0.2.3 \
+		glyph_brush-0.7.9 \
+		glyph_brush_draw_cache-0.1.6 \
+		glyph_brush_layout-0.2.4 \
 		gpu-alloc-0.6.0 \
 		gpu-alloc-types-0.3.0 \
 		gpu-allocator-0.23.0 \
 		gpu-descriptor-0.2.4 \
 		gpu-descriptor-types-0.1.2 \
 		guillotiere-0.6.2 \
-		h2-0.3.25 \
-		half-2.4.0 \
-		hash32-0.2.1 \
+		half-2.4.1 \
+		hash32-0.3.1 \
 		hashbrown-0.9.1 \
 		hashbrown-0.13.2 \
-		hashbrown-0.14.3 \
-		hashlink-0.8.4 \
+		hashbrown-0.14.5 \
+		hashlink-0.9.1 \
 		hassle-rs-0.10.0 \
-		heapless-0.7.17 \
+		heapless-0.8.0 \
 		heck-0.4.1 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
+		hermit-abi-0.4.0 \
 		hex-0.4.3 \
 		hexf-parse-0.2.1 \
 		hibitset-0.6.4 \
-		hickory-proto-0.24.0 \
-		hickory-resolver-0.24.0 \
+		hickory-proto-0.24.1 \
+		hickory-resolver-0.24.1 \
 		home-0.5.9 \
 		hostname-0.3.1 \
-		http-0.2.12 \
-		http-body-0.4.6 \
-		httparse-1.8.0 \
+		http-1.1.0 \
+		http-body-1.0.0 \
+		http-body-util-0.1.2 \
+		httparse-1.9.4 \
 		httpdate-1.0.3 \
 		humantime-2.1.0 \
-		hyper-0.14.28 \
-		hyper-rustls-0.24.2 \
+		hyper-1.3.1 \
+		hyper-rustls-0.27.2 \
+		hyper-util-0.1.5 \
 		iana-time-zone-0.1.60 \
 		iana-time-zone-haiku-0.1.2 \
 		id-arena-2.2.1 \
 		ident_case-1.0.1 \
 		idna-0.4.0 \
 		idna-0.5.0 \
-		image-0.24.9 \
-		indexmap-2.2.5 \
+		image-0.25.1 \
+		indexmap-2.2.6 \
 		indicatif-0.17.8 \
-		indoc-2.0.4 \
+		init_with-1.1.0 \
 		inline_tweak-1.1.1 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
-		instant-0.1.12 \
+		instant-0.1.13 \
 		intl_pluralrules-7.0.2 \
-		io-extras-0.18.1 \
+		io-extras-0.18.2 \
 		io-kit-sys-0.3.0 \
 		io-lifetimes-2.0.3 \
 		ipconfig-0.3.2 \
 		ipnet-2.9.0 \
 		is-terminal-0.4.12 \
+		is_terminal_polyfill-1.70.0 \
 		itertools-0.10.5 \
+		itertools-0.11.0 \
 		itertools-0.12.1 \
-		itoa-1.0.10 \
+		itertools-0.13.0 \
+		itoa-1.0.11 \
 		ittapi-0.4.0 \
 		ittapi-sys-0.4.0 \
+		jni-0.19.0 \
 		jni-0.21.1 \
 		jni-sys-0.3.0 \
-		jobserver-0.1.28 \
-		jpeg-decoder-0.3.1 \
+		jobserver-0.1.31 \
 		js-sys-0.3.69 \
 		khronos-egl-6.0.0 \
 		khronos_api-3.1.0 \
-		kiddo-0.2.5 \
+		kiddo-4.2.0 \
 		kqueue-1.0.8 \
 		kqueue-sys-1.0.4 \
 		lazy-bytes-cast-5.0.1 \
-		lazy_static-1.4.0 \
+		lazy_static-1.5.0 \
 		lazycell-1.3.0 \
 		leb128-0.2.5 \
 		levenshtein-1.0.5 \
 		lewton-0.10.2 \
-		libc-0.2.153 \
+		libc-0.2.155 \
 		libloading-0.7.4 \
-		libloading-0.8.3 \
+		libloading-0.8.4 \
 		libm-0.2.8 \
-		libmimalloc-sys-0.1.35 \
-		libredox-0.0.1 \
+		libmimalloc-sys-0.1.39 \
 		libredox-0.0.2 \
-		libsqlite3-sys-0.27.0 \
+		libredox-0.1.3 \
+		libsqlite3-sys-0.28.0 \
 		libudev-sys-0.1.4 \
 		linked-hash-map-0.5.6 \
-		linux-raw-sys-0.4.13 \
-		lock_api-0.4.11 \
-		log-0.4.21 \
-		loom-0.5.6 \
+		linux-raw-sys-0.4.14 \
+		lock_api-0.4.12 \
+		log-0.4.22 \
+		loom-0.7.2 \
 		lru-0.12.3 \
 		lru-cache-0.1.2 \
 		lz-fear-0.2.0 \
-		mach-0.3.2 \
 		mach2-0.4.2 \
 		macro_rules_attribute-0.1.3 \
 		macro_rules_attribute-proc_macro-0.1.3 \
@@ -354,23 +365,24 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		matchit-0.7.3 \
 		maybe-owned-0.3.4 \
 		maybe-uninit-2.0.0 \
-		memchr-2.7.1 \
+		memchr-2.7.4 \
 		memfd-0.6.4 \
 		memmap2-0.5.10 \
 		memmap2-0.7.1 \
+		memmap2-0.9.4 \
 		memoffset-0.5.6 \
 		memoffset-0.6.5 \
-		memoffset-0.9.0 \
+		memoffset-0.9.1 \
 		metal-0.27.0 \
-		mimalloc-0.1.39 \
+		mimalloc-0.1.43 \
 		mime-0.3.17 \
-		minifb-0.25.0 \
+		minifb-0.27.0 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.7.2 \
+		miniz_oxide-0.7.4 \
 		mio-0.8.11 \
 		mumble-link-0.2.0 \
 		nanorand-0.7.0 \
-		native-dialog-0.6.4 \
+		native-dialog-0.7.0 \
 		ndk-0.7.0 \
 		ndk-0.8.0 \
 		ndk-context-0.1.1 \
@@ -382,25 +394,25 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		nix-0.26.4 \
 		nix-0.28.0 \
 		nohash-hasher-0.2.0 \
-		noise-0.7.0 \
+		noise-0.9.0 \
 		nom-7.1.3 \
 		notify-6.1.1 \
 		nougat-0.2.4 \
 		nougat-proc_macros-0.2.4 \
 		nu-ansi-term-0.46.0 \
 		num-0.2.1 \
-		num-0.4.1 \
+		num-0.4.3 \
 		num-bigint-0.2.6 \
-		num-bigint-0.4.4 \
+		num-bigint-0.4.6 \
 		num-complex-0.2.4 \
-		num-complex-0.4.5 \
+		num-complex-0.4.6 \
 		num-conv-0.1.0 \
 		num-derive-0.4.2 \
 		num-integer-0.1.46 \
-		num-iter-0.1.44 \
+		num-iter-0.1.45 \
 		num-rational-0.2.4 \
-		num-rational-0.4.1 \
-		num-traits-0.2.18 \
+		num-rational-0.4.2 \
+		num-traits-0.2.19 \
 		num_cpus-1.16.0 \
 		num_enum-0.5.11 \
 		num_enum-0.6.1 \
@@ -416,7 +428,8 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		objc2-encode-2.0.0-pre.2 \
 		objc_exception-0.1.2 \
 		objc_id-0.1.1 \
-		object-0.32.2 \
+		object-0.33.0 \
+		object-0.36.1 \
 		oboe-0.6.1 \
 		oboe-sys-0.6.1 \
 		ogg-0.8.0 \
@@ -426,133 +439,135 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		option-ext-0.2.0 \
 		orbclient-0.3.47 \
 		ordered-float-1.1.1 \
-		ordered-float-3.9.2 \
-		ordered-float-4.2.0 \
+		ordered-float-4.2.1 \
 		overload-0.1.1 \
-		owned_ttf_parser-0.20.0 \
-		packed_simd-0.3.9 \
+		owned_ttf_parser-0.21.0 \
 		parking-2.2.0 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.9 \
-		parse-zoneinfo-0.3.0 \
-		paste-1.0.14 \
-		pem-3.0.3 \
+		parking_lot-0.12.3 \
+		parking_lot_core-0.9.10 \
+		parse-zoneinfo-0.3.1 \
+		paste-1.0.15 \
+		pem-3.0.4 \
 		percent-encoding-2.3.1 \
 		petgraph-0.4.13 \
-		petgraph-0.6.4 \
+		petgraph-0.6.5 \
 		phf-0.11.2 \
 		phf_codegen-0.11.2 \
 		phf_generator-0.11.2 \
 		phf_shared-0.11.2 \
 		pin-project-1.1.5 \
 		pin-project-internal-1.1.5 \
-		pin-project-lite-0.2.13 \
+		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
 		piston-float-0.3.0 \
 		piston-viewport-0.5.0 \
 		pistoncore-input-0.24.0 \
 		pkg-config-0.3.30 \
 		png-0.17.13 \
+		polling-3.7.2 \
 		portable-atomic-1.6.0 \
 		powerfmt-0.2.0 \
 		pp-rs-0.2.1 \
 		ppv-lite86-0.2.17 \
 		presser-0.3.1 \
 		proc-macro-crate-1.3.1 \
+		proc-macro-crate-3.1.0 \
 		proc-macro-hack-0.5.20+deprecated \
 		proc-macro-nested-0.1.7 \
 		proc-macro2-0.4.30 \
-		proc-macro2-1.0.79 \
-		profiling-1.0.8 \
+		proc-macro2-1.0.86 \
+		profiling-1.0.15 \
 		profiling-procmacros-1.0.15 \
-		prometheus-0.13.3 \
-		prometheus-hyper-0.1.5 \
+		prometheus-0.13.4 \
+		prometheus-hyper-0.2.0 \
+		protocol-3.4.0 \
+		protocol-derive-3.4.0 \
 		psm-0.1.21 \
 		quick-error-1.2.3 \
 		quick-xml-0.30.0 \
-		quinn-0.10.2 \
-		quinn-proto-0.10.6 \
-		quinn-udp-0.4.1 \
+		quick-xml-0.31.0 \
+		quinn-0.11.2 \
+		quinn-proto-0.11.3 \
+		quinn-udp-0.5.2 \
 		quote-0.6.13 \
-		quote-1.0.35 \
+		quote-1.0.36 \
 		radium-0.7.0 \
 		radix_trie-0.2.1 \
-		rand-0.7.3 \
 		rand-0.8.5 \
-		rand_chacha-0.2.2 \
 		rand_chacha-0.3.1 \
-		rand_core-0.5.1 \
 		rand_core-0.6.4 \
-		rand_hc-0.2.0 \
-		rand_xorshift-0.2.0 \
+		rand_xorshift-0.3.0 \
 		range-alloc-0.1.3 \
-		ratatui-0.26.1 \
-		raw-window-handle-0.4.3 \
+		ratatui-0.27.0 \
 		raw-window-handle-0.5.2 \
-		rayon-1.9.0 \
+		raw-window-handle-0.6.2 \
+		rayon-1.10.0 \
 		rayon-core-1.12.1 \
-		rcgen-0.12.1 \
+		rcgen-0.13.1 \
 		redox_syscall-0.3.5 \
 		redox_syscall-0.4.1 \
-		redox_users-0.4.4 \
-		refinery-0.8.12 \
-		refinery-core-0.8.12 \
-		refinery-macros-0.8.12 \
+		redox_syscall-0.5.2 \
+		redox_users-0.4.5 \
+		refinery-0.8.14 \
+		refinery-core-0.8.14 \
+		refinery-macros-0.8.14 \
 		regalloc2-0.9.3 \
-		regex-1.10.3 \
+		regex-1.10.5 \
 		regex-automata-0.1.10 \
-		regex-automata-0.4.6 \
+		regex-automata-0.4.7 \
 		regex-syntax-0.6.29 \
-		regex-syntax-0.8.2 \
+		regex-syntax-0.8.4 \
 		renderdoc-sys-1.1.0 \
 		resolv-conf-0.7.0 \
-		ring-0.16.20 \
 		ring-0.17.8 \
-		rmp-0.8.12 \
-		rmp-serde-1.1.2 \
-		rodio-0.17.3 \
+		rmp-0.8.14 \
+		rmp-serde-1.3.0 \
+		rodio-0.18.1 \
 		ron-0.8.1 \
 		roots-0.0.8 \
 		roxmltree-0.14.1 \
-		rstar-0.10.0 \
-		rusqlite-0.30.0 \
+		rstar-0.12.0 \
+		rusqlite-0.31.0 \
 		rust-argon2-2.1.0 \
-		rustc-demangle-0.1.23 \
+		rustc-demangle-0.1.24 \
 		rustc-hash-1.1.0 \
+		rustc-hash-2.0.0 \
 		rustc_version-0.2.3 \
 		rustc_version-0.4.0 \
-		rustix-0.38.32 \
-		rustls-0.21.10 \
-		rustls-native-certs-0.6.3 \
-		rustls-pemfile-1.0.4 \
-		rustls-webpki-0.101.7 \
+		rustix-0.38.34 \
+		rustls-0.23.10 \
+		rustls-native-certs-0.7.0 \
+		rustls-pemfile-2.1.2 \
+		rustls-pki-types-1.7.0 \
+		rustls-platform-verifier-0.3.2 \
+		rustls-platform-verifier-android-0.1.0 \
+		rustls-webpki-0.102.4 \
 		rusttype-0.7.9 \
 		rusttype-0.8.3 \
-		rustversion-1.0.14 \
+		rustversion-1.0.17 \
 		rustyline-14.0.0 \
-		ryu-1.0.17 \
+		ryu-1.0.18 \
 		same-file-1.0.6 \
 		schannel-0.1.23 \
-		schnellru-0.2.1 \
+		schnellru-0.2.3 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
-		sct-0.7.1 \
 		sctk-adwaita-0.5.4 \
 		sdl2-0.35.2 \
 		sdl2-sys-0.35.2 \
-		security-framework-2.9.2 \
-		security-framework-sys-2.9.1 \
+		security-framework-2.11.0 \
+		security-framework-sys-2.11.0 \
 		self_cell-0.10.3 \
-		self_cell-1.0.3 \
+		self_cell-1.0.4 \
 		semver-0.9.0 \
-		semver-1.0.22 \
+		semver-1.0.23 \
 		semver-parser-0.7.0 \
-		serde-1.0.197 \
-		serde_derive-1.0.197 \
-		serde_json-1.0.114 \
+		serde-1.0.203 \
+		serde_derive-1.0.203 \
+		serde_json-1.0.118 \
 		serde_path_to_error-0.1.16 \
-		serde_repr-0.1.18 \
-		serde_spanned-0.6.5 \
+		serde_repr-0.1.19 \
+		serde_spanned-0.6.6 \
 		serde_urlencoded-0.7.1 \
 		sha2-0.10.8 \
 		shaderc-0.8.3 \
@@ -562,75 +577,77 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		shellexpand-2.1.2 \
 		shellexpand-3.1.0 \
 		shlex-1.3.0 \
+		shred-0.16.1 \
+		shred-derive-0.7.0 \
 		shrev-1.1.3 \
 		signal-hook-0.3.17 \
 		signal-hook-mio-0.2.3 \
-		signal-hook-registry-1.4.1 \
+		signal-hook-registry-1.4.2 \
 		simd-adler32-0.3.7 \
 		siphasher-0.3.11 \
 		siphasher-1.0.1 \
 		slab-0.4.9 \
 		slice-group-by-0.3.1 \
 		slotmap-1.0.7 \
-		smallvec-1.13.1 \
+		smallvec-1.13.2 \
 		smithay-client-toolkit-0.16.1 \
+		smithay-client-toolkit-0.18.1 \
 		smithay-clipboard-0.6.6 \
-		socket2-0.5.6 \
-		specs-0.20.0 \
-		specs-derive-0.4.1 \
-		spin-0.5.2 \
+		smithay-clipboard-0.7.1 \
+		socket2-0.5.7 \
+		sorted-vec-0.8.3 \
 		spin-0.9.8 \
 		spin_sleep-1.2.0 \
 		spirv-0.2.0+1.5.4 \
 		sptr-0.3.2 \
-		stability-0.1.1 \
+		stability-0.2.0 \
 		stable_deref_trait-1.2.0 \
 		stacker-0.1.15 \
 		static_assertions-1.1.0 \
 		stb_truetype-0.3.1 \
 		str-buf-1.0.6 \
 		strict-num-0.1.1 \
-		strsim-0.11.0 \
-		strum-0.24.1 \
-		strum-0.26.2 \
-		strum_macros-0.24.3 \
-		strum_macros-0.26.2 \
+		strsim-0.11.1 \
+		strum-0.26.3 \
+		strum_macros-0.26.4 \
+		subtle-2.6.1 \
 		sum_type-0.2.0 \
-		svg_fmt-0.4.2 \
+		svg_fmt-0.4.3 \
 		syn-0.15.44 \
 		syn-1.0.109 \
-		syn-2.0.53 \
-		sync_file-0.2.7 \
+		syn-2.0.68 \
+		sync_file-0.2.9 \
 		sync_wrapper-0.1.2 \
-		system-interface-0.26.1 \
+		sync_wrapper-1.0.1 \
+		system-interface-0.27.2 \
 		tap-1.0.1 \
-		tar-0.4.40 \
+		tar-0.4.41 \
 		target-lexicon-0.12.14 \
 		tempfile-3.10.1 \
 		termcolor-1.4.1 \
-		thiserror-1.0.58 \
-		thiserror-impl-1.0.58 \
+		thiserror-1.0.61 \
+		thiserror-impl-1.0.61 \
 		thread_local-1.1.8 \
-		time-0.3.34 \
+		time-0.3.36 \
 		time-core-0.1.2 \
-		time-macros-0.2.17 \
+		time-macros-0.2.18 \
 		timer-queue-0.1.0 \
 		tiny-skia-0.8.4 \
 		tiny-skia-path-0.8.4 \
-		tinystr-0.7.5 \
+		tinystr-0.7.6 \
 		tinytemplate-1.2.1 \
-		tinyvec-1.6.0 \
+		tinyvec-1.6.1 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.36.0 \
-		tokio-macros-2.2.0 \
-		tokio-rustls-0.24.1 \
+		tokio-1.38.0 \
+		tokio-macros-2.3.0 \
+		tokio-rustls-0.26.0 \
 		tokio-stream-0.1.15 \
-		tokio-util-0.7.10 \
 		toml-0.5.11 \
-		toml-0.8.12 \
-		toml_datetime-0.6.5 \
+		toml-0.8.14 \
+		toml_datetime-0.6.6 \
 		toml_edit-0.19.15 \
-		toml_edit-0.22.8 \
+		toml_edit-0.21.1 \
+		toml_edit-0.22.14 \
 		tower-0.4.13 \
 		tower-layer-0.3.2 \
 		tower-service-0.3.2 \
@@ -640,31 +657,32 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		tracing-core-0.1.32 \
 		tracing-log-0.2.0 \
 		tracing-subscriber-0.3.18 \
-		tracing-tracy-0.10.2 \
-		tracy-client-0.15.2 \
-		tracy-client-sys-0.21.2 \
-		treeculler-0.2.0 \
+		tracing-tracy-0.11.0 \
+		tracy-client-0.17.0 \
+		tracy-client-sys-0.22.2 \
+		treeculler-0.3.0 \
 		try-lock-0.2.5 \
-		ttf-parser-0.20.0 \
+		ttf-parser-0.21.1 \
 		tuple_utils-0.4.0 \
 		twox-hash-1.6.3 \
 		tynm-0.1.10 \
 		type-map-0.5.0 \
 		typenum-1.17.0 \
-		unic-langid-0.9.4 \
-		unic-langid-impl-0.9.4 \
+		ubyte-0.10.4 \
+		unic-langid-0.9.5 \
+		unic-langid-impl-0.9.5 \
 		unicode-bidi-0.3.15 \
 		unicode-ident-1.0.12 \
 		unicode-normalization-0.1.23 \
 		unicode-segmentation-1.11.0 \
-		unicode-width-0.1.11 \
+		unicode-truncate-1.0.0 \
+		unicode-width-0.1.13 \
 		unicode-xid-0.1.0 \
 		unicode-xid-0.2.4 \
-		untrusted-0.7.1 \
 		untrusted-0.9.0 \
-		url-2.5.0 \
-		utf8parse-0.2.1 \
-		uuid-1.8.0 \
+		url-2.5.2 \
+		utf8parse-0.2.2 \
+		uuid-1.9.1 \
 		valuable-0.1.0 \
 		vcpkg-0.2.15 \
 		vec_map-0.8.2 \
@@ -672,66 +690,70 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		vek-0.16.1 \
 		version-compare-0.1.1 \
 		version_check-0.9.4 \
+		versions-5.0.1 \
 		walkdir-2.5.0 \
 		want-0.3.1 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasi-cap-std-sync-17.0.2 \
-		wasi-common-17.0.2 \
 		wasm-bindgen-0.2.92 \
 		wasm-bindgen-backend-0.2.92 \
 		wasm-bindgen-futures-0.4.42 \
 		wasm-bindgen-macro-0.2.92 \
 		wasm-bindgen-macro-support-0.2.92 \
 		wasm-bindgen-shared-0.2.92 \
-		wasm-encoder-0.38.1 \
-		wasm-encoder-0.201.0 \
-		wasmparser-0.118.2 \
-		wasmparser-0.121.2 \
-		wasmprinter-0.2.80 \
-		wasmtime-17.0.2 \
-		wasmtime-asm-macros-17.0.2 \
-		wasmtime-cache-17.0.2 \
-		wasmtime-component-macro-17.0.2 \
-		wasmtime-component-util-17.0.2 \
-		wasmtime-cranelift-17.0.2 \
-		wasmtime-cranelift-shared-17.0.2 \
-		wasmtime-environ-17.0.2 \
-		wasmtime-fiber-17.0.2 \
-		wasmtime-jit-17.0.2 \
-		wasmtime-jit-debug-17.0.2 \
-		wasmtime-jit-icache-coherence-17.0.2 \
-		wasmtime-runtime-17.0.2 \
-		wasmtime-types-17.0.2 \
-		wasmtime-versioned-export-macros-17.0.2 \
-		wasmtime-wasi-17.0.2 \
-		wasmtime-winch-17.0.2 \
-		wasmtime-wit-bindgen-17.0.2 \
-		wasmtime-wmemcheck-17.0.2 \
+		wasm-encoder-0.202.0 \
+		wasm-encoder-0.212.0 \
+		wasmparser-0.202.0 \
+		wasmprinter-0.202.0 \
+		wasmtime-20.0.2 \
+		wasmtime-asm-macros-20.0.2 \
+		wasmtime-cache-20.0.2 \
+		wasmtime-component-macro-20.0.2 \
+		wasmtime-component-util-20.0.2 \
+		wasmtime-cranelift-20.0.2 \
+		wasmtime-environ-20.0.2 \
+		wasmtime-fiber-20.0.2 \
+		wasmtime-jit-debug-20.0.2 \
+		wasmtime-jit-icache-coherence-20.0.2 \
+		wasmtime-runtime-20.0.2 \
+		wasmtime-slab-20.0.2 \
+		wasmtime-types-20.0.2 \
+		wasmtime-versioned-export-macros-20.0.2 \
+		wasmtime-wasi-20.0.2 \
+		wasmtime-winch-20.0.2 \
+		wasmtime-wit-bindgen-20.0.2 \
 		wast-35.0.2 \
-		wast-201.0.0 \
-		wat-1.201.0 \
+		wast-212.0.0 \
+		wat-1.212.0 \
 		wavefront-0.2.3 \
+		wayland-backend-0.3.4 \
 		wayland-client-0.29.5 \
+		wayland-client-0.31.3 \
 		wayland-commons-0.29.5 \
+		wayland-csd-frame-0.3.0 \
 		wayland-cursor-0.29.5 \
+		wayland-cursor-0.31.3 \
 		wayland-protocols-0.29.5 \
+		wayland-protocols-0.31.2 \
+		wayland-protocols-wlr-0.2.0 \
 		wayland-scanner-0.29.5 \
+		wayland-scanner-0.31.2 \
 		wayland-sys-0.29.5 \
+		wayland-sys-0.31.2 \
 		web-sys-0.3.69 \
+		webpki-roots-0.26.3 \
 		wfd-0.1.7 \
 		wgpu-profiler-0.15.0 \
 		which-4.4.2 \
-		widestring-1.0.2 \
-		wiggle-17.0.2 \
-		wiggle-generate-17.0.2 \
-		wiggle-macro-17.0.2 \
+		widestring-1.1.0 \
+		wiggle-20.0.2 \
+		wiggle-generate-20.0.2 \
+		wiggle-macro-20.0.2 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.6 \
-		winapi-wsapoll-0.1.1 \
+		winapi-util-0.1.8 \
+		winapi-wsapoll-0.1.2 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		winch-codegen-0.15.2 \
+		winch-codegen-0.18.2 \
 		window_clipboard-0.3.0 \
 		windows-0.48.0 \
 		windows-0.51.1 \
@@ -739,70 +761,75 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		windows-core-0.51.1 \
 		windows-core-0.52.0 \
 		windows-core-0.54.0 \
-		windows-result-0.1.0 \
+		windows-result-0.1.2 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
 		windows-targets-0.42.2 \
 		windows-targets-0.48.5 \
-		windows-targets-0.52.4 \
+		windows-targets-0.52.5 \
 		windows_aarch64_gnullvm-0.42.2 \
 		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_gnullvm-0.52.5 \
 		windows_aarch64_msvc-0.42.2 \
 		windows_aarch64_msvc-0.48.5 \
-		windows_aarch64_msvc-0.52.4 \
+		windows_aarch64_msvc-0.52.5 \
 		windows_i686_gnu-0.42.2 \
 		windows_i686_gnu-0.48.5 \
-		windows_i686_gnu-0.52.4 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
 		windows_i686_msvc-0.42.2 \
 		windows_i686_msvc-0.48.5 \
-		windows_i686_msvc-0.52.4 \
+		windows_i686_msvc-0.52.5 \
 		windows_x86_64_gnu-0.42.2 \
 		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnu-0.52.5 \
 		windows_x86_64_gnullvm-0.42.2 \
 		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_gnullvm-0.52.5 \
 		windows_x86_64_msvc-0.42.2 \
 		windows_x86_64_msvc-0.48.5 \
-		windows_x86_64_msvc-0.52.4 \
+		windows_x86_64_msvc-0.52.5 \
 		winit-0.28.7 \
 		winnow-0.5.40 \
-		winnow-0.6.5 \
+		winnow-0.6.13 \
 		winreg-0.50.0 \
 		winreg-0.52.0 \
 		winres-0.1.12 \
 		winx-0.36.3 \
-		wit-parser-0.13.2 \
+		wit-parser-0.202.0 \
 		witx-0.9.1 \
 		wyz-0.5.1 \
 		x11-clipboard-0.7.1 \
 		x11-dl-2.21.0 \
 		x11rb-0.10.1 \
-		x11rb-0.13.0 \
+		x11rb-0.13.1 \
 		x11rb-protocol-0.10.0 \
-		x11rb-protocol-0.13.0 \
+		x11rb-protocol-0.13.1 \
 		xattr-1.3.1 \
-		xcb-1.3.0 \
+		xcb-1.4.0 \
 		xcursor-0.3.5 \
 		xdg-2.5.2 \
 		xi-unicode-0.3.0 \
 		xkbcommon-0.5.1 \
-		xml-rs-0.8.19 \
+		xkeysym-0.2.1 \
+		xml-rs-0.8.20 \
 		xmlparser-0.13.6 \
 		yasna-0.5.2 \
-		zerocopy-0.7.32 \
-		zerocopy-derive-0.7.32 \
-		zstd-0.11.2+zstd.1.5.2 \
-		zstd-safe-5.0.2+zstd.1.5.2 \
-		zstd-sys-2.0.9+zstd.1.5.5 \
+		zerocopy-0.7.34 \
+		zerocopy-derive-0.7.34 \
+		zeroize-1.8.1 \
+		zstd-0.13.1 \
+		zstd-safe-7.1.0 \
+		zstd-sys-2.0.11+zstd.1.5.6 \
+		zune-core-0.4.12 \
+		zune-jpeg-0.4.11 \
 		keyboard-keynames@git+https://gitlab.com/Imbris/keyboard-keynames.git?tag=veloren-winit-0.28\#fca4bbdfa51bf054b155a455935b3792975c989d \
 		naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/Imberflur/wgpu.git?tag=0.18-with-fixes-for-veloren-v1\#df527ef82e2eba827eda9278caa583506a06aa87 \
-		shred,shred-derive@git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85\#5d52c6fc390dd04c12158633e77591f6523d1f85 \
+		specs,specs-derive@git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27\#4e2da1df29ee840baa9b936593c45592b7c9ae27 \
 		egui_wgpu_backend@git+https://github.com/hasenbanck/egui_wgpu_backend.git?rev=34691d4e9149deb9cd0bb8cbb5a56bffebf47588\#34691d4e9149deb9cd0bb8cbb5a56bffebf47588 \
-		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533\#abb1a705827984e11706d7bb97fb7a459e1e6533 \
 		fluent,fluent-bundle,fluent-syntax,intl-memoizer@git+https://github.com/juliancoffee/fluent-rs.git?branch=patched\#929cf9512de121cce9b4cbf1cb860cd3294a1cd9 \
+		auth-common,authc@git+https://gitlab.com/veloren/auth.git?rev=ae0e16783a9f9041951296885f082308e155db79\#ae0e16783a9f9041951296885f082308e155db79 \
 		conrod_core,conrod_derive,conrod_winit@git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7\#59fddc617696e68d28a75c2137a08c2572efb986 \
 		iced_core,iced_futures,iced_graphics,iced_native,iced_style,iced_winit@git+https://github.com/Imberflur/iced?tag=veloren-winit-0.28\#47243c257c8b8dd6c506b060804cb00b618aa0aa \
 		portpicker@git+https://github.com/xMAC94x/portpicker-rs?rev=df6b37872f3586ac3b21d08b56c8ec7cd92fb172\#df6b37872f3586ac3b21d08b56c8ec7cd92fb172
diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo
index 1617007b2ef2..bfa59c62000c 100644
--- a/games/veloren-weekly/distinfo
+++ b/games/veloren-weekly/distinfo
@@ -1,24 +1,24 @@
-TIMESTAMP = 1714633013
-SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225
-SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537
+TIMESTAMP = 1719790053
+SHA256 (rust/crates/ab_glyph-0.2.27.crate) = 1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697
+SIZE (rust/crates/ab_glyph-0.2.27.crate) = 19562
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
 SIZE (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = 11010
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678
+SIZE (rust/crates/addr2line-0.22.0.crate) = 39156
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
 SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
 SIZE (rust/crates/adler32-1.2.0.crate) = 6411
 SHA256 (rust/crates/ahash-0.4.8.crate) = 0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289
 SIZE (rust/crates/ahash-0.4.8.crate) = 51510
-SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
-SIZE (rust/crates/ahash-0.7.8.crate) = 38550
 SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
 SIZE (rust/crates/ahash-0.8.11.crate) = 43607
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
-SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
-SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
+SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
 SHA256 (rust/crates/alsa-0.9.0.crate) = 37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce
 SIZE (rust/crates/alsa-0.9.0.crate) = 72602
 SHA256 (rust/crates/alsa-sys-0.3.1.crate) = db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527
@@ -35,18 +35,18 @@ SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac2
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
 SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
 SIZE (rust/crates/anes-0.1.6.crate) = 23857
-SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
-SIZE (rust/crates/anstream-0.6.13.crate) = 30928
-SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
-SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
-SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
-SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
-SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
-SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
-SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
-SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
-SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
-SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
+SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
+SIZE (rust/crates/anstream-0.6.14.crate) = 29160
+SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
+SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
+SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
+SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
+SHA256 (rust/crates/anstyle-query-1.1.0.crate) = ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391
+SIZE (rust/crates/anstyle-query-1.1.0.crate) = 9832
+SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
+SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
+SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
+SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
 SHA256 (rust/crates/anymap2-0.13.0.crate) = d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c
 SIZE (rust/crates/anymap2-0.13.0.crate) = 17337
 SHA256 (rust/crates/app_dirs2-2.5.5.crate) = a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e
@@ -73,28 +73,30 @@ SHA256 (rust/crates/ascii-1.1.0.crate) = d92bec98840b8f03a5ff5413de5293bfcd8bf96
 SIZE (rust/crates/ascii-1.1.0.crate) = 36075
 SHA256 (rust/crates/ash-0.37.3+1.3.251.crate) = 39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a
 SIZE (rust/crates/ash-0.37.3+1.3.251.crate) = 449524
-SHA256 (rust/crates/assets_manager-0.11.3.crate) = 05532e9c9a4c837c7eb0f8f1a1f9d357a168fb06dbf501d0bdfbe2fc5b0f1971
-SIZE (rust/crates/assets_manager-0.11.3.crate) = 73562
-SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
-SIZE (rust/crates/async-channel-2.2.0.crate) = 14307
-SHA256 (rust/crates/async-trait-0.1.78.crate) = 461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85
-SIZE (rust/crates/async-trait-0.1.78.crate) = 29593
-SHA256 (rust/crates/atomic-polyfill-1.0.3.crate) = 8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4
-SIZE (rust/crates/atomic-polyfill-1.0.3.crate) = 11581
+SHA256 (rust/crates/assets_manager-0.11.6.crate) = b4dde42f7d78f1a1d0149ac8526e21c6c849090ce6aa191ae94b90b0cb2e4aed
+SIZE (rust/crates/assets_manager-0.11.6.crate) = 73791
+SHA256 (rust/crates/async-channel-2.3.1.crate) = 89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a
+SIZE (rust/crates/async-channel-2.3.1.crate) = 14576
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
 SHA256 (rust/crates/atomic_refcell-0.1.13.crate) = 41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c
 SIZE (rust/crates/atomic_refcell-0.1.13.crate) = 11760
 SHA256 (rust/crates/atomicwrites-0.4.3.crate) = fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db
 SIZE (rust/crates/atomicwrites-0.4.3.crate) = 6337
-SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
-SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
-SIZE (rust/crates/axum-0.6.20.crate) = 146227
-SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c
-SIZE (rust/crates/axum-core-0.3.4.crate) = 21088
-SHA256 (rust/crates/backtrace-0.3.69.crate) = 2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837
-SIZE (rust/crates/backtrace-0.3.69.crate) = 77299
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/axum-0.7.5.crate) = 3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf
+SIZE (rust/crates/axum-0.7.5.crate) = 151429
+SHA256 (rust/crates/axum-core-0.4.3.crate) = a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3
+SIZE (rust/crates/axum-core-0.4.3.crate) = 21877
+SHA256 (rust/crates/az-1.2.1.crate) = 7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973
+SIZE (rust/crates/az-1.2.1.crate) = 27842
+SHA256 (rust/crates/backtrace-0.3.73.crate) = 5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a
+SIZE (rust/crates/backtrace-0.3.73.crate) = 87617
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
 SIZE (rust/crates/bincode-1.3.3.crate) = 28958
 SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
@@ -105,8 +107,8 @@ SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41a
 SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
-SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
+SHA256 (rust/crates/bitflags-2.6.0.crate) = b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de
+SIZE (rust/crates/bitflags-2.6.0.crate) = 45357
 SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
 SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
 SHA256 (rust/crates/blake2b_simd-1.0.2.crate) = 23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780
@@ -119,40 +121,44 @@ SHA256 (rust/crates/block-sys-0.1.0-beta.1.crate) = 0fa55741ee90902547802152aaf3
 SIZE (rust/crates/block-sys-0.1.0-beta.1.crate) = 9039
 SHA256 (rust/crates/block2-0.2.0-alpha.6.crate) = 8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42
 SIZE (rust/crates/block2-0.2.0-alpha.6.crate) = 10639
-SHA256 (rust/crates/bumpalo-3.15.4.crate) = 7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa
-SIZE (rust/crates/bumpalo-3.15.4.crate) = 85028
-SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
-SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
-SHA256 (rust/crates/bytemuck_derive-1.6.0.crate) = 4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60
-SIZE (rust/crates/bytemuck_derive-1.6.0.crate) = 21194
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytemuck-1.16.1.crate) = b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e
+SIZE (rust/crates/bytemuck-1.16.1.crate) = 48321
+SHA256 (rust/crates/bytemuck_derive-1.7.0.crate) = 1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b
+SIZE (rust/crates/bytemuck_derive-1.7.0.crate) = 21687
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/bytes-1.5.0.crate) = a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223
-SIZE (rust/crates/bytes-1.5.0.crate) = 58909
+SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
+SIZE (rust/crates/bytes-1.6.0.crate) = 60605
 SHA256 (rust/crates/calloop-0.10.6.crate) = 52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8
 SIZE (rust/crates/calloop-0.10.6.crate) = 53711
+SHA256 (rust/crates/calloop-0.12.4.crate) = fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298
+SIZE (rust/crates/calloop-0.12.4.crate) = 69583
+SHA256 (rust/crates/calloop-wayland-source-0.2.0.crate) = 0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02
+SIZE (rust/crates/calloop-wayland-source-0.2.0.crate) = 11304
 SHA256 (rust/crates/cansi-2.2.1.crate) = 4bdcae87153686017415ce77e48c53e6818a0a058f0e21b56640d1e944967ef8
 SIZE (rust/crates/cansi-2.2.1.crate) = 14442
-SHA256 (rust/crates/cap-fs-ext-2.0.1.crate) = 88e341d15ac1029aadce600be764a1a1edafe40e03cde23285bc1d261b3a4866
-SIZE (rust/crates/cap-fs-ext-2.0.1.crate) = 15028
-SHA256 (rust/crates/cap-net-ext-2.0.1.crate) = 434168fe6533055f0f4204039abe3ff6d7db338ef46872a5fa39e9d5ad5ab7a9
-SIZE (rust/crates/cap-net-ext-2.0.1.crate) = 12204
-SHA256 (rust/crates/cap-primitives-2.0.1.crate) = fe16767ed8eee6d3f1f00d6a7576b81c226ab917eb54b96e5f77a5216ef67abb
-SIZE (rust/crates/cap-primitives-2.0.1.crate) = 85442
-SHA256 (rust/crates/cap-rand-2.0.1.crate) = 20e5695565f0cd7106bc3c7170323597540e772bb73e0be2cd2c662a0f8fa4ca
-SIZE (rust/crates/cap-rand-2.0.1.crate) = 8423
-SHA256 (rust/crates/cap-std-2.0.1.crate) = 593db20e4c51f62d3284bae7ee718849c3214f93a3b94ea1899ad85ba119d330
-SIZE (rust/crates/cap-std-2.0.1.crate) = 32618
-SHA256 (rust/crates/cap-time-ext-2.0.1.crate) = 03261630f291f425430a36f38c847828265bc928f517cdd2004c56f4b02f002b
-SIZE (rust/crates/cap-time-ext-2.0.1.crate) = 8463
+SHA256 (rust/crates/cap-fs-ext-3.1.0.crate) = 2fc2d2954524be4866aaa720f008fba9995de54784957a1b0e0119992d6d5e52
+SIZE (rust/crates/cap-fs-ext-3.1.0.crate) = 15551
+SHA256 (rust/crates/cap-net-ext-3.1.0.crate) = 799c81d79ea9c71a1438efd417c788214bc9e7986046d3710b6bbe60da4d8275
+SIZE (rust/crates/cap-net-ext-3.1.0.crate) = 12201
+SHA256 (rust/crates/cap-primitives-3.1.0.crate) = 00172660727e2d7f808e7cc2bfffd093fdb3ea2ff2ef819289418a3c3ffab5ac
+SIZE (rust/crates/cap-primitives-3.1.0.crate) = 89098
+SHA256 (rust/crates/cap-rand-3.1.0.crate) = 270f1d341a2afc62604f8f688bee4e444d052b7a74c1458dd3aa7efb47d4077f
+SIZE (rust/crates/cap-rand-3.1.0.crate) = 8425
+SHA256 (rust/crates/cap-std-3.1.0.crate) = 8cd9187bb3f7478a4c135ea10473a41a5f029d2ac800c1adf64f35ec7d4c8603
+SIZE (rust/crates/cap-std-3.1.0.crate) = 33784
+SHA256 (rust/crates/cap-time-ext-3.1.0.crate) = 91666f31e30c85b1d2ee8432c90987f752c45f5821f5638027b41e73e16a395b
+SIZE (rust/crates/cap-time-ext-3.1.0.crate) = 8572
 SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
 SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
 SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
 SIZE (rust/crates/cast-0.3.0.crate) = 11452
 SHA256 (rust/crates/castaway-0.2.2.crate) = 8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc
 SIZE (rust/crates/castaway-0.2.2.crate) = 11091
-SHA256 (rust/crates/cc-1.0.90.crate) = 8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5
-SIZE (rust/crates/cc-1.0.90.crate) = 73954
+SHA256 (rust/crates/cc-1.0.102.crate) = 779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332
+SIZE (rust/crates/cc-1.0.102.crate) = 79585
 SHA256 (rust/crates/censor-0.3.0.crate) = d41e3b9fdbb9b3edc10dc66a06dc255822f699c432e19403fb966e6d60e0dec4
 SIZE (rust/crates/censor-0.3.0.crate) = 5627
 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
@@ -165,12 +171,12 @@ SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582eb
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
 SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
-SHA256 (rust/crates/chrono-0.4.35.crate) = 8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a
-SIZE (rust/crates/chrono-0.4.35.crate) = 234267
-SHA256 (rust/crates/chrono-tz-0.8.6.crate) = d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e
-SIZE (rust/crates/chrono-tz-0.8.6.crate) = 624830
-SHA256 (rust/crates/chrono-tz-build-0.2.1.crate) = 433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f
-SIZE (rust/crates/chrono-tz-build-0.2.1.crate) = 10421
+SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
+SIZE (rust/crates/chrono-0.4.38.crate) = 220559
+SHA256 (rust/crates/chrono-tz-0.9.0.crate) = 93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb
+SIZE (rust/crates/chrono-tz-0.9.0.crate) = 361570
+SHA256 (rust/crates/chrono-tz-build-0.3.0.crate) = 0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1
+SIZE (rust/crates/chrono-tz-build-0.3.0.crate) = 6139
 SHA256 (rust/crates/chumsky-0.9.3.crate) = 8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9
 SIZE (rust/crates/chumsky-0.9.3.crate) = 75112
 SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
@@ -179,48 +185,46 @@ SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce369
 SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
 SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
 SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
-SHA256 (rust/crates/clang-sys-1.7.0.crate) = 67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1
-SIZE (rust/crates/clang-sys-1.7.0.crate) = 42088
-SHA256 (rust/crates/clap-4.5.3.crate) = 949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813
-SIZE (rust/crates/clap-4.5.3.crate) = 55388
-SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
-SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
-SHA256 (rust/crates/clap_derive-4.5.3.crate) = 90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f
-SIZE (rust/crates/clap_derive-4.5.3.crate) = 29043
-SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
-SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
+SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
+SHA256 (rust/crates/clap-4.5.8.crate) = 84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d
+SIZE (rust/crates/clap-4.5.8.crate) = 56338
+SHA256 (rust/crates/clap_builder-4.5.8.crate) = c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708
+SIZE (rust/crates/clap_builder-4.5.8.crate) = 163870
+SHA256 (rust/crates/clap_derive-4.5.8.crate) = 2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085
+SIZE (rust/crates/clap_derive-4.5.8.crate) = 30024
+SHA256 (rust/crates/clap_lex-0.7.1.crate) = 4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70
+SIZE (rust/crates/clap_lex-0.7.1.crate) = 12766
 SHA256 (rust/crates/clipboard-win-3.1.1.crate) = 9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342
 SIZE (rust/crates/clipboard-win-3.1.1.crate) = 11964
 SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362
 SIZE (rust/crates/clipboard-win-4.5.0.crate) = 13476
-SHA256 (rust/crates/clipboard-win-5.3.0.crate) = d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee
-SIZE (rust/crates/clipboard-win-5.3.0.crate) = 19597
+SHA256 (rust/crates/clipboard-win-5.3.1.crate) = 79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad
+SIZE (rust/crates/clipboard-win-5.3.1.crate) = 19921
 SHA256 (rust/crates/clipboard_macos-0.1.0.crate) = 145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95
 SIZE (rust/crates/clipboard_macos-0.1.0.crate) = 5958
-SHA256 (rust/crates/clipboard_wayland-0.2.0.crate) = 6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747
-SIZE (rust/crates/clipboard_wayland-0.2.0.crate) = 5182
+SHA256 (rust/crates/clipboard_wayland-0.2.2.crate) = 003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8
+SIZE (rust/crates/clipboard_wayland-0.2.2.crate) = 5214
 SHA256 (rust/crates/clipboard_x11-0.4.2.crate) = 4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c
 SIZE (rust/crates/clipboard_x11-0.4.2.crate) = 4912
-SHA256 (rust/crates/cmake-0.1.45.crate) = eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855
-SIZE (rust/crates/cmake-0.1.45.crate) = 14375
-SHA256 (rust/crates/cocoa-0.24.1.crate) = f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a
-SIZE (rust/crates/cocoa-0.24.1.crate) = 40445
+SHA256 (rust/crates/cmake-0.1.50.crate) = a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130
+SIZE (rust/crates/cmake-0.1.50.crate) = 16748
+SHA256 (rust/crates/cocoa-0.25.0.crate) = f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c
+SIZE (rust/crates/cocoa-0.25.0.crate) = 42163
 SHA256 (rust/crates/cocoa-foundation-0.1.2.crate) = 8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7
 SIZE (rust/crates/cocoa-foundation-0.1.2.crate) = 15028
 SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
 SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
-SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b
-SIZE (rust/crates/color_quant-1.1.0.crate) = 6649
-SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
-SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
+SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
 SHA256 (rust/crates/com-rs-0.2.1.crate) = bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642
 SIZE (rust/crates/com-rs-0.2.1.crate) = 10647
-SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
-SIZE (rust/crates/combine-4.6.6.crate) = 132428
+SHA256 (rust/crates/combine-4.6.7.crate) = ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd
+SIZE (rust/crates/combine-4.6.7.crate) = 134808
 SHA256 (rust/crates/compact_str-0.7.1.crate) = f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f
 SIZE (rust/crates/compact_str-0.7.1.crate) = 57246
-SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
-SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/concurrent-queue-2.5.0.crate) = 4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973
+SIZE (rust/crates/concurrent-queue-2.5.0.crate) = 22654
 SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
 SIZE (rust/crates/console-0.15.8.crate) = 36364
 SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
@@ -233,6 +237,8 @@ SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a3
 SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
 SHA256 (rust/crates/core-graphics-0.22.3.crate) = 2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb
 SIZE (rust/crates/core-graphics-0.22.3.crate) = 29514
+SHA256 (rust/crates/core-graphics-0.23.2.crate) = c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081
+SIZE (rust/crates/core-graphics-0.23.2.crate) = 30763
 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf
 SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063
 SHA256 (rust/crates/coreaudio-rs-0.11.3.crate) = 321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace
@@ -241,40 +247,38 @@ SHA256 (rust/crates/coreaudio-sys-0.2.15.crate) = 7f01585027057ff5f0a5bf276174ae
 SIZE (rust/crates/coreaudio-sys-0.2.15.crate) = 5532
 SHA256 (rust/crates/cpal-0.15.3.crate) = 873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779
 SIZE (rust/crates/cpal-0.15.3.crate) = 100083
-SHA256 (rust/crates/cpp_demangle-0.3.5.crate) = eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f
-SIZE (rust/crates/cpp_demangle-0.3.5.crate) = 75313
+SHA256 (rust/crates/cpp_demangle-0.4.3.crate) = 7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119
+SIZE (rust/crates/cpp_demangle-0.4.3.crate) = 78861
 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
 SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
-SHA256 (rust/crates/cranelift-bforest-0.104.2.crate) = 95ffa62b81e6d1b987933240ed7de5d4d85ae2e07153e3f9b74fc27ecfd81d2c
-SIZE (rust/crates/cranelift-bforest-0.104.2.crate) = 30546
-SHA256 (rust/crates/cranelift-codegen-0.104.2.crate) = 3af519738eb5d96c0d48b04845c88d0412a40167b5c42884e090fe9e015842ff
-SIZE (rust/crates/cranelift-codegen-0.104.2.crate) = 969679
-SHA256 (rust/crates/cranelift-codegen-meta-0.104.2.crate) = ba2da643fa5ccaf53cbb8db6acf3372321e2e13507d62c7c565529dd6f2d0ea0
-SIZE (rust/crates/cranelift-codegen-meta-0.104.2.crate) = 73912
-SHA256 (rust/crates/cranelift-codegen-shared-0.104.2.crate) = b3745d6c656649940d3f42d263b8ba00805e9bf1203205a0d98a7517a2fe5a35
-SIZE (rust/crates/cranelift-codegen-shared-0.104.2.crate) = 5993
-SHA256 (rust/crates/cranelift-control-0.104.2.crate) = 41a521e2d0b427fe026457b70ba1896d9d560af72a47982db19fef11aa0ee789
-SIZE (rust/crates/cranelift-control-0.104.2.crate) = 7680
-SHA256 (rust/crates/cranelift-entity-0.104.2.crate) = 96a6b8d80c6235fd73c0e9218d89f498b398fb0c52d4b30abd9a388da613f71f
-SIZE (rust/crates/cranelift-entity-0.104.2.crate) = 28098
-SHA256 (rust/crates/cranelift-frontend-0.104.2.crate) = a3d555819f3a49c01826ce5bf0f3e52a4e17be9c4ee09381d6a1d88549793f3c
-SIZE (rust/crates/cranelift-frontend-0.104.2.crate) = 35869
-SHA256 (rust/crates/cranelift-isle-0.104.2.crate) = 53aeebed3b78faea701062d4e384bffe91aef33e47d949bad10e5c540a00916d
-SIZE (rust/crates/cranelift-isle-0.104.2.crate) = 65598
-SHA256 (rust/crates/cranelift-native-0.104.2.crate) = cc99479323e678deac40abffec0ca7a52cc6c549c0fa351b2d3a76655202a5a7
-SIZE (rust/crates/cranelift-native-0.104.2.crate) = 8418
-SHA256 (rust/crates/cranelift-wasm-0.104.2.crate) = cab055df5f977a3fee2837cd447b899d98a5e72374341461535b758608f25175
-SIZE (rust/crates/cranelift-wasm-0.104.2.crate) = 199509
-SHA256 (rust/crates/crc32fast-1.4.0.crate) = b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa
-SIZE (rust/crates/crc32fast-1.4.0.crate) = 38665
+SHA256 (rust/crates/cranelift-bforest-0.107.2.crate) = ebf72ceaf38f7d41194d0cf6748214d8ef7389167fe09aad80f87646dbfa325b
+SIZE (rust/crates/cranelift-bforest-0.107.2.crate) = 30527
+SHA256 (rust/crates/cranelift-codegen-0.107.2.crate) = 9ee7fde5cd9173f00ce02c491ee9e306d64740f4b1a697946e0474f389999e13
+SIZE (rust/crates/cranelift-codegen-0.107.2.crate) = 977854
+SHA256 (rust/crates/cranelift-codegen-meta-0.107.2.crate) = b49bec6a517e78d4067500dc16acb558e772491a2bcb37301127448adfb8413c
+SIZE (rust/crates/cranelift-codegen-meta-0.107.2.crate) = 73889
+SHA256 (rust/crates/cranelift-codegen-shared-0.107.2.crate) = ead4ea497b2dc2ac31fcabd6d5d0d5dc25b3964814122e343724bdf65a53c843
+SIZE (rust/crates/cranelift-codegen-shared-0.107.2.crate) = 5992
+SHA256 (rust/crates/cranelift-control-0.107.2.crate) = f81e8028c8d711ea7592648e70221f2e54acb8665f7ecd49545f021ec14c3341
+SIZE (rust/crates/cranelift-control-0.107.2.crate) = 7683
+SHA256 (rust/crates/cranelift-entity-0.107.2.crate) = 32acd0632ba65c2566e75f64af9ef094bb8d90e58a9fbd33d920977a9d85c054
+SIZE (rust/crates/cranelift-entity-0.107.2.crate) = 28064
+SHA256 (rust/crates/cranelift-frontend-0.107.2.crate) = a395a704934aa944ba8939cac9001174b9ae5236f48bc091f89e33bb968336f6
+SIZE (rust/crates/cranelift-frontend-0.107.2.crate) = 35848
+SHA256 (rust/crates/cranelift-isle-0.107.2.crate) = b325ce81c4ee7082dc894537eb342c37898e14230fe7c02ea945691db3e2dd01
+SIZE (rust/crates/cranelift-isle-0.107.2.crate) = 65589
+SHA256 (rust/crates/cranelift-native-0.107.2.crate) = ea11f5ac85996fa093075d66397922d4f56085d5d84ec13043d0cd4f159c6818
+SIZE (rust/crates/cranelift-native-0.107.2.crate) = 8504
+SHA256 (rust/crates/cranelift-wasm-0.107.2.crate) = e4f175d4e299a8edabfbd64fa93c7650836cc8ad7f4879f9bd2632575a1f12d0
+SIZE (rust/crates/cranelift-wasm-0.107.2.crate) = 63904
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
 SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f
 SIZE (rust/crates/criterion-0.5.1.crate) = 110088
 SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
 SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
-SHA256 (rust/crates/critical-section-1.1.2.crate) = 7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216
-SIZE (rust/crates/critical-section-1.1.2.crate) = 18337
-SHA256 (rust/crates/crossbeam-channel-0.5.12.crate) = ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95
-SIZE (rust/crates/crossbeam-channel-0.5.12.crate) = 90515
+SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
+SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
 SHA256 (rust/crates/crossbeam-deque-0.7.4.crate) = c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed
 SIZE (rust/crates/crossbeam-deque-0.7.4.crate) = 19868
 SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
@@ -287,8 +291,8 @@ SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1
 SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
 SHA256 (rust/crates/crossbeam-utils-0.7.2.crate) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8
 SIZE (rust/crates/crossbeam-utils-0.7.2.crate) = 34338
-SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
-SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
+SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
 SHA256 (rust/crates/crossterm-0.27.0.crate) = f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df
 SIZE (rust/crates/crossterm-0.27.0.crate) = 125311
 SHA256 (rust/crates/crossterm_winapi-0.9.1.crate) = acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b
@@ -301,34 +305,34 @@ SHA256 (rust/crates/csv-1.3.0.crate) = ac574ff4d437a7b5ad237ef331c17ccca63c46479
 SIZE (rust/crates/csv-1.3.0.crate) = 888212
 SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
 SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
-SHA256 (rust/crates/cty-0.2.2.crate) = b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35
-SIZE (rust/crates/cty-0.2.2.crate) = 7230
 SHA256 (rust/crates/culpa-1.0.2.crate) = 5ae0bfe9317b1cb4ff5a56d766ee4b157b3e1f47f11979253570e88d10fd1fd3
 SIZE (rust/crates/culpa-1.0.2.crate) = 10733
 SHA256 (rust/crates/culpa-macros-1.0.2.crate) = 1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279
 SIZE (rust/crates/culpa-macros-1.0.2.crate) = 3325
+SHA256 (rust/crates/cursor-icon-1.1.0.crate) = 96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991
+SIZE (rust/crates/cursor-icon-1.1.0.crate) = 11453
 SHA256 (rust/crates/d3d12-0.7.0.crate) = e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20
 SIZE (rust/crates/d3d12-0.7.0.crate) = 17319
 SHA256 (rust/crates/daggy-0.5.0.crate) = 9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2
 SIZE (rust/crates/daggy-0.5.0.crate) = 17832
-SHA256 (rust/crates/darling-0.20.8.crate) = 54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391
-SIZE (rust/crates/darling-0.20.8.crate) = 31234
-SHA256 (rust/crates/darling_core-0.20.8.crate) = 9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f
-SIZE (rust/crates/darling_core-0.20.8.crate) = 64442
-SHA256 (rust/crates/darling_macro-0.20.8.crate) = a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f
-SIZE (rust/crates/darling_macro-0.20.8.crate) = 1856
+SHA256 (rust/crates/darling-0.20.9.crate) = 83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1
+SIZE (rust/crates/darling-0.20.9.crate) = 31777
+SHA256 (rust/crates/darling_core-0.20.9.crate) = 622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120
+SIZE (rust/crates/darling_core-0.20.9.crate) = 65014
+SHA256 (rust/crates/darling_macro-0.20.9.crate) = 733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178
+SIZE (rust/crates/darling_macro-0.20.9.crate) = 1875
 SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f
 SIZE (rust/crates/dasp_sample-0.11.0.crate) = 11617
-SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
-SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632
+SHA256 (rust/crates/data-encoding-2.6.0.crate) = e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2
+SIZE (rust/crates/data-encoding-2.6.0.crate) = 20769
 SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
 SIZE (rust/crates/debugid-0.8.0.crate) = 12757
 SHA256 (rust/crates/deflate-1.0.0.crate) = c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f
 SIZE (rust/crates/deflate-1.0.0.crate) = 62722
 SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
 SIZE (rust/crates/deranged-0.3.11.crate) = 18043
-SHA256 (rust/crates/deunicode-1.4.3.crate) = b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94
-SIZE (rust/crates/deunicode-1.4.3.crate) = 177180
+SHA256 (rust/crates/deunicode-1.6.0.crate) = 339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00
+SIZE (rust/crates/deunicode-1.6.0.crate) = 170864
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
 SHA256 (rust/crates/directories-next-2.0.0.crate) = 339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc
@@ -347,18 +351,20 @@ SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6f
 SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
 SHA256 (rust/crates/discord-sdk-0.3.6.crate) = dc3d7a4f9bc39006b732a01d63b34ff1518313313d707cb18cf6187d2124f7f4
 SIZE (rust/crates/discord-sdk-0.3.6.crate) = 58181
-SHA256 (rust/crates/dispatch-0.1.4.crate) = 04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605
-SIZE (rust/crates/dispatch-0.1.4.crate) = 8826
 SHA256 (rust/crates/dispatch-0.2.0.crate) = bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b
 SIZE (rust/crates/dispatch-0.2.0.crate) = 10229
-SHA256 (rust/crates/displaydoc-0.2.4.crate) = 487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d
-SIZE (rust/crates/displaydoc-0.2.4.crate) = 23200
+SHA256 (rust/crates/displaydoc-0.2.5.crate) = 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0
+SIZE (rust/crates/displaydoc-0.2.5.crate) = 24219
+SHA256 (rust/crates/divrem-1.0.0.crate) = 69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82
+SIZE (rust/crates/divrem-1.0.0.crate) = 7818
 SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412
 SIZE (rust/crates/dlib-0.5.2.crate) = 5806
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
 SHA256 (rust/crates/dot_vox-5.1.1.crate) = dd05cab02d6074145c6f92ddf1b57357e4bc1424f87c790c044de62bdc94c13a
 SIZE (rust/crates/dot_vox-5.1.1.crate) = 24272
-SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
-SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670
+SHA256 (rust/crates/downcast-rs-1.2.1.crate) = 75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2
+SIZE (rust/crates/downcast-rs-1.2.1.crate) = 11821
 SHA256 (rust/crates/drop_guard-0.3.0.crate) = 2c4a817d8b683f6e649aed359aab0c47a875377516bb5791d0f7e46d9066d209
 SIZE (rust/crates/drop_guard-0.3.0.crate) = 4614
 SHA256 (rust/crates/ecolor-0.23.0.crate) = cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af
@@ -369,14 +375,16 @@ SHA256 (rust/crates/egui_plot-0.23.0.crate) = c7f33a00fe8eb1ba56535b3dbacdecc7a1
 SIZE (rust/crates/egui_plot-0.23.0.crate) = 38292
 SHA256 (rust/crates/egui_winit_platform-0.20.0.crate) = cff2b0729f7c0ae1d7fb4a95aa4c3432d1a1d03476b22b2946247504a012cea4
 SIZE (rust/crates/egui_winit_platform-0.20.0.crate) = 11420
-SHA256 (rust/crates/either-1.10.0.crate) = 11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a
-SIZE (rust/crates/either-1.10.0.crate) = 18334
+SHA256 (rust/crates/either-1.13.0.crate) = 60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0
+SIZE (rust/crates/either-1.13.0.crate) = 19169
+SHA256 (rust/crates/elapsed-0.1.2.crate) = 6f4e5af126dafd0741c2ad62d47f68b28602550102e5f0dd45c8a97fc8b49c29
+SIZE (rust/crates/elapsed-0.1.2.crate) = 2377
 SHA256 (rust/crates/emath-0.23.0.crate) = 1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0
 SIZE (rust/crates/emath-0.23.0.crate) = 19591
 SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
 SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
-SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1
-SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071
+SHA256 (rust/crates/encoding_rs-0.8.34.crate) = b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59
+SIZE (rust/crates/encoding_rs-0.8.34.crate) = 1378166
 SHA256 (rust/crates/endian-type-0.1.2.crate) = c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d
 SIZE (rust/crates/endian-type-0.1.2.crate) = 2340
 SHA256 (rust/crates/enum-as-inner-0.6.0.crate) = 5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a
@@ -393,26 +401,28 @@ SHA256 (rust/crates/epaint-0.23.0.crate) = 58067b840d009143934d91d8dcb8ded054d83
 SIZE (rust/crates/epaint-0.23.0.crate) = 853244
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
-SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
+SIZE (rust/crates/errno-0.3.9.crate) = 10690
+SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc
+SIZE (rust/crates/error-chain-0.12.4.crate) = 29274
 SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
 SIZE (rust/crates/error-code-2.3.1.crate) = 5324
 SHA256 (rust/crates/error-code-3.2.0.crate) = a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b
 SIZE (rust/crates/error-code-3.2.0.crate) = 7569
 SHA256 (rust/crates/euc-0.5.3.crate) = 0947d06646d28a4ac2862ac5eadc1062704d61ee398b3baba8b4a21e2f1ef5ed
 SIZE (rust/crates/euc-0.5.3.crate) = 70369
-SHA256 (rust/crates/euclid-0.22.9.crate) = 87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787
-SIZE (rust/crates/euclid-0.22.9.crate) = 76671
-SHA256 (rust/crates/event-listener-5.2.0.crate) = 2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91
-SIZE (rust/crates/event-listener-5.2.0.crate) = 40217
-SHA256 (rust/crates/event-listener-strategy-0.5.0.crate) = feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291
-SIZE (rust/crates/event-listener-strategy-0.5.0.crate) = 10616
+SHA256 (rust/crates/euclid-0.22.10.crate) = e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20
+SIZE (rust/crates/euclid-0.22.10.crate) = 78701
+SHA256 (rust/crates/event-listener-5.3.1.crate) = 6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba
+SIZE (rust/crates/event-listener-5.3.1.crate) = 42576
+SHA256 (rust/crates/event-listener-strategy-0.5.2.crate) = 0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1
+SIZE (rust/crates/event-listener-strategy-0.5.2.crate) = 10697
 SHA256 (rust/crates/fallible-iterator-0.3.0.crate) = 2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649
 SIZE (rust/crates/fallible-iterator-0.3.0.crate) = 19639
 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
 SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
-SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
-SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a
+SIZE (rust/crates/fastrand-2.1.0.crate) = 14907
 SHA256 (rust/crates/fd-lock-4.0.2.crate) = 7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947
 SIZE (rust/crates/fd-lock-4.0.2.crate) = 13675
 SHA256 (rust/crates/fdeflate-0.3.4.crate) = 4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645
@@ -421,12 +431,14 @@ SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba
 SIZE (rust/crates/filetime-0.2.23.crate) = 14942
 SHA256 (rust/crates/find_folder-0.3.0.crate) = 9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b
 SIZE (rust/crates/find_folder-0.3.0.crate) = 2617
+SHA256 (rust/crates/fixed-1.27.0.crate) = 2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048
+SIZE (rust/crates/fixed-1.27.0.crate) = 250471
 SHA256 (rust/crates/fixedbitset-0.1.9.crate) = 86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33
 SIZE (rust/crates/fixedbitset-0.1.9.crate) = 11974
 SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
 SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
-SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
-SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
+SIZE (rust/crates/flate2-1.0.30.crate) = 75511
 SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
 SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
 SHA256 (rust/crates/fluent-langneg-0.13.0.crate) = 2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94
@@ -477,22 +489,24 @@ SHA256 (rust/crates/fxprof-processed-profile-0.6.0.crate) = 27d12c0aed7f1e24276a
 SIZE (rust/crates/fxprof-processed-profile-0.6.0.crate) = 29860
 SHA256 (rust/crates/generator-0.7.5.crate) = 5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e
 SIZE (rust/crates/generator-0.7.5.crate) = 29947
+SHA256 (rust/crates/generator-0.8.1.crate) = 186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb
+SIZE (rust/crates/generator-0.8.1.crate) = 33739
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
 SHA256 (rust/crates/gethostname-0.2.3.crate) = c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e
 SIZE (rust/crates/gethostname-0.2.3.crate) = 8174
 SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
 SIZE (rust/crates/gethostname-0.4.3.crate) = 9336
-SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
-SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
-SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
-SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
 SHA256 (rust/crates/gilrs-0.10.2.crate) = 62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a
 SIZE (rust/crates/gilrs-0.10.2.crate) = 122308
 SHA256 (rust/crates/gilrs-core-0.5.7.crate) = 5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d
 SIZE (rust/crates/gilrs-core-0.5.7.crate) = 45141
 SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
 SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/gimli-0.29.0.crate) = 40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd
+SIZE (rust/crates/gimli-0.29.0.crate) = 275756
 SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d
 SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330
 SHA256 (rust/crates/glam-0.10.2.crate) = 579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15
@@ -503,12 +517,12 @@ SHA256 (rust/crates/glow-0.13.1.crate) = bd348e04c43b32574f2de31c8bb397d96c9fcfa
 SIZE (rust/crates/glow-0.13.1.crate) = 150940
 SHA256 (rust/crates/glutin_wgl_sys-0.5.0.crate) = 6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead
 SIZE (rust/crates/glutin_wgl_sys-0.5.0.crate) = 5469
-SHA256 (rust/crates/glyph_brush-0.7.8.crate) = a3676f482c536a985fca36ce320a5e5b8fafd7b260806742af1963b71c5dc38c
-SIZE (rust/crates/glyph_brush-0.7.8.crate) = 63512
-SHA256 (rust/crates/glyph_brush_draw_cache-0.1.5.crate) = 6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610
-SIZE (rust/crates/glyph_brush_draw_cache-0.1.5.crate) = 64513
-SHA256 (rust/crates/glyph_brush_layout-0.2.3.crate) = cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38
-SIZE (rust/crates/glyph_brush_layout-0.2.3.crate) = 18500
+SHA256 (rust/crates/glyph_brush-0.7.9.crate) = 4ca26e3a8a43052ca015c0b1ce055035ff5bc47afddff5b01c7141e0c3e3a2a1
+SIZE (rust/crates/glyph_brush-0.7.9.crate) = 65732
+SHA256 (rust/crates/glyph_brush_draw_cache-0.1.6.crate) = 4bb6c910def52365fef3f439a6b50a4d5c11b28eec4cf6c191f6dfea18e88d7f
+SIZE (rust/crates/glyph_brush_draw_cache-0.1.6.crate) = 64216
+SHA256 (rust/crates/glyph_brush_layout-0.2.4.crate) = 7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992
+SIZE (rust/crates/glyph_brush_layout-0.2.4.crate) = 18205
 SHA256 (rust/crates/gpu-alloc-0.6.0.crate) = fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171
 SIZE (rust/crates/gpu-alloc-0.6.0.crate) = 19649
 SHA256 (rust/crates/gpu-alloc-types-0.3.0.crate) = 98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4
@@ -521,58 +535,62 @@ SHA256 (rust/crates/gpu-descriptor-types-0.1.2.crate) = 6bf0b36e6f090b7e1d8a4b49
 SIZE (rust/crates/gpu-descriptor-types-0.1.2.crate) = 1928
 SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782
 SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
-SHA256 (rust/crates/h2-0.3.25.crate) = 4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb
-SIZE (rust/crates/h2-0.3.25.crate) = 167894
-SHA256 (rust/crates/half-2.4.0.crate) = b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e
-SIZE (rust/crates/half-2.4.0.crate) = 50666
-SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67
-SIZE (rust/crates/hash32-0.2.1.crate) = 11168
+SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
+SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/hash32-0.3.1.crate) = 47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606
+SIZE (rust/crates/hash32-0.3.1.crate) = 10273
 SHA256 (rust/crates/hashbrown-0.9.1.crate) = d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04
 SIZE (rust/crates/hashbrown-0.9.1.crate) = 77734
 SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
 SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
-SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
-SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
-SHA256 (rust/crates/hashlink-0.8.4.crate) = e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7
-SIZE (rust/crates/hashlink-0.8.4.crate) = 26514
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
+SHA256 (rust/crates/hashlink-0.9.1.crate) = 6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af
+SIZE (rust/crates/hashlink-0.9.1.crate) = 28928
 SHA256 (rust/crates/hassle-rs-0.10.0.crate) = 1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0
 SIZE (rust/crates/hassle-rs-0.10.0.crate) = 25867
-SHA256 (rust/crates/heapless-0.7.17.crate) = cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f
-SIZE (rust/crates/heapless-0.7.17.crate) = 75767
+SHA256 (rust/crates/heapless-0.8.0.crate) = 0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad
+SIZE (rust/crates/heapless-0.8.0.crate) = 77802
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hermit-abi-0.4.0.crate) = fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc
+SIZE (rust/crates/hermit-abi-0.4.0.crate) = 16310
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
 SIZE (rust/crates/hex-0.4.3.crate) = 13299
 SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df
 SIZE (rust/crates/hexf-parse-0.2.1.crate) = 4662
 SHA256 (rust/crates/hibitset-0.6.4.crate) = f3ede5cfa60c958e60330d65163adbc4211e15a2653ad80eb0cce878de120121
 SIZE (rust/crates/hibitset-0.6.4.crate) = 23698
-SHA256 (rust/crates/hickory-proto-0.24.0.crate) = 091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf
-SIZE (rust/crates/hickory-proto-0.24.0.crate) = 374416
-SHA256 (rust/crates/hickory-resolver-0.24.0.crate) = 35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8
-SIZE (rust/crates/hickory-resolver-0.24.0.crate) = 90666
+SHA256 (rust/crates/hickory-proto-0.24.1.crate) = 07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512
+SIZE (rust/crates/hickory-proto-0.24.1.crate) = 374410
+SHA256 (rust/crates/hickory-resolver-0.24.1.crate) = 28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243
+SIZE (rust/crates/hickory-resolver-0.24.1.crate) = 91134
 SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
 SIZE (rust/crates/home-0.5.9.crate) = 8760
 SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
 SIZE (rust/crates/hostname-0.3.1.crate) = 9272
-SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
-SIZE (rust/crates/http-0.2.12.crate) = 101964
-SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
-SIZE (rust/crates/http-body-0.4.6.crate) = 10773
-SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
-SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/http-1.1.0.crate) = 21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258
+SIZE (rust/crates/http-1.1.0.crate) = 103144
+SHA256 (rust/crates/http-body-1.0.0.crate) = 1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643
+SIZE (rust/crates/http-body-1.0.0.crate) = 5411
+SHA256 (rust/crates/http-body-util-0.1.2.crate) = 793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f
+SIZE (rust/crates/http-body-util-0.1.2.crate) = 12821
+SHA256 (rust/crates/httparse-1.9.4.crate) = 0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9
+SIZE (rust/crates/httparse-1.9.4.crate) = 38555
 SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
 SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
 SIZE (rust/crates/humantime-2.1.0.crate) = 16749
-SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
-SIZE (rust/crates/hyper-0.14.28.crate) = 197204
-SHA256 (rust/crates/hyper-rustls-0.24.2.crate) = ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590
-SIZE (rust/crates/hyper-rustls-0.24.2.crate) = 30195
+SHA256 (rust/crates/hyper-1.3.1.crate) = fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d
+SIZE (rust/crates/hyper-1.3.1.crate) = 148763
+SHA256 (rust/crates/hyper-rustls-0.27.2.crate) = 5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155
+SIZE (rust/crates/hyper-rustls-0.27.2.crate) = 34421
+SHA256 (rust/crates/hyper-util-0.1.5.crate) = 7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56
+SIZE (rust/crates/hyper-util-0.1.5.crate) = 69740
 SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
 SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
@@ -585,26 +603,26 @@ SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260
 SIZE (rust/crates/idna-0.4.0.crate) = 271429
 SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
 SIZE (rust/crates/idna-0.5.0.crate) = 271940
-SHA256 (rust/crates/image-0.24.9.crate) = 5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d
-SIZE (rust/crates/image-0.24.9.crate) = 9261055
-SHA256 (rust/crates/indexmap-2.2.5.crate) = 7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4
-SIZE (rust/crates/indexmap-2.2.5.crate) = 81498
+SHA256 (rust/crates/image-0.25.1.crate) = fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11
+SIZE (rust/crates/image-0.25.1.crate) = 9176733
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
 SHA256 (rust/crates/indicatif-0.17.8.crate) = 763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3
 SIZE (rust/crates/indicatif-0.17.8.crate) = 64869
-SHA256 (rust/crates/indoc-2.0.4.crate) = 1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8
-SIZE (rust/crates/indoc-2.0.4.crate) = 14311
+SHA256 (rust/crates/init_with-1.1.0.crate) = 0175f63815ce00183bf755155ad0cb48c65226c5d17a724e369c25418d2b7699
+SIZE (rust/crates/init_with-1.1.0.crate) = 3929
 SHA256 (rust/crates/inline_tweak-1.1.1.crate) = c6acddbefae08bfba73e27f55513f491f35c365d84bf3002bf85ba9b916c5e5f
 SIZE (rust/crates/inline_tweak-1.1.1.crate) = 12226
 SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
 SIZE (rust/crates/inotify-0.9.6.crate) = 22971
 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
 SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
-SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
-SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/instant-0.1.13.crate) = e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222
+SIZE (rust/crates/instant-0.1.13.crate) = 6305
 SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972
 SIZE (rust/crates/intl_pluralrules-7.0.2.crate) = 9201
-SHA256 (rust/crates/io-extras-0.18.1.crate) = c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed
-SIZE (rust/crates/io-extras-0.18.1.crate) = 35412
+SHA256 (rust/crates/io-extras-0.18.2.crate) = c9f046b9af244f13b3bd939f55d16830ac3a201e8a9ba9661bfcb03e2be72b9b
+SIZE (rust/crates/io-extras-0.18.2.crate) = 36030
 SHA256 (rust/crates/io-kit-sys-0.3.0.crate) = 9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de
 SIZE (rust/crates/io-kit-sys-0.3.0.crate) = 38799
 SHA256 (rust/crates/io-lifetimes-2.0.3.crate) = 5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c
@@ -615,40 +633,46 @@ SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2
 SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
 SHA256 (rust/crates/is-terminal-0.4.12.crate) = f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b
 SIZE (rust/crates/is-terminal-0.4.12.crate) = 7470
+SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
+SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
 SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
+SIZE (rust/crates/itertools-0.11.0.crate) = 125074
 SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
 SIZE (rust/crates/itertools-0.12.1.crate) = 137761
-SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
-SIZE (rust/crates/itoa-1.0.10.crate) = 10534
+SHA256 (rust/crates/itertools-0.13.0.crate) = 413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186
+SIZE (rust/crates/itertools-0.13.0.crate) = 146261
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
 SHA256 (rust/crates/ittapi-0.4.0.crate) = 6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1
 SIZE (rust/crates/ittapi-0.4.0.crate) = 7446
 SHA256 (rust/crates/ittapi-sys-0.4.0.crate) = 52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc
 SIZE (rust/crates/ittapi-sys-0.4.0.crate) = 144943
+SHA256 (rust/crates/jni-0.19.0.crate) = c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec
+SIZE (rust/crates/jni-0.19.0.crate) = 65890
 SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97
 SIZE (rust/crates/jni-0.21.1.crate) = 105028
 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
 SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
-SHA256 (rust/crates/jobserver-0.1.28.crate) = ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6
-SIZE (rust/crates/jobserver-0.1.28.crate) = 25543
-SHA256 (rust/crates/jpeg-decoder-0.3.1.crate) = f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0
-SIZE (rust/crates/jpeg-decoder-0.3.1.crate) = 744364
+SHA256 (rust/crates/jobserver-0.1.31.crate) = d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e
+SIZE (rust/crates/jobserver-0.1.31.crate) = 27306
 SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
 SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
 SHA256 (rust/crates/khronos-egl-6.0.0.crate) = 6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76
 SIZE (rust/crates/khronos-egl-6.0.0.crate) = 29315
 SHA256 (rust/crates/khronos_api-3.1.0.crate) = e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc
 SIZE (rust/crates/khronos_api-3.1.0.crate) = 599718
-SHA256 (rust/crates/kiddo-0.2.5.crate) = 06ced2e69cfc5f22f86ccc9ce4ecff9f19917f3083a4bac0f402bdab034d73f1
-SIZE (rust/crates/kiddo-0.2.5.crate) = 722307
+SHA256 (rust/crates/kiddo-4.2.0.crate) = 9d2f8d9e1bc7c6919ad2cdc83472a9a4b5ed2ea2c5392c9514fdf958a7920f9a
+SIZE (rust/crates/kiddo-4.2.0.crate) = 147212
 SHA256 (rust/crates/kqueue-1.0.8.crate) = 7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c
 SIZE (rust/crates/kqueue-1.0.8.crate) = 12642
 SHA256 (rust/crates/kqueue-sys-1.0.4.crate) = ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b
 SIZE (rust/crates/kqueue-sys-1.0.4.crate) = 7160
 SHA256 (rust/crates/lazy-bytes-cast-5.0.1.crate) = 10257499f089cd156ad82d0a9cd57d9501fa2c989068992a97eb3c27836f206b
 SIZE (rust/crates/lazy-bytes-cast-5.0.1.crate) = 4354
-SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe
+SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025
 SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
 SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
 SHA256 (rust/crates/leb128-0.2.5.crate) = 884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67
@@ -657,42 +681,40 @@ SHA256 (rust/crates/levenshtein-1.0.5.crate) = db13adb97ab515a3691f56e4dbab09283
 SIZE (rust/crates/levenshtein-1.0.5.crate) = 1389
 SHA256 (rust/crates/lewton-0.10.2.crate) = 777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030
 SIZE (rust/crates/lewton-0.10.2.crate) = 68807
-SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
-SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
 SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
 SIZE (rust/crates/libloading-0.7.4.crate) = 27580
-SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
-SIZE (rust/crates/libloading-0.8.3.crate) = 28480
+SHA256 (rust/crates/libloading-0.8.4.crate) = e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d
+SIZE (rust/crates/libloading-0.8.4.crate) = 28636
 SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
 SIZE (rust/crates/libm-0.2.8.crate) = 113450
-SHA256 (rust/crates/libmimalloc-sys-0.1.35.crate) = 3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664
-SIZE (rust/crates/libmimalloc-sys-0.1.35.crate) = 184695
-SHA256 (rust/crates/libredox-0.0.1.crate) = 85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8
-SIZE (rust/crates/libredox-0.0.1.crate) = 4212
+SHA256 (rust/crates/libmimalloc-sys-0.1.39.crate) = 23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44
+SIZE (rust/crates/libmimalloc-sys-0.1.39.crate) = 198523
 SHA256 (rust/crates/libredox-0.0.2.crate) = 3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607
 SIZE (rust/crates/libredox-0.0.2.crate) = 4538
-SHA256 (rust/crates/libsqlite3-sys-0.27.0.crate) = cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716
-SIZE (rust/crates/libsqlite3-sys-0.27.0.crate) = 4948458
+SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
+SIZE (rust/crates/libredox-0.1.3.crate) = 6068
+SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f
+SIZE (rust/crates/libsqlite3-sys-0.28.0.crate) = 4975624
 SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
-SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
-SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
-SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
-SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
-SIZE (rust/crates/log-0.4.21.crate) = 43442
-SHA256 (rust/crates/loom-0.5.6.crate) = ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5
-SIZE (rust/crates/loom-0.5.6.crate) = 72186
+SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
+SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
+SHA256 (rust/crates/log-0.4.22.crate) = a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24
+SIZE (rust/crates/log-0.4.22.crate) = 44027
+SHA256 (rust/crates/loom-0.7.2.crate) = 419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca
+SIZE (rust/crates/loom-0.7.2.crate) = 73989
 SHA256 (rust/crates/lru-0.12.3.crate) = d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc
 SIZE (rust/crates/lru-0.12.3.crate) = 15009
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
 SHA256 (rust/crates/lz-fear-0.2.0.crate) = 26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d
 SIZE (rust/crates/lz-fear-0.2.0.crate) = 142438
-SHA256 (rust/crates/mach-0.3.2.crate) = b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa
-SIZE (rust/crates/mach-0.3.2.crate) = 19611
 SHA256 (rust/crates/mach2-0.4.2.crate) = 19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709
 SIZE (rust/crates/mach2-0.4.2.crate) = 21889
 SHA256 (rust/crates/macro_rules_attribute-0.1.3.crate) = cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862
@@ -711,40 +733,42 @@ SHA256 (rust/crates/maybe-owned-0.3.4.crate) = 4facc753ae494aeb6e3c22f839b158aeb
 SIZE (rust/crates/maybe-owned-0.3.4.crate) = 14308
 SHA256 (rust/crates/maybe-uninit-2.0.0.crate) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
 SIZE (rust/crates/maybe-uninit-2.0.0.crate) = 11809
-SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149
-SIZE (rust/crates/memchr-2.7.1.crate) = 96307
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
 SHA256 (rust/crates/memfd-0.6.4.crate) = b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64
 SIZE (rust/crates/memfd-0.6.4.crate) = 12820
 SHA256 (rust/crates/memmap2-0.5.10.crate) = 83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327
 SIZE (rust/crates/memmap2-0.5.10.crate) = 26847
 SHA256 (rust/crates/memmap2-0.7.1.crate) = f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6
 SIZE (rust/crates/memmap2-0.7.1.crate) = 30741
+SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
+SIZE (rust/crates/memmap2-0.9.4.crate) = 32752
 SHA256 (rust/crates/memoffset-0.5.6.crate) = 043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa
 SIZE (rust/crates/memoffset-0.5.6.crate) = 7382
 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
 SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
-SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
-SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
+SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
 SHA256 (rust/crates/metal-0.27.0.crate) = c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25
 SIZE (rust/crates/metal-0.27.0.crate) = 3028990
-SHA256 (rust/crates/mimalloc-0.1.39.crate) = fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c
-SIZE (rust/crates/mimalloc-0.1.39.crate) = 3727
+SHA256 (rust/crates/mimalloc-0.1.43.crate) = 68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633
+SIZE (rust/crates/mimalloc-0.1.43.crate) = 4075
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
-SHA256 (rust/crates/minifb-0.25.0.crate) = 05eddefadb505d3dcb66a89fa77dd0936e72ec84e891cc8fc36e3c05bfe61103
-SIZE (rust/crates/minifb-0.25.0.crate) = 95844
+SHA256 (rust/crates/minifb-0.27.0.crate) = b0c470a74618b43cd182c21b3dc1e6123501249f3bad9a0085e95d1304ca2478
+SIZE (rust/crates/minifb-0.27.0.crate) = 97517
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
-SIZE (rust/crates/miniz_oxide-0.7.2.crate) = 55731
+SHA256 (rust/crates/miniz_oxide-0.7.4.crate) = b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08
+SIZE (rust/crates/miniz_oxide-0.7.4.crate) = 56119
 SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
 SIZE (rust/crates/mio-0.8.11.crate) = 102983
 SHA256 (rust/crates/mumble-link-0.2.0.crate) = c7f4c53745d4e7afd0faaf6ee46c0c3114d4b7d0db63bef96917751906453285
 SIZE (rust/crates/mumble-link-0.2.0.crate) = 11204
 SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
-SHA256 (rust/crates/native-dialog-0.6.4.crate) = 1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b
-SIZE (rust/crates/native-dialog-0.6.4.crate) = 19342
+SHA256 (rust/crates/native-dialog-0.7.0.crate) = 84e7038885d2aeab236bd60da9e159a5967b47cde3292da3b15ff1bec27c039f
+SIZE (rust/crates/native-dialog-0.7.0.crate) = 20554
 SHA256 (rust/crates/ndk-0.7.0.crate) = 451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0
 SIZE (rust/crates/ndk-0.7.0.crate) = 54683
 SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7
@@ -767,8 +791,8 @@ SHA256 (rust/crates/nix-0.28.0.crate) = ab2156c4fce2f8df6c499cc1c763e4394b748252
 SIZE (rust/crates/nix-0.28.0.crate) = 311086
 SHA256 (rust/crates/nohash-hasher-0.2.0.crate) = 2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451
 SIZE (rust/crates/nohash-hasher-0.2.0.crate) = 8051
-SHA256 (rust/crates/noise-0.7.0.crate) = 82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43
-SIZE (rust/crates/noise-0.7.0.crate) = 68306
+SHA256 (rust/crates/noise-0.9.0.crate) = 6da45c8333f2e152fc665d78a380be060eb84fad8ca4c9f7ac8ca29216cff0cc
+SIZE (rust/crates/noise-0.9.0.crate) = 82369
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d
@@ -781,30 +805,30 @@ SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb4545924260
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
 SHA256 (rust/crates/num-0.2.1.crate) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36
 SIZE (rust/crates/num-0.2.1.crate) = 9082
-SHA256 (rust/crates/num-0.4.1.crate) = b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af
-SIZE (rust/crates/num-0.4.1.crate) = 9522
+SHA256 (rust/crates/num-0.4.3.crate) = 35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23
+SIZE (rust/crates/num-0.4.3.crate) = 9575
 SHA256 (rust/crates/num-bigint-0.2.6.crate) = 090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304
 SIZE (rust/crates/num-bigint-0.2.6.crate) = 87275
-SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
-SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-bigint-0.4.6.crate) = a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9
+SIZE (rust/crates/num-bigint-0.4.6.crate) = 102801
 SHA256 (rust/crates/num-complex-0.2.4.crate) = b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95
 SIZE (rust/crates/num-complex-0.2.4.crate) = 24679
-SHA256 (rust/crates/num-complex-0.4.5.crate) = 23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6
-SIZE (rust/crates/num-complex-0.4.5.crate) = 29614
+SHA256 (rust/crates/num-complex-0.4.6.crate) = 73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495
+SIZE (rust/crates/num-complex-0.4.6.crate) = 30352
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
 SHA256 (rust/crates/num-derive-0.4.2.crate) = ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202
 SIZE (rust/crates/num-derive-0.4.2.crate) = 14709
 SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
 SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
-SHA256 (rust/crates/num-iter-0.1.44.crate) = d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9
-SIZE (rust/crates/num-iter-0.1.44.crate) = 10249
+SHA256 (rust/crates/num-iter-0.1.45.crate) = 1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf
+SIZE (rust/crates/num-iter-0.1.45.crate) = 10320
 SHA256 (rust/crates/num-rational-0.2.4.crate) = 5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef
 SIZE (rust/crates/num-rational-0.2.4.crate) = 21694
-SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0
-SIZE (rust/crates/num-rational-0.4.1.crate) = 27889
-SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
-SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num-rational-0.4.2.crate) = f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824
+SIZE (rust/crates/num-rational-0.4.2.crate) = 28159
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
 SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
 SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
 SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9
@@ -835,8 +859,10 @@ SHA256 (rust/crates/objc_exception-0.1.2.crate) = ad970fb455818ad6cba4c122ad012f
 SIZE (rust/crates/objc_exception-0.1.2.crate) = 2251
 SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b
 SIZE (rust/crates/objc_id-0.1.1.crate) = 3258
-SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
-SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object-0.33.0.crate) = d8dd6c0cdf9429bce006e1362bfce61fa1bfd8c898a643ed8d2b471934701d3d
+SIZE (rust/crates/object-0.33.0.crate) = 310775
+SHA256 (rust/crates/object-0.36.1.crate) = 081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce
+SIZE (rust/crates/object-0.36.1.crate) = 323865
 SHA256 (rust/crates/oboe-0.6.1.crate) = e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb
 SIZE (rust/crates/oboe-0.6.1.crate) = 24588
 SHA256 (rust/crates/oboe-sys-0.6.1.crate) = 6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d
@@ -855,34 +881,30 @@ SHA256 (rust/crates/orbclient-0.3.47.crate) = 52f0d54bde9774d3a51dcf281a5def240c
 SIZE (rust/crates/orbclient-0.3.47.crate) = 1324509
 SHA256 (rust/crates/ordered-float-1.1.1.crate) = 3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7
 SIZE (rust/crates/ordered-float-1.1.1.crate) = 9983
-SHA256 (rust/crates/ordered-float-3.9.2.crate) = f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc
-SIZE (rust/crates/ordered-float-3.9.2.crate) = 19788
-SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
-SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
+SHA256 (rust/crates/ordered-float-4.2.1.crate) = 19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be
+SIZE (rust/crates/ordered-float-4.2.1.crate) = 20586
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
-SHA256 (rust/crates/owned_ttf_parser-0.20.0.crate) = d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7
-SIZE (rust/crates/owned_ttf_parser-0.20.0.crate) = 150890
-SHA256 (rust/crates/packed_simd-0.3.9.crate) = 1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d
-SIZE (rust/crates/packed_simd-0.3.9.crate) = 98340
+SHA256 (rust/crates/owned_ttf_parser-0.21.0.crate) = 6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5
+SIZE (rust/crates/owned_ttf_parser-0.21.0.crate) = 150905
 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
 SIZE (rust/crates/parking-2.2.0.crate) = 9730
-SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
-SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
-SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
-SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
-SHA256 (rust/crates/parse-zoneinfo-0.3.0.crate) = c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41
-SIZE (rust/crates/parse-zoneinfo-0.3.0.crate) = 76590
-SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
-SIZE (rust/crates/paste-1.0.14.crate) = 18157
-SHA256 (rust/crates/pem-3.0.3.crate) = 1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310
-SIZE (rust/crates/pem-3.0.3.crate) = 13035
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/parse-zoneinfo-0.3.1.crate) = 1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24
+SIZE (rust/crates/parse-zoneinfo-0.3.1.crate) = 97290
+SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
+SIZE (rust/crates/paste-1.0.15.crate) = 18374
+SHA256 (rust/crates/pem-3.0.4.crate) = 8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae
+SIZE (rust/crates/pem-3.0.4.crate) = 13040
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
 SHA256 (rust/crates/petgraph-0.4.13.crate) = 9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f
 SIZE (rust/crates/petgraph-0.4.13.crate) = 111936
-SHA256 (rust/crates/petgraph-0.6.4.crate) = e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9
-SIZE (rust/crates/petgraph-0.6.4.crate) = 185895
+SHA256 (rust/crates/petgraph-0.6.5.crate) = b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db
+SIZE (rust/crates/petgraph-0.6.5.crate) = 710970
 SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
 SIZE (rust/crates/phf-0.11.2.crate) = 21569
 SHA256 (rust/crates/phf_codegen-0.11.2.crate) = e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a
@@ -895,8 +917,8 @@ SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb52
 SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
 SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
 SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
-SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
-SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
 SHA256 (rust/crates/piston-float-0.3.0.crate) = b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199
@@ -909,6 +931,8 @@ SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee280
 SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
 SHA256 (rust/crates/png-0.17.13.crate) = 06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1
 SIZE (rust/crates/png-0.17.13.crate) = 103176
+SHA256 (rust/crates/polling-3.7.2.crate) = a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b
+SIZE (rust/crates/polling-3.7.2.crate) = 57988
 SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
 SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
@@ -921,194 +945,200 @@ SHA256 (rust/crates/presser-0.3.1.crate) = e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b
 SIZE (rust/crates/presser-0.3.1.crate) = 20946
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
+SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
+SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
 SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
 SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
 SHA256 (rust/crates/proc-macro-nested-0.1.7.crate) = bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086
 SIZE (rust/crates/proc-macro-nested-0.1.7.crate) = 6495
 SHA256 (rust/crates/proc-macro2-0.4.30.crate) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
 SIZE (rust/crates/proc-macro2-0.4.30.crate) = 34731
-SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e
-SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200
-SHA256 (rust/crates/profiling-1.0.8.crate) = 332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2
-SIZE (rust/crates/profiling-1.0.8.crate) = 31097
+SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
+SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958
+SHA256 (rust/crates/profiling-1.0.15.crate) = 43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58
+SIZE (rust/crates/profiling-1.0.15.crate) = 14255
 SHA256 (rust/crates/profiling-procmacros-1.0.15.crate) = 8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd
 SIZE (rust/crates/profiling-procmacros-1.0.15.crate) = 5956
-SHA256 (rust/crates/prometheus-0.13.3.crate) = 449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c
-SIZE (rust/crates/prometheus-0.13.3.crate) = 82457
-SHA256 (rust/crates/prometheus-hyper-0.1.5.crate) = 18fc98d5705a20b11f8b240c0857167b79852ba469f9faec6df0027e576e676e
-SIZE (rust/crates/prometheus-hyper-0.1.5.crate) = 14841
+SHA256 (rust/crates/prometheus-0.13.4.crate) = 3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1
+SIZE (rust/crates/prometheus-0.13.4.crate) = 84650
+SHA256 (rust/crates/prometheus-hyper-0.2.0.crate) = 4599cd06b4c85ba573bf2edf4e5ca5c3f32505ead7fb1f0c7d9a4b90195e1ab1
+SIZE (rust/crates/prometheus-hyper-0.2.0.crate) = 15520
+SHA256 (rust/crates/protocol-3.4.0.crate) = 13cfa9ba37e0183f87fb14b82f23fc76494c458c72469d95b8a8eec75ad5f191
+SIZE (rust/crates/protocol-3.4.0.crate) = 24174
+SHA256 (rust/crates/protocol-derive-3.4.0.crate) = 28647f30298898ead966b51e9aee5c74e4ac709ce5ca554378fde187fd3f7e47
+SIZE (rust/crates/protocol-derive-3.4.0.crate) = 8347
 SHA256 (rust/crates/psm-0.1.21.crate) = 5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874
 SIZE (rust/crates/psm-0.1.21.crate) = 23126
 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
 SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956
 SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923
-SHA256 (rust/crates/quinn-0.10.2.crate) = 8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75
-SIZE (rust/crates/quinn-0.10.2.crate) = 59964
-SHA256 (rust/crates/quinn-proto-0.10.6.crate) = 141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a
-SIZE (rust/crates/quinn-proto-0.10.6.crate) = 166677
-SHA256 (rust/crates/quinn-udp-0.4.1.crate) = 055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7
-SIZE (rust/crates/quinn-udp-0.4.1.crate) = 12467
+SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
+SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
+SHA256 (rust/crates/quinn-0.11.2.crate) = e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad
+SIZE (rust/crates/quinn-0.11.2.crate) = 73920
+SHA256 (rust/crates/quinn-proto-0.11.3.crate) = ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe
+SIZE (rust/crates/quinn-proto-0.11.3.crate) = 202348
+SHA256 (rust/crates/quinn-udp-0.5.2.crate) = 9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46
+SIZE (rust/crates/quinn-udp-0.5.2.crate) = 21918
 SHA256 (rust/crates/quote-0.6.13.crate) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1
 SIZE (rust/crates/quote-0.6.13.crate) = 17475
-SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
-SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
 SIZE (rust/crates/radium-0.7.0.crate) = 10906
 SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
 SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
-SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
-SIZE (rust/crates/rand-0.7.3.crate) = 112246
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
-SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
-SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
-SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
-SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
-SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
-SHA256 (rust/crates/rand_xorshift-0.2.0.crate) = 77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8
-SIZE (rust/crates/rand_xorshift-0.2.0.crate) = 9098
+SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f
+SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
 SHA256 (rust/crates/range-alloc-0.1.3.crate) = 9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab
 SIZE (rust/crates/range-alloc-0.1.3.crate) = 7664
-SHA256 (rust/crates/ratatui-0.26.1.crate) = bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8
-SIZE (rust/crates/ratatui-0.26.1.crate) = 443050
-SHA256 (rust/crates/raw-window-handle-0.4.3.crate) = b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41
-SIZE (rust/crates/raw-window-handle-0.4.3.crate) = 10636
+SHA256 (rust/crates/ratatui-0.27.0.crate) = d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3
+SIZE (rust/crates/ratatui-0.27.0.crate) = 486576
 SHA256 (rust/crates/raw-window-handle-0.5.2.crate) = f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9
 SIZE (rust/crates/raw-window-handle-0.5.2.crate) = 17063
-SHA256 (rust/crates/rayon-1.9.0.crate) = e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd
-SIZE (rust/crates/rayon-1.9.0.crate) = 177770
+SHA256 (rust/crates/raw-window-handle-0.6.2.crate) = 20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539
+SIZE (rust/crates/raw-window-handle-0.6.2.crate) = 20234
+SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
+SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
-SHA256 (rust/crates/rcgen-0.12.1.crate) = 48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1
-SIZE (rust/crates/rcgen-0.12.1.crate) = 63815
+SHA256 (rust/crates/rcgen-0.13.1.crate) = 54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779
+SIZE (rust/crates/rcgen-0.13.1.crate) = 74432
 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
 SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
 SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/redox_users-0.4.4.crate) = a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4
-SIZE (rust/crates/redox_users-0.4.4.crate) = 15438
-SHA256 (rust/crates/refinery-0.8.12.crate) = a2783724569d96af53464d0711dff635cab7a4934df5e22e9fbc9e181523b83e
-SIZE (rust/crates/refinery-0.8.12.crate) = 15527
-SHA256 (rust/crates/refinery-core-0.8.12.crate) = 08d6c80329c0455510a8d42fce286ecb4b6bcd8c57e1816d9f2d6bd7379c2cc8
-SIZE (rust/crates/refinery-core-0.8.12.crate) = 18011
-SHA256 (rust/crates/refinery-macros-0.8.12.crate) = 6ab6e31e166a49d55cb09b62639e5ab9ba2e73f2f124336b06f6c321dc602779
-SIZE (rust/crates/refinery-macros-0.8.12.crate) = 2732
+SHA256 (rust/crates/redox_syscall-0.5.2.crate) = c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd
+SIZE (rust/crates/redox_syscall-0.5.2.crate) = 23957
+SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
+SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/refinery-0.8.14.crate) = 0904191f0566c3d3e0091d5cc8dec22e663d77def2d247b16e7a438b188bf75d
+SIZE (rust/crates/refinery-0.8.14.crate) = 15542
+SHA256 (rust/crates/refinery-core-0.8.14.crate) = 9bf253999e1899ae476c910b994959e341d84c4389ba9533d3dacbe06df04825
+SIZE (rust/crates/refinery-core-0.8.14.crate) = 18604
+SHA256 (rust/crates/refinery-macros-0.8.14.crate) = bd81f69687fe8a1fa10995108b3ffc7cdbd63e682a4f8fbfd1020130780d7e17
+SIZE (rust/crates/refinery-macros-0.8.14.crate) = 3382
 SHA256 (rust/crates/regalloc2-0.9.3.crate) = ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6
 SIZE (rust/crates/regalloc2-0.9.3.crate) = 120867
-SHA256 (rust/crates/regex-1.10.3.crate) = b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15
-SIZE (rust/crates/regex-1.10.3.crate) = 253101
+SHA256 (rust/crates/regex-1.10.5.crate) = b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f
+SIZE (rust/crates/regex-1.10.5.crate) = 253805
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
-SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
-SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-automata-0.4.7.crate) = 38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df
+SIZE (rust/crates/regex-automata-0.4.7.crate) = 617582
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
-SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
-SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
+SHA256 (rust/crates/regex-syntax-0.8.4.crate) = 7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b
+SIZE (rust/crates/regex-syntax-0.8.4.crate) = 347577
 SHA256 (rust/crates/renderdoc-sys-1.1.0.crate) = 19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832
 SIZE (rust/crates/renderdoc-sys-1.1.0.crate) = 10366
 SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
 SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
-SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
-SIZE (rust/crates/ring-0.16.20.crate) = 5082615
 SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d
 SIZE (rust/crates/ring-0.17.8.crate) = 4188554
-SHA256 (rust/crates/rmp-0.8.12.crate) = 7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20
-SIZE (rust/crates/rmp-0.8.12.crate) = 28844
-SHA256 (rust/crates/rmp-serde-1.1.2.crate) = bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a
-SIZE (rust/crates/rmp-serde-1.1.2.crate) = 30388
-SHA256 (rust/crates/rodio-0.17.3.crate) = 3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611
-SIZE (rust/crates/rodio-0.17.3.crate) = 59247
+SHA256 (rust/crates/rmp-0.8.14.crate) = 228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4
+SIZE (rust/crates/rmp-0.8.14.crate) = 29687
+SHA256 (rust/crates/rmp-serde-1.3.0.crate) = 52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db
+SIZE (rust/crates/rmp-serde-1.3.0.crate) = 33025
+SHA256 (rust/crates/rodio-0.18.1.crate) = d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3
+SIZE (rust/crates/rodio-0.18.1.crate) = 66732
 SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94
 SIZE (rust/crates/ron-0.8.1.crate) = 63251
 SHA256 (rust/crates/roots-0.0.8.crate) = 082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058
 SIZE (rust/crates/roots-0.0.8.crate) = 29257
 SHA256 (rust/crates/roxmltree-0.14.1.crate) = 921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b
 SIZE (rust/crates/roxmltree-0.14.1.crate) = 39163
-SHA256 (rust/crates/rstar-0.10.0.crate) = 1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a
-SIZE (rust/crates/rstar-0.10.0.crate) = 39236
-SHA256 (rust/crates/rusqlite-0.30.0.crate) = a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d
-SIZE (rust/crates/rusqlite-0.30.0.crate) = 150360
+SHA256 (rust/crates/rstar-0.12.0.crate) = 133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008
+SIZE (rust/crates/rstar-0.12.0.crate) = 42105
+SHA256 (rust/crates/rusqlite-0.31.0.crate) = b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae
+SIZE (rust/crates/rusqlite-0.31.0.crate) = 152252
 SHA256 (rust/crates/rust-argon2-2.1.0.crate) = 9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8
 SIZE (rust/crates/rust-argon2-2.1.0.crate) = 26904
-SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
-SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
+SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc-hash-2.0.0.crate) = 583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152
+SIZE (rust/crates/rustc-hash-2.0.0.crate) = 12691
 SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
 SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
-SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
-SIZE (rust/crates/rustix-0.38.32.crate) = 376999
-SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
-SIZE (rust/crates/rustls-0.21.10.crate) = 284920
-SHA256 (rust/crates/rustls-native-certs-0.6.3.crate) = a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00
-SIZE (rust/crates/rustls-native-certs-0.6.3.crate) = 24438
-SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
-SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
-SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
-SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustix-0.38.34.crate) = 70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f
+SIZE (rust/crates/rustix-0.38.34.crate) = 365160
+SHA256 (rust/crates/rustls-0.23.10.crate) = 05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402
+SIZE (rust/crates/rustls-0.23.10.crate) = 424689
+SHA256 (rust/crates/rustls-native-certs-0.7.0.crate) = 8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792
+SIZE (rust/crates/rustls-native-certs-0.7.0.crate) = 25071
+SHA256 (rust/crates/rustls-pemfile-2.1.2.crate) = 29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d
+SIZE (rust/crates/rustls-pemfile-2.1.2.crate) = 25928
+SHA256 (rust/crates/rustls-pki-types-1.7.0.crate) = 976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d
+SIZE (rust/crates/rustls-pki-types-1.7.0.crate) = 29555
+SHA256 (rust/crates/rustls-platform-verifier-0.3.2.crate) = 3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1
+SIZE (rust/crates/rustls-platform-verifier-0.3.2.crate) = 50523
+SHA256 (rust/crates/rustls-platform-verifier-android-0.1.0.crate) = 84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad
+SIZE (rust/crates/rustls-platform-verifier-android-0.1.0.crate) = 12804
+SHA256 (rust/crates/rustls-webpki-0.102.4.crate) = ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e
+SIZE (rust/crates/rustls-webpki-0.102.4.crate) = 200657
 SHA256 (rust/crates/rusttype-0.7.9.crate) = 310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5
 SIZE (rust/crates/rusttype-0.7.9.crate) = 42732
 SHA256 (rust/crates/rusttype-0.8.3.crate) = 9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0
 SIZE (rust/crates/rusttype-0.8.3.crate) = 37327
-SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4
-SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
+SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
+SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
 SHA256 (rust/crates/rustyline-14.0.0.crate) = 7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63
 SIZE (rust/crates/rustyline-14.0.0.crate) = 116347
-SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
-SIZE (rust/crates/ryu-1.0.17.crate) = 47537
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
 SIZE (rust/crates/schannel-0.1.23.crate) = 41667
-SHA256 (rust/crates/schnellru-0.2.1.crate) = 772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d
-SIZE (rust/crates/schnellru-0.2.1.crate) = 22458
+SHA256 (rust/crates/schnellru-0.2.3.crate) = c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367
+SIZE (rust/crates/schnellru-0.2.3.crate) = 23878
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
-SIZE (rust/crates/sct-0.7.1.crate) = 27501
 SHA256 (rust/crates/sctk-adwaita-0.5.4.crate) = cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09
 SIZE (rust/crates/sctk-adwaita-0.5.4.crate) = 45888
 SHA256 (rust/crates/sdl2-0.35.2.crate) = f7959277b623f1fb9e04aea73686c3ca52f01b2145f8ea16f4ff30d8b7623b1a
 SIZE (rust/crates/sdl2-0.35.2.crate) = 177570
 SHA256 (rust/crates/sdl2-sys-0.35.2.crate) = e3586be2cf6c0a8099a79a12b4084357aa9b3e0b0d7980e3b67aaf7a9d55f9f0
 SIZE (rust/crates/sdl2-sys-0.35.2.crate) = 7425816
-SHA256 (rust/crates/security-framework-2.9.2.crate) = 05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de
-SIZE (rust/crates/security-framework-2.9.2.crate) = 79295
-SHA256 (rust/crates/security-framework-sys-2.9.1.crate) = e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a
-SIZE (rust/crates/security-framework-sys-2.9.1.crate) = 18284
+SHA256 (rust/crates/security-framework-2.11.0.crate) = c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0
+SIZE (rust/crates/security-framework-2.11.0.crate) = 80191
+SHA256 (rust/crates/security-framework-sys-2.11.0.crate) = 317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7
+SIZE (rust/crates/security-framework-sys-2.11.0.crate) = 18718
 SHA256 (rust/crates/self_cell-0.10.3.crate) = e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d
 SIZE (rust/crates/self_cell-0.10.3.crate) = 7308
-SHA256 (rust/crates/self_cell-1.0.3.crate) = 58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba
-SIZE (rust/crates/self_cell-1.0.3.crate) = 15147
+SHA256 (rust/crates/self_cell-1.0.4.crate) = d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a
+SIZE (rust/crates/self_cell-1.0.4.crate) = 15220
 SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
 SIZE (rust/crates/semver-0.9.0.crate) = 17344
-SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
-SIZE (rust/crates/semver-1.0.22.crate) = 30446
+SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b
+SIZE (rust/crates/semver-1.0.23.crate) = 30622
 SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
 SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
-SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
-SIZE (rust/crates/serde-1.0.197.crate) = 77087
-SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
-SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
-SHA256 (rust/crates/serde_json-1.0.114.crate) = c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0
-SIZE (rust/crates/serde_json-1.0.114.crate) = 146986
+SHA256 (rust/crates/serde-1.0.203.crate) = 7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094
+SIZE (rust/crates/serde-1.0.203.crate) = 77935
+SHA256 (rust/crates/serde_derive-1.0.203.crate) = 500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba
+SIZE (rust/crates/serde_derive-1.0.203.crate) = 55867
+SHA256 (rust/crates/serde_json-1.0.118.crate) = d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4
+SIZE (rust/crates/serde_json-1.0.118.crate) = 146962
 SHA256 (rust/crates/serde_path_to_error-0.1.16.crate) = af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6
 SIZE (rust/crates/serde_path_to_error-0.1.16.crate) = 16657
-SHA256 (rust/crates/serde_repr-0.1.18.crate) = 0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb
-SIZE (rust/crates/serde_repr-0.1.18.crate) = 9974
-SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
-SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9
+SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
+SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
+SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
 SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
 SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
@@ -1127,14 +1157,18 @@ SHA256 (rust/crates/shellexpand-3.1.0.crate) = da03fa3b94cc19e3ebfc88c4229c49d8f
 SIZE (rust/crates/shellexpand-3.1.0.crate) = 25591
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/shred-0.16.1.crate) = 656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e
+SIZE (rust/crates/shred-0.16.1.crate) = 57217
+SHA256 (rust/crates/shred-derive-0.7.0.crate) = 69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d
+SIZE (rust/crates/shred-derive-0.7.0.crate) = 2365
 SHA256 (rust/crates/shrev-1.1.3.crate) = a5ea33232fdcf1bf691ca33450e5a94dde13e1a8cbb8caabc5e4f9d761e10b1a
 SIZE (rust/crates/shrev-1.1.3.crate) = 11309
 SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801
 SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296
 SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af
 SIZE (rust/crates/signal-hook-mio-0.2.3.crate) = 9064
-SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
-SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
 SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
 SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
 SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
@@ -1147,20 +1181,20 @@ SHA256 (rust/crates/slice-group-by-0.3.1.crate) = 826167069c09b99d56f31e9ae5c990
 SIZE (rust/crates/slice-group-by-0.3.1.crate) = 14640
 SHA256 (rust/crates/slotmap-1.0.7.crate) = dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a
 SIZE (rust/crates/slotmap-1.0.7.crate) = 61390
-SHA256 (rust/crates/smallvec-1.13.1.crate) = e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7
-SIZE (rust/crates/smallvec-1.13.1.crate) = 34952
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
 SHA256 (rust/crates/smithay-client-toolkit-0.16.1.crate) = 870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9
 SIZE (rust/crates/smithay-client-toolkit-0.16.1.crate) = 131081
+SHA256 (rust/crates/smithay-client-toolkit-0.18.1.crate) = 922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a
+SIZE (rust/crates/smithay-client-toolkit-0.18.1.crate) = 129920
 SHA256 (rust/crates/smithay-clipboard-0.6.6.crate) = 0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8
 SIZE (rust/crates/smithay-clipboard-0.6.6.crate) = 16797
-SHA256 (rust/crates/socket2-0.5.6.crate) = 05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871
-SIZE (rust/crates/socket2-0.5.6.crate) = 55270
-SHA256 (rust/crates/specs-0.20.0.crate) = a60eabdfd5a80e458c3e7bcc9f1076d6ce3cc8ddb71d69691f00fc0de735a635
-SIZE (rust/crates/specs-0.20.0.crate) = 92066
-SHA256 (rust/crates/specs-derive-0.4.1.crate) = 3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511
-SIZE (rust/crates/specs-derive-0.4.1.crate) = 5224
-SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
-SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/smithay-clipboard-0.7.1.crate) = c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d
+SIZE (rust/crates/smithay-clipboard-0.7.1.crate) = 18456
+SHA256 (rust/crates/socket2-0.5.7.crate) = ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c
+SIZE (rust/crates/socket2-0.5.7.crate) = 55758
+SHA256 (rust/crates/sorted-vec-0.8.3.crate) = c6734caf0b6f51addd5eeacca12fb39b2c6c14e8d4f3ac42f3a78955c0467458
+SIZE (rust/crates/sorted-vec-0.8.3.crate) = 11870
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
 SHA256 (rust/crates/spin_sleep-1.2.0.crate) = 368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f
@@ -1169,8 +1203,8 @@ SHA256 (rust/crates/spirv-0.2.0+1.5.4.crate) = 246bfa38fe3db3f1dfc8ca5a2cdeb7348
 SIZE (rust/crates/spirv-0.2.0+1.5.4.crate) = 30491
 SHA256 (rust/crates/sptr-0.3.2.crate) = 3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a
 SIZE (rust/crates/sptr-0.3.2.crate) = 14598
-SHA256 (rust/crates/stability-0.1.1.crate) = ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce
-SIZE (rust/crates/stability-0.1.1.crate) = 4753
+SHA256 (rust/crates/stability-0.2.0.crate) = 2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a
+SIZE (rust/crates/stability-0.2.0.crate) = 5366
 SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
 SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
 SHA256 (rust/crates/stacker-0.1.15.crate) = c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce
@@ -1183,88 +1217,88 @@ SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dc
 SIZE (rust/crates/str-buf-1.0.6.crate) = 3828
 SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731
 SIZE (rust/crates/strict-num-0.1.1.crate) = 5104
-SHA256 (rust/crates/strsim-0.11.0.crate) = 5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01
-SIZE (rust/crates/strsim-0.11.0.crate) = 13710
-SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f
-SIZE (rust/crates/strum-0.24.1.crate) = 5636
-SHA256 (rust/crates/strum-0.26.2.crate) = 5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29
-SIZE (rust/crates/strum-0.26.2.crate) = 7189
-SHA256 (rust/crates/strum_macros-0.24.3.crate) = 1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59
-SIZE (rust/crates/strum_macros-0.24.3.crate) = 20696
-SHA256 (rust/crates/strum_macros-0.26.2.crate) = c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946
-SIZE (rust/crates/strum_macros-0.26.2.crate) = 27056
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
+SHA256 (rust/crates/strum-0.26.3.crate) = 8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06
+SIZE (rust/crates/strum-0.26.3.crate) = 7237
+SHA256 (rust/crates/strum_macros-0.26.4.crate) = 4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be
+SIZE (rust/crates/strum_macros-0.26.4.crate) = 27531
+SHA256 (rust/crates/subtle-2.6.1.crate) = 13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292
+SIZE (rust/crates/subtle-2.6.1.crate) = 14562
 SHA256 (rust/crates/sum_type-0.2.0.crate) = da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15
 SIZE (rust/crates/sum_type-0.2.0.crate) = 5586
-SHA256 (rust/crates/svg_fmt-0.4.2.crate) = f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499
-SIZE (rust/crates/svg_fmt-0.4.2.crate) = 4058
+SHA256 (rust/crates/svg_fmt-0.4.3.crate) = 20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca
+SIZE (rust/crates/svg_fmt-0.4.3.crate) = 4206
 SHA256 (rust/crates/syn-0.15.44.crate) = 9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5
 SIZE (rust/crates/syn-0.15.44.crate) = 184212
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.53.crate) = 7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032
-SIZE (rust/crates/syn-2.0.53.crate) = 254828
-SHA256 (rust/crates/sync_file-0.2.7.crate) = a49b72df45d9c2d5fbb13b02c97437a3175d8c9860297297597d3ed715e0f046
-SIZE (rust/crates/sync_file-0.2.7.crate) = 8415
+SHA256 (rust/crates/syn-2.0.68.crate) = 901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9
+SIZE (rust/crates/syn-2.0.68.crate) = 265035
+SHA256 (rust/crates/sync_file-0.2.9.crate) = 9cfc24238213e42ffb35314aad7a7f5d46649c5fbba3ea95ef24f7debb95874e
+SIZE (rust/crates/sync_file-0.2.9.crate) = 8996
 SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
 SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
-SHA256 (rust/crates/system-interface-0.26.1.crate) = 0682e006dd35771e392a6623ac180999a9a854b1d4a6c12fb2e804941c2b1f58
-SIZE (rust/crates/system-interface-0.26.1.crate) = 32807
+SHA256 (rust/crates/sync_wrapper-1.0.1.crate) = a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394
+SIZE (rust/crates/sync_wrapper-1.0.1.crate) = 6939
+SHA256 (rust/crates/system-interface-0.27.2.crate) = b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6
+SIZE (rust/crates/system-interface-0.27.2.crate) = 32251
 SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
 SIZE (rust/crates/tap-1.0.1.crate) = 11316
-SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb
-SIZE (rust/crates/tar-0.4.40.crate) = 51844
+SHA256 (rust/crates/tar-0.4.41.crate) = cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909
+SIZE (rust/crates/tar-0.4.41.crate) = 51871
 SHA256 (rust/crates/target-lexicon-0.12.14.crate) = e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f
 SIZE (rust/crates/target-lexicon-0.12.14.crate) = 25508
 SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
 SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
-SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297
-SIZE (rust/crates/thiserror-1.0.58.crate) = 21025
-SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7
-SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645
+SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
+SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
+SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
+SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
-SHA256 (rust/crates/time-0.3.34.crate) = c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749
-SIZE (rust/crates/time-0.3.34.crate) = 118430
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
-SHA256 (rust/crates/time-macros-0.2.17.crate) = 7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774
-SIZE (rust/crates/time-macros-0.2.17.crate) = 24443
+SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
+SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
 SHA256 (rust/crates/timer-queue-0.1.0.crate) = 13756c29c43d836ff576221498bf4916b0d2f7ea24cd47d3531b70dc4341f038
 SIZE (rust/crates/timer-queue-0.1.0.crate) = 13344
 SHA256 (rust/crates/tiny-skia-0.8.4.crate) = df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67
 SIZE (rust/crates/tiny-skia-0.8.4.crate) = 193684
 SHA256 (rust/crates/tiny-skia-path-0.8.4.crate) = adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c
 SIZE (rust/crates/tiny-skia-path-0.8.4.crate) = 45814
-SHA256 (rust/crates/tinystr-0.7.5.crate) = 83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece
-SIZE (rust/crates/tinystr-0.7.5.crate) = 16366
+SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
+SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
 SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
-SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
-SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec-1.6.1.crate) = c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82
+SIZE (rust/crates/tinyvec-1.6.1.crate) = 46657
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.36.0.crate) = 61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931
-SIZE (rust/crates/tokio-1.36.0.crate) = 757286
-SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
-SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
-SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
-SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-1.38.0.crate) = ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a
+SIZE (rust/crates/tokio-1.38.0.crate) = 774094
+SHA256 (rust/crates/tokio-macros-2.3.0.crate) = 5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a
+SIZE (rust/crates/tokio-macros-2.3.0.crate) = 11753
+SHA256 (rust/crates/tokio-rustls-0.26.0.crate) = 0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4
+SIZE (rust/crates/tokio-rustls-0.26.0.crate) = 34253
 SHA256 (rust/crates/tokio-stream-0.1.15.crate) = 267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af
 SIZE (rust/crates/tokio-stream-0.1.15.crate) = 36284
-SHA256 (rust/crates/tokio-util-0.7.10.crate) = 5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15
-SIZE (rust/crates/tokio-util-0.7.10.crate) = 110508
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
-SHA256 (rust/crates/toml-0.8.12.crate) = e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3
-SIZE (rust/crates/toml-0.8.12.crate) = 51145
-SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
-SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml-0.8.14.crate) = 6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335
+SIZE (rust/crates/toml-0.8.14.crate) = 50645
+SHA256 (rust/crates/toml_datetime-0.6.6.crate) = 4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf
+SIZE (rust/crates/toml_datetime-0.6.6.crate) = 11698
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
-SHA256 (rust/crates/toml_edit-0.22.8.crate) = c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd
-SIZE (rust/crates/toml_edit-0.22.8.crate) = 104016
+SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
+SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/toml_edit-0.22.14.crate) = f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38
+SIZE (rust/crates/toml_edit-0.22.14.crate) = 103761
 SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
 SIZE (rust/crates/tower-0.4.13.crate) = 106906
 SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
@@ -1283,18 +1317,18 @@ SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de38400
 SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
 SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
 SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
-SHA256 (rust/crates/tracing-tracy-0.10.2.crate) = 55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e
-SIZE (rust/crates/tracing-tracy-0.10.2.crate) = 11110
-SHA256 (rust/crates/tracy-client-0.15.2.crate) = 434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608
-SIZE (rust/crates/tracy-client-0.15.2.crate) = 15739
-SHA256 (rust/crates/tracy-client-sys-0.21.2.crate) = 2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a
-SIZE (rust/crates/tracy-client-sys-0.21.2.crate) = 303387
-SHA256 (rust/crates/treeculler-0.2.0.crate) = 82449b48a3494420dd1b11081f198c542f795a036246da4a9c5845b7d7427226
-SIZE (rust/crates/treeculler-0.2.0.crate) = 4576
+SHA256 (rust/crates/tracing-tracy-0.11.0.crate) = 6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614
+SIZE (rust/crates/tracing-tracy-0.11.0.crate) = 14401
+SHA256 (rust/crates/tracy-client-0.17.0.crate) = 59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d
+SIZE (rust/crates/tracy-client-0.17.0.crate) = 20654
+SHA256 (rust/crates/tracy-client-sys-0.22.2.crate) = 9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882
+SIZE (rust/crates/tracy-client-sys-0.22.2.crate) = 308267
+SHA256 (rust/crates/treeculler-0.3.0.crate) = 131f824862e9fe73c3b01e07c3b7f71fd14377fbfe2fa3e95fc63600bc646f51
+SIZE (rust/crates/treeculler-0.3.0.crate) = 4582
 SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
 SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
-SHA256 (rust/crates/ttf-parser-0.20.0.crate) = 17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4
-SIZE (rust/crates/ttf-parser-0.20.0.crate) = 161769
+SHA256 (rust/crates/ttf-parser-0.21.1.crate) = 2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8
+SIZE (rust/crates/ttf-parser-0.21.1.crate) = 194876
 SHA256 (rust/crates/tuple_utils-0.4.0.crate) = cffaaf9392ef73cd30828797152476aaa2fa37a17856934fa63d4843f34290e9
 SIZE (rust/crates/tuple_utils-0.4.0.crate) = 2893
 SHA256 (rust/crates/twox-hash-1.6.3.crate) = 97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675
@@ -1305,10 +1339,12 @@ SHA256 (rust/crates/type-map-0.5.0.crate) = deb68604048ff8fa93347f02441e4487594a
 SIZE (rust/crates/type-map-0.5.0.crate) = 3464
 SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
 SIZE (rust/crates/typenum-1.17.0.crate) = 42849
-SHA256 (rust/crates/unic-langid-0.9.4.crate) = 238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516
-SIZE (rust/crates/unic-langid-0.9.4.crate) = 8850
-SHA256 (rust/crates/unic-langid-impl-0.9.4.crate) = 4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6
-SIZE (rust/crates/unic-langid-impl-0.9.4.crate) = 89401
+SHA256 (rust/crates/ubyte-0.10.4.crate) = f720def6ce1ee2fc44d40ac9ed6d3a59c361c80a75a7aa8e75bb9baed31cf2ea
+SIZE (rust/crates/ubyte-0.10.4.crate) = 13965
+SHA256 (rust/crates/unic-langid-0.9.5.crate) = 23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44
+SIZE (rust/crates/unic-langid-0.9.5.crate) = 8898
+SHA256 (rust/crates/unic-langid-impl-0.9.5.crate) = 0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5
+SIZE (rust/crates/unic-langid-impl-0.9.5.crate) = 89659
 SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
 SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
 SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
@@ -1317,22 +1353,22 @@ SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f
 SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
 SHA256 (rust/crates/unicode-segmentation-1.11.0.crate) = d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202
 SIZE (rust/crates/unicode-segmentation-1.11.0.crate) = 102740
-SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
-SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode-truncate-1.0.0.crate) = 5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226
+SIZE (rust/crates/unicode-truncate-1.0.0.crate) = 12017
+SHA256 (rust/crates/unicode-width-0.1.13.crate) = 0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d
+SIZE (rust/crates/unicode-width-0.1.13.crate) = 457228
 SHA256 (rust/crates/unicode-xid-0.1.0.crate) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc
 SIZE (rust/crates/unicode-xid-0.1.0.crate) = 16000
 SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
 SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
-SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
-SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
 SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
 SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
-SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
-SIZE (rust/crates/url-2.5.0.crate) = 78605
-SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
-SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
-SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
-SIZE (rust/crates/uuid-1.8.0.crate) = 44043
+SHA256 (rust/crates/url-2.5.2.crate) = 22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c
+SIZE (rust/crates/url-2.5.2.crate) = 79704
+SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
+SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
+SHA256 (rust/crates/uuid-1.9.1.crate) = 5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439
+SIZE (rust/crates/uuid-1.9.1.crate) = 47492
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
 SIZE (rust/crates/valuable-0.1.0.crate) = 27718
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
@@ -1347,18 +1383,14 @@ SHA256 (rust/crates/version-compare-0.1.1.crate) = 579a42fc0b8e0c63b76519a339be3
 SIZE (rust/crates/version-compare-0.1.1.crate) = 13224
 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/versions-5.0.1.crate) = c73a36bc44e3039f51fbee93e39f41225f6b17b380eb70cc2aab942df06b34dd
+SIZE (rust/crates/versions-5.0.1.crate) = 15850
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
 SIZE (rust/crates/want-0.3.1.crate) = 6398
-SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
-SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasi-cap-std-sync-17.0.2.crate) = a518b394ec5808ad2221646898eb1564f0db47a8f6d6dcf95059f5089d6d8f28
-SIZE (rust/crates/wasi-cap-std-sync-17.0.2.crate) = 18659
-SHA256 (rust/crates/wasi-common-17.0.2.crate) = 8fec11da24eed0ca98c3e071cf9186051b51b6436db21a7613498a9191d6f35a
-SIZE (rust/crates/wasi-common-17.0.2.crate) = 129257
 SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
 SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
 SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
@@ -1371,102 +1403,114 @@ SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a
 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
 SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
 SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
-SHA256 (rust/crates/wasm-encoder-0.38.1.crate) = 0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f
-SIZE (rust/crates/wasm-encoder-0.38.1.crate) = 48855
-SHA256 (rust/crates/wasm-encoder-0.201.0.crate) = b9c7d2731df60006819b013f64ccc2019691deccf6e11a1804bc850cd6748f1a
-SIZE (rust/crates/wasm-encoder-0.201.0.crate) = 50174
-SHA256 (rust/crates/wasmparser-0.118.2.crate) = 77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c
-SIZE (rust/crates/wasmparser-0.118.2.crate) = 183473
-SHA256 (rust/crates/wasmparser-0.121.2.crate) = 9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab
-SIZE (rust/crates/wasmparser-0.121.2.crate) = 192364
-SHA256 (rust/crates/wasmprinter-0.2.80.crate) = 60e73986a6b7fdfedb7c5bf9e7eb71135486507c8fbc4c0c42cffcb6532988b7
-SIZE (rust/crates/wasmprinter-0.2.80.crate) = 35750
-SHA256 (rust/crates/wasmtime-17.0.2.crate) = 0d9aebf4be5afc2b9d3b8aff8ce5a107440ae3174090a8720a31538e88464156
-SIZE (rust/crates/wasmtime-17.0.2.crate) = 288878
-SHA256 (rust/crates/wasmtime-asm-macros-17.0.2.crate) = d3ed1bdfec9cca409d6562fe51abc75440c85fde2dc4c5b5ad65bc0405f31475
-SIZE (rust/crates/wasmtime-asm-macros-17.0.2.crate) = 1595
-SHA256 (rust/crates/wasmtime-cache-17.0.2.crate) = 8222c4317b8bc3d8566b0e605fcf9c56d14947d86fb18e83128badd5cb90f237
-SIZE (rust/crates/wasmtime-cache-17.0.2.crate) = 26509
-SHA256 (rust/crates/wasmtime-component-macro-17.0.2.crate) = 8d185b5a280ec07edaaf8e353e83a3c7f99381ada711a2b35173e0961d32c1b6
-SIZE (rust/crates/wasmtime-component-macro-17.0.2.crate) = 16762
-SHA256 (rust/crates/wasmtime-component-util-17.0.2.crate) = 0981617835bf3e8c3f29762faedd7ade0ca0e796b51e3355a3861f0a78b5688e
-SIZE (rust/crates/wasmtime-component-util-17.0.2.crate) = 2415
-SHA256 (rust/crates/wasmtime-cranelift-17.0.2.crate) = e1f2e04e2a08c1f73fc36a8a6d0da38fbe3ff396e42c47826435239a26bf187a
-SIZE (rust/crates/wasmtime-cranelift-17.0.2.crate) = 80164
-SHA256 (rust/crates/wasmtime-cranelift-shared-17.0.2.crate) = a1e3cef89d8ed4cdf08618c303afc512305399fbfb23810a681a5a007a65feba
-SIZE (rust/crates/wasmtime-cranelift-shared-17.0.2.crate) = 13126
-SHA256 (rust/crates/wasmtime-environ-17.0.2.crate) = 099836c3583b85d16e8d1801fe793fa017e9256c5d08bd032cdab0754425be64
-SIZE (rust/crates/wasmtime-environ-17.0.2.crate) = 153556
-SHA256 (rust/crates/wasmtime-fiber-17.0.2.crate) = e19865170650ca6cdb3b1924e42e628d29d03a1766e6de71f57d879b108ee46a
-SIZE (rust/crates/wasmtime-fiber-17.0.2.crate) = 19254
-SHA256 (rust/crates/wasmtime-jit-17.0.2.crate) = cdae2c6da571b051c3c1520c9c4206a49939e855cb64c4119ab06ff08a3fc460
-SIZE (rust/crates/wasmtime-jit-17.0.2.crate) = 22587
-SHA256 (rust/crates/wasmtime-jit-debug-17.0.2.crate) = 793787308417b7ad72cfa22e54d97324d1d9810c2ecf47b8fd8263d5b122e30c
-SIZE (rust/crates/wasmtime-jit-debug-17.0.2.crate) = 5714
-SHA256 (rust/crates/wasmtime-jit-icache-coherence-17.0.2.crate) = c6d01b771888f8cc32fc491247095715c6971d70903f9a82803d707836998815
-SIZE (rust/crates/wasmtime-jit-icache-coherence-17.0.2.crate) = 5536
-SHA256 (rust/crates/wasmtime-runtime-17.0.2.crate) = b1f0f306436812a253a934444bd25230eaf33a007218a6fe92f67d3646f8dd19
-SIZE (rust/crates/wasmtime-runtime-17.0.2.crate) = 175579
-SHA256 (rust/crates/wasmtime-types-17.0.2.crate) = 158b87374f29ff040e865537674d610d970ccff28383853d1dc09b439eee7a87
-SIZE (rust/crates/wasmtime-types-17.0.2.crate) = 9396
-SHA256 (rust/crates/wasmtime-versioned-export-macros-17.0.2.crate) = e78ba3989894471c172329d42d1fc03edf2efe883fcc05a5d42f7bd5030de0ff
-SIZE (rust/crates/wasmtime-versioned-export-macros-17.0.2.crate) = 1563
-SHA256 (rust/crates/wasmtime-wasi-17.0.2.crate) = e666a7340688aa3a7ee2d4ceb4fee4c175e331ecaeb5ac5b4d45231af718cfc2
-SIZE (rust/crates/wasmtime-wasi-17.0.2.crate) = 133719
-SHA256 (rust/crates/wasmtime-winch-17.0.2.crate) = 131924cb850fd2c96e87868e101490f738e607fe0eba5ec8dc7c3b43115d8223
-SIZE (rust/crates/wasmtime-winch-17.0.2.crate) = 8116
-SHA256 (rust/crates/wasmtime-wit-bindgen-17.0.2.crate) = 81b149b61bd1402bcd5d456c616302812f8bebd65c56f720cefd86ab6cf5c8d8
-SIZE (rust/crates/wasmtime-wit-bindgen-17.0.2.crate) = 21250
-SHA256 (rust/crates/wasmtime-wmemcheck-17.0.2.crate) = e9b9a897e713f3d78ac66c751e4d34ec3a1cd100b85083a6dcf054940accde05
-SIZE (rust/crates/wasmtime-wmemcheck-17.0.2.crate) = 2782
+SHA256 (rust/crates/wasm-encoder-0.202.0.crate) = bfd106365a7f5f7aa3c1916a98cbb3ad477f5ff96ddb130285a91c6e7429e67a
+SIZE (rust/crates/wasm-encoder-0.202.0.crate) = 50182
+SHA256 (rust/crates/wasm-encoder-0.212.0.crate) = 501940df4418b8929eb6d52f1aade1fdd15a5b86c92453cb696e3c906bd3fc33
+SIZE (rust/crates/wasm-encoder-0.212.0.crate) = 59413
+SHA256 (rust/crates/wasmparser-0.202.0.crate) = d6998515d3cf3f8b980ef7c11b29a9b1017d4cf86b99ae93b546992df9931413
+SIZE (rust/crates/wasmparser-0.202.0.crate) = 193217
+SHA256 (rust/crates/wasmprinter-0.202.0.crate) = ab1cc9508685eef9502e787f4d4123745f5651a1e29aec047645d3cac1e2da7a
+SIZE (rust/crates/wasmprinter-0.202.0.crate) = 36575
+SHA256 (rust/crates/wasmtime-20.0.2.crate) = 4af5cb32045daee8476711eb12b8b71275c2dd1fc7a58cc2a11b33ce9205f6a2
+SIZE (rust/crates/wasmtime-20.0.2.crate) = 366396
+SHA256 (rust/crates/wasmtime-asm-macros-20.0.2.crate) = 7515c4d24c8b55c0feab67e3d52a42f999fda8b9cfafbd69a82ed6bcf299d26e
+SIZE (rust/crates/wasmtime-asm-macros-20.0.2.crate) = 1599
+SHA256 (rust/crates/wasmtime-cache-20.0.2.crate) = c3aa2de7189ea6b3270727d0027790494aec5e7101ca50da3f9549a86628cae4
+SIZE (rust/crates/wasmtime-cache-20.0.2.crate) = 26466
+SHA256 (rust/crates/wasmtime-component-macro-20.0.2.crate) = 794839a710a39a12677c67ff43fec54ef00d0ca6c6f631209a7c5524522221d3
+SIZE (rust/crates/wasmtime-component-macro-20.0.2.crate) = 17839
+SHA256 (rust/crates/wasmtime-component-util-20.0.2.crate) = 7839a1b9e15d17be1cb2a105f18be8e0bbf52bdec7a7cd6eb5d80d4c2cdf74f0
+SIZE (rust/crates/wasmtime-component-util-20.0.2.crate) = 2420
+SHA256 (rust/crates/wasmtime-cranelift-20.0.2.crate) = 57ec2d9a4b9990bea53a5dfd689d48663dbd19a46903eaf73e2022b3d1ef20d3
+SIZE (rust/crates/wasmtime-cranelift-20.0.2.crate) = 99804
+SHA256 (rust/crates/wasmtime-environ-20.0.2.crate) = ad72e2e3f7ea5b50fedf66dd36ba24634e4f445c370644683b433d45d88f6126
+SIZE (rust/crates/wasmtime-environ-20.0.2.crate) = 163361
+SHA256 (rust/crates/wasmtime-fiber-20.0.2.crate) = 4dbdf3053e7e7ced0cd4ed76579995b62169a1a43696890584eae2de2e33bf54
+SIZE (rust/crates/wasmtime-fiber-20.0.2.crate) = 19253
+SHA256 (rust/crates/wasmtime-jit-debug-20.0.2.crate) = 983ca409f2cd66385ce49486c022da0128acb7910c055beb5230998b49c6084c
+SIZE (rust/crates/wasmtime-jit-debug-20.0.2.crate) = 5715
+SHA256 (rust/crates/wasmtime-jit-icache-coherence-20.0.2.crate) = ede45379f3b4d395d8947006de8043801806099a240a26db553919b68e96ab15
+SIZE (rust/crates/wasmtime-jit-icache-coherence-20.0.2.crate) = 5542
+SHA256 (rust/crates/wasmtime-runtime-20.0.2.crate) = 65019d29d175c567b84173f2adf3b7a3af6d5592f8fe510dccae55d2569ec0d2
+SIZE (rust/crates/wasmtime-runtime-20.0.2.crate) = 201547
+SHA256 (rust/crates/wasmtime-slab-20.0.2.crate) = ca6585868f5c427c3e9d2a8c0c3354e6d7d4518a0d17723ab25a0c1eebf5d5b4
+SIZE (rust/crates/wasmtime-slab-20.0.2.crate) = 5046
+SHA256 (rust/crates/wasmtime-types-20.0.2.crate) = 84d5381ff174faded38c7b2085fbe430dff59489c87a91403354d710075750fb
+SIZE (rust/crates/wasmtime-types-20.0.2.crate) = 10895
+SHA256 (rust/crates/wasmtime-versioned-export-macros-20.0.2.crate) = 0d3b70422fdfa915c903f003b8b42554a8ae1aa0c6208429d8314ebf5721f3ac
+SIZE (rust/crates/wasmtime-versioned-export-macros-20.0.2.crate) = 1567
+SHA256 (rust/crates/wasmtime-wasi-20.0.2.crate) = 08dd00241969c3be8c5dfdedbb8d9c5af6783e514ffbf8f7522036561bd1337a
+SIZE (rust/crates/wasmtime-wasi-20.0.2.crate) = 146755
+SHA256 (rust/crates/wasmtime-winch-20.0.2.crate) = 996360967b5196dec20ddcfce499ce4dc80cc925c088b0f2b376d29b96833a6a
+SIZE (rust/crates/wasmtime-winch-20.0.2.crate) = 8491
+SHA256 (rust/crates/wasmtime-wit-bindgen-20.0.2.crate) = 01840c0cfbbb01664c796e3f4edbd656e58f9d76db083c7e7c6bba59ea657a96
+SIZE (rust/crates/wasmtime-wit-bindgen-20.0.2.crate) = 21881
 SHA256 (rust/crates/wast-35.0.2.crate) = 2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68
 SIZE (rust/crates/wast-35.0.2.crate) = 90940
-SHA256 (rust/crates/wast-201.0.0.crate) = 1ef6e1ef34d7da3e2b374fd2b1a9c0227aff6cad596e1b24df9b58d0f6222faa
-SIZE (rust/crates/wast-201.0.0.crate) = 134183
-SHA256 (rust/crates/wat-1.201.0.crate) = 453d5b37a45b98dee4f4cb68015fc73634d7883bbef1c65e6e9c78d454cf3f32
-SIZE (rust/crates/wat-1.201.0.crate) = 9811
+SHA256 (rust/crates/wast-212.0.0.crate) = 4606a05fb0aae5d11dd7d8280a640d88a63ee019360ba9be552da3d294b8d1f5
+SIZE (rust/crates/wast-212.0.0.crate) = 145035
+SHA256 (rust/crates/wat-1.212.0.crate) = c74ca7f93f11a5d6eed8499f2a8daaad6e225cab0151bc25a091fff3b987532f
+SIZE (rust/crates/wat-1.212.0.crate) = 10630
 SHA256 (rust/crates/wavefront-0.2.3.crate) = 0162190f32ea78b07b7bc02b57a1c2a7c0874bc3da34f36eba41c86c4b03c4fb
 SIZE (rust/crates/wavefront-0.2.3.crate) = 13984
+SHA256 (rust/crates/wayland-backend-0.3.4.crate) = 34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07
+SIZE (rust/crates/wayland-backend-0.3.4.crate) = 70797
 SHA256 (rust/crates/wayland-client-0.29.5.crate) = 3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715
 SIZE (rust/crates/wayland-client-0.29.5.crate) = 71041
+SHA256 (rust/crates/wayland-client-0.31.3.crate) = 1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133
+SIZE (rust/crates/wayland-client-0.31.3.crate) = 63081
 SHA256 (rust/crates/wayland-commons-0.29.5.crate) = 8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902
 SIZE (rust/crates/wayland-commons-0.29.5.crate) = 20771
+SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
+SIZE (rust/crates/wayland-csd-frame-0.3.0.crate) = 5696
 SHA256 (rust/crates/wayland-cursor-0.29.5.crate) = 6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661
 SIZE (rust/crates/wayland-cursor-0.29.5.crate) = 6195
+SHA256 (rust/crates/wayland-cursor-0.31.3.crate) = a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9
+SIZE (rust/crates/wayland-cursor-0.31.3.crate) = 7520
 SHA256 (rust/crates/wayland-protocols-0.29.5.crate) = b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6
 SIZE (rust/crates/wayland-protocols-0.29.5.crate) = 140859
+SHA256 (rust/crates/wayland-protocols-0.31.2.crate) = 8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4
+SIZE (rust/crates/wayland-protocols-0.31.2.crate) = 147062
+SHA256 (rust/crates/wayland-protocols-wlr-0.2.0.crate) = ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6
+SIZE (rust/crates/wayland-protocols-wlr-0.2.0.crate) = 25804
 SHA256 (rust/crates/wayland-scanner-0.29.5.crate) = 8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53
 SIZE (rust/crates/wayland-scanner-0.29.5.crate) = 17248
+SHA256 (rust/crates/wayland-scanner-0.31.2.crate) = 67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565
+SIZE (rust/crates/wayland-scanner-0.31.2.crate) = 35644
 SHA256 (rust/crates/wayland-sys-0.29.5.crate) = be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4
 SIZE (rust/crates/wayland-sys-0.29.5.crate) = 7926
+SHA256 (rust/crates/wayland-sys-0.31.2.crate) = 105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12
+SIZE (rust/crates/wayland-sys-0.31.2.crate) = 8571
 SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
 SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/webpki-roots-0.26.3.crate) = bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd
+SIZE (rust/crates/webpki-roots-0.26.3.crate) = 248438
 SHA256 (rust/crates/wfd-0.1.7.crate) = e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8
 SIZE (rust/crates/wfd-0.1.7.crate) = 8825
 SHA256 (rust/crates/wgpu-profiler-0.15.0.crate) = cbdc78911971a06b86a57a9a8e1c861fbc90c62dcbc96bff0b2831c1e853b7bd
 SIZE (rust/crates/wgpu-profiler-0.15.0.crate) = 37833
 SHA256 (rust/crates/which-4.4.2.crate) = 87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7
 SIZE (rust/crates/which-4.4.2.crate) = 15953
-SHA256 (rust/crates/widestring-1.0.2.crate) = 653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8
-SIZE (rust/crates/widestring-1.0.2.crate) = 79706
-SHA256 (rust/crates/wiggle-17.0.2.crate) = a5530d063ee9ccb1d503fed91e3d509419f43733a05fcc99c9f7aa3482703189
-SIZE (rust/crates/wiggle-17.0.2.crate) = 23262
-SHA256 (rust/crates/wiggle-generate-17.0.2.crate) = ea274a806c3eeef5008d32881a999065591c646f0f889ca07fd1223f54378e8b
-SIZE (rust/crates/wiggle-generate-17.0.2.crate) = 23499
-SHA256 (rust/crates/wiggle-macro-17.0.2.crate) = 505e4f6b7b46e693e0027f650956b662de0fcedfc3a2506ce6a4f9f08281791c
-SIZE (rust/crates/wiggle-macro-17.0.2.crate) = 8178
+SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
+SIZE (rust/crates/widestring-1.1.0.crate) = 85046
+SHA256 (rust/crates/wiggle-20.0.2.crate) = f93fc3510978a905f931d74784ed8685bd6453e18ad8f92809e793d48827e3cd
+SIZE (rust/crates/wiggle-20.0.2.crate) = 21853
+SHA256 (rust/crates/wiggle-generate-20.0.2.crate) = 4ec3909e70f36066526ad3b2abb4855ab836f8a6b293449582563ac50d651083
+SIZE (rust/crates/wiggle-generate-20.0.2.crate) = 23453
+SHA256 (rust/crates/wiggle-macro-20.0.2.crate) = b4c31124572ab16401c491c0d4fb5fe5d17dab65fcfcc56d7d8efb1c1e56a3db
+SIZE (rust/crates/wiggle-macro-20.0.2.crate) = 8181
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
-SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
-SHA256 (rust/crates/winapi-wsapoll-0.1.1.crate) = 44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e
-SIZE (rust/crates/winapi-wsapoll-0.1.1.crate) = 2881
+SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
+SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
+SHA256 (rust/crates/winapi-wsapoll-0.1.2.crate) = 1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28
+SIZE (rust/crates/winapi-wsapoll-0.1.2.crate) = 2865
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/winch-codegen-0.15.2.crate) = f114f3f980c00f13ee164e431e3abac9cd20b10853849fa6b030d3e4d6be307a
-SIZE (rust/crates/winch-codegen-0.15.2.crate) = 85960
+SHA256 (rust/crates/winch-codegen-0.18.2.crate) = cefeb84a0f39227cf2eb665cf348e6150ebf3372d08adff03264064ab590fdf4
+SIZE (rust/crates/winch-codegen-0.18.2.crate) = 99548
 SHA256 (rust/crates/window_clipboard-0.3.0.crate) = 63287c9c4396ccf5346d035a9b0fcaead9e18377637f5eaa78b7ac65c873ff7d
 SIZE (rust/crates/window_clipboard-0.3.0.crate) = 13447
 SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
@@ -1481,8 +1525,8 @@ SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838c
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
 SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65
 SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
-SHA256 (rust/crates/windows-result-0.1.0.crate) = cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64
-SIZE (rust/crates/windows-result-0.1.0.crate) = 10486
+SHA256 (rust/crates/windows-result-0.1.2.crate) = 5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8
+SIZE (rust/crates/windows-result-0.1.2.crate) = 10601
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -1493,56 +1537,58 @@ SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb36932
 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
 SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
 SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
-SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
 SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
 SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
 SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
-SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
 SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
 SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
 SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
 SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
-SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
 SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
 SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
 SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
 SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
-SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
 SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
 SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
 SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
 SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
-SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
 SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
 SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
 SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
 SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
-SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
 SHA256 (rust/crates/winit-0.28.7.crate) = 9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94
 SIZE (rust/crates/winit-0.28.7.crate) = 407921
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (rust/crates/winnow-0.6.5.crate) = dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8
-SIZE (rust/crates/winnow-0.6.5.crate) = 159316
+SHA256 (rust/crates/winnow-0.6.13.crate) = 59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1
+SIZE (rust/crates/winnow-0.6.13.crate) = 162649
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
 SHA256 (rust/crates/winreg-0.52.0.crate) = a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5
@@ -1551,8 +1597,8 @@ SHA256 (rust/crates/winres-0.1.12.crate) = b68db261ef59e9e52806f688020631e987592
 SIZE (rust/crates/winres-0.1.12.crate) = 19772
 SHA256 (rust/crates/winx-0.36.3.crate) = f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346
 SIZE (rust/crates/winx-0.36.3.crate) = 13696
-SHA256 (rust/crates/wit-parser-0.13.2.crate) = 316b36a9f0005f5aa4b03c39bc3728d045df136f8c13a73b7db4510dec725e08
-SIZE (rust/crates/wit-parser-0.13.2.crate) = 82051
+SHA256 (rust/crates/wit-parser-0.202.0.crate) = 744237b488352f4f27bca05a10acb79474415951c450e52ebd0da784c1df2bcc
+SIZE (rust/crates/wit-parser-0.202.0.crate) = 102081
 SHA256 (rust/crates/witx-0.9.1.crate) = e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b
 SIZE (rust/crates/witx-0.9.1.crate) = 45928
 SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
@@ -1563,16 +1609,16 @@ SHA256 (rust/crates/x11-dl-2.21.0.crate) = 38735924fedd5314a6e548792904ed8c6de66
 SIZE (rust/crates/x11-dl-2.21.0.crate) = 66823
 SHA256 (rust/crates/x11rb-0.10.1.crate) = 592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507
 SIZE (rust/crates/x11rb-0.10.1.crate) = 207678
-SHA256 (rust/crates/x11rb-0.13.0.crate) = f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a
-SIZE (rust/crates/x11rb-0.13.0.crate) = 222396
+SHA256 (rust/crates/x11rb-0.13.1.crate) = 5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12
+SIZE (rust/crates/x11rb-0.13.1.crate) = 223916
 SHA256 (rust/crates/x11rb-protocol-0.10.0.crate) = 56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67
 SIZE (rust/crates/x11rb-protocol-0.10.0.crate) = 419025
-SHA256 (rust/crates/x11rb-protocol-0.13.0.crate) = e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34
-SIZE (rust/crates/x11rb-protocol-0.13.0.crate) = 507838
+SHA256 (rust/crates/x11rb-protocol-0.13.1.crate) = ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d
+SIZE (rust/crates/x11rb-protocol-0.13.1.crate) = 508522
 SHA256 (rust/crates/xattr-1.3.1.crate) = 8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f
 SIZE (rust/crates/xattr-1.3.1.crate) = 12580
-SHA256 (rust/crates/xcb-1.3.0.crate) = 5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262
-SIZE (rust/crates/xcb-1.3.0.crate) = 205816
+SHA256 (rust/crates/xcb-1.4.0.crate) = 02e75181b5a62b6eeaa72f303d3cef7dbb841e22885bf6d3e66fe23e88c55dc6
+SIZE (rust/crates/xcb-1.4.0.crate) = 208769
 SHA256 (rust/crates/xcursor-0.3.5.crate) = 6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911
 SIZE (rust/crates/xcursor-0.3.5.crate) = 6256
 SHA256 (rust/crates/xdg-2.5.2.crate) = 213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546
@@ -1581,39 +1627,47 @@ SHA256 (rust/crates/xi-unicode-0.3.0.crate) = a67300977d3dc3f8034dae89778f502b6b
 SIZE (rust/crates/xi-unicode-0.3.0.crate) = 87001
 SHA256 (rust/crates/xkbcommon-0.5.1.crate) = 52db25b599e92bf6e3904134618728eeb7b49a5a4f38f107f92399bb9c496b88
 SIZE (rust/crates/xkbcommon-0.5.1.crate) = 58659
-SHA256 (rust/crates/xml-rs-0.8.19.crate) = 0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a
-SIZE (rust/crates/xml-rs-0.8.19.crate) = 54051
+SHA256 (rust/crates/xkeysym-0.2.1.crate) = b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56
+SIZE (rust/crates/xkeysym-0.2.1.crate) = 103129
+SHA256 (rust/crates/xml-rs-0.8.20.crate) = 791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193
+SIZE (rust/crates/xml-rs-0.8.20.crate) = 54443
 SHA256 (rust/crates/xmlparser-0.13.6.crate) = 66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4
 SIZE (rust/crates/xmlparser-0.13.6.crate) = 26718
 SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
 SIZE (rust/crates/yasna-0.5.2.crate) = 34859
-SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
-SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
-SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
-SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
-SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4
-SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987
-SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db
-SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273
-SHA256 (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656
-SIZE (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 728791
+SHA256 (rust/crates/zerocopy-0.7.34.crate) = ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087
+SIZE (rust/crates/zerocopy-0.7.34.crate) = 151177
+SHA256 (rust/crates/zerocopy-derive-0.7.34.crate) = 15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b
+SIZE (rust/crates/zerocopy-derive-0.7.34.crate) = 37907
+SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
+SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
+SHA256 (rust/crates/zstd-0.13.1.crate) = 2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a
+SIZE (rust/crates/zstd-0.13.1.crate) = 29805
+SHA256 (rust/crates/zstd-safe-7.1.0.crate) = 1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a
+SIZE (rust/crates/zstd-safe-7.1.0.crate) = 20792
+SHA256 (rust/crates/zstd-sys-2.0.11+zstd.1.5.6.crate) = 75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4
+SIZE (rust/crates/zstd-sys-2.0.11+zstd.1.5.6.crate) = 749078
+SHA256 (rust/crates/zune-core-0.4.12.crate) = 3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a
+SIZE (rust/crates/zune-core-0.4.12.crate) = 17355
+SHA256 (rust/crates/zune-jpeg-0.4.11.crate) = ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448
+SIZE (rust/crates/zune-jpeg-0.4.11.crate) = 61815
 SHA256 (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = cc8baf32868d7c0d52a8c9dea7beaf5f3226433147a63e3a118a3cd710109263
 SIZE (Imbris-keyboard-keynames-veloren-winit-0.28_GL0.tar.gz) = 4886
 SHA256 (Imberflur-wgpu-0.18-with-fixes-for-veloren-v1_GH0.tar.gz) = 49f1c4f4ea15c542b335c350319ce474660d6385d57cbcc8691bc1f53d564fd1
 SIZE (Imberflur-wgpu-0.18-with-fixes-for-veloren-v1_GH0.tar.gz) = 9994365
-SHA256 (amethyst-shred-5d52c6fc390dd04c12158633e77591f6523d1f85_GH0.tar.gz) = 099a29969d304d885e65316c34099b24100b8ec47dab5526af7326e550e79457
-SIZE (amethyst-shred-5d52c6fc390dd04c12158633e77591f6523d1f85_GH0.tar.gz) = 56424
+SHA256 (amethyst-specs-4e2da1df29ee840baa9b936593c45592b7c9ae27_GH0.tar.gz) = 0f7a525f61a575d212ecab1860af9166b6453a5ad5f44c5c7bcdcd4a353f6ff9
+SIZE (amethyst-specs-4e2da1df29ee840baa9b936593c45592b7c9ae27_GH0.tar.gz) = 142942
 SHA256 (hasenbanck-egui_wgpu_backend-34691d4e9149deb9cd0bb8cbb5a56bffebf47588_GH0.tar.gz) = 0e60138671e406a80cb19a1995681b1defcfc233353d9833d6c4cd1234c9ffd8
 SIZE (hasenbanck-egui_wgpu_backend-34691d4e9149deb9cd0bb8cbb5a56bffebf47588_GH0.tar.gz) = 13179
-SHA256 (veloren-auth-abb1a705827984e11706d7bb97fb7a459e1e6533_GL0.tar.gz) = ee7720109d4783ca16ddf1e68a5a78425b320cfc1dd18cbf5522f87053fae0fa
-SIZE (veloren-auth-abb1a705827984e11706d7bb97fb7a459e1e6533_GL0.tar.gz) = 34415
 SHA256 (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = b1666caeb396b844788a732346e8ab6e555190978efe7a6386469040959acebf
 SIZE (juliancoffee-fluent-rs-929cf9512de121cce9b4cbf1cb860cd3294a1cd9_GH0.tar.gz) = 351345
+SHA256 (veloren-auth-ae0e16783a9f9041951296885f082308e155db79_GL0.tar.gz) = 57381d975997e4a0b81e33a7658f87b5b3153097e82adfbf34fd8e47006f2056
+SIZE (veloren-auth-ae0e16783a9f9041951296885f082308e155db79_GL0.tar.gz) = 35502
 SHA256 (veloren-conrod-59fddc617696e68d28a75c2137a08c2572efb986_GL0.tar.gz) = a71e234ebe79beb46beee4981fbb7b2f165a3d41a043faf80248f5e7083577fa
 SIZE (veloren-conrod-59fddc617696e68d28a75c2137a08c2572efb986_GL0.tar.gz) = 808456
 SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4ad9e752a27e019276f9275abdabdea1b7fba51036
 SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634
 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f
 SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210
-SHA256 (veloren-v0.16.0-130-g0b9c2621f.tar.bz2) = 63741cf10c10a0428eb5f3f15b5bfda840338ed26ea2cdb21d4bbd09bb4913e7
-SIZE (veloren-v0.16.0-130-g0b9c2621f.tar.bz2) = 299936779
+SHA256 (veloren-v0.16.0-306-ga3ef7ddf9.tar.bz2) = b8d4871934030840ac74a827f04a723c8bf5165d72ac6fde038852007051aaa6
+SIZE (veloren-v0.16.0-306-ga3ef7ddf9.tar.bz2) = 299991582
diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs
index 1a01e3399772..b9a51cdd3f58 100644
--- a/games/veloren-weekly/files/patch-gilrs
+++ b/games/veloren-weekly/files/patch-gilrs
@@ -23,28 +23,41 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
    |                |      help: a similar name exists in the module: `event`
    |                no `epoll` in `sys`
 
---- Cargo.lock.orig	2024-04-03 20:23:33 UTC
+--- Cargo.lock.orig	2024-05-20 18:26:00 UTC
 +++ Cargo.lock
-@@ -2484,9 +2484,9 @@ name = "gilrs"
+@@ -851,12 +851,6 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce795
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+-
+-[[package]]
+-name = "cfg_aliases"
+-version = "0.2.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+ 
+ [[package]]
+ name = "chrono"
+@@ -2566,9 +2560,9 @@ name = "gilrs"
  
  [[package]]
  name = "gilrs"
--version = "0.10.6"
+-version = "0.10.7"
 +version = "0.10.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "499067aa54af19f88732dc418f61f23d5912de1518665bb0eca034ca0d07574c"
+-checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c"
 +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a"
  dependencies = [
   "fnv",
   "gilrs-core",
-@@ -2498,24 +2498,23 @@ name = "gilrs-core"
+@@ -2580,24 +2574,23 @@ name = "gilrs-core"
  
  [[package]]
  name = "gilrs-core"
--version = "0.5.11"
+-version = "0.5.12"
 +version = "0.5.7"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e"
+-checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6"
 +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d"
  dependencies = [
   "core-foundation",
@@ -54,19 +67,19 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "libc",
   "libudev-sys",
   "log",
-- "nix 0.28.0",
+- "nix 0.29.0",
 + "nix 0.26.4",
   "serde",
   "uuid",
   "vec_map",
   "wasm-bindgen",
   "web-sys",
-- "windows 0.54.0",
+- "windows 0.57.0",
 + "windows 0.51.1",
  ]
  
  [[package]]
-@@ -3151,17 +3150,6 @@ dependencies = [
+@@ -3253,17 +3246,6 @@ dependencies = [
  ]
  
  [[package]]
@@ -84,7 +97,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  name = "inotify-sys"
  version = "0.1.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -3212,9 +3200,9 @@ name = "io-kit-sys"
+@@ -3314,9 +3296,9 @@ name = "io-kit-sys"
  
  [[package]]
  name = "io-kit-sys"
@@ -96,25 +109,39 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
  dependencies = [
   "core-foundation-sys",
   "mach2",
-@@ -3971,6 +3959,17 @@ name = "nix"
+@@ -4120,25 +4102,24 @@ name = "nix"
  
  [[package]]
  name = "nix"
+-version = "0.28.0"
 +version = "0.26.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-+dependencies = [
+ dependencies = [
+- "bitflags 2.6.0",
 + "bitflags 1.3.2",
-+ "cfg-if 1.0.0",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "nix"
- version = "0.28.0"
+  "cfg-if 1.0.0",
+- "cfg_aliases 0.1.1",
+  "libc",
+ ]
+ 
+ [[package]]
+ name = "nix"
+-version = "0.29.0"
++version = "0.28.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-@@ -4017,7 +4016,7 @@ dependencies = [
+-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
++checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+ dependencies = [
+  "bitflags 2.6.0",
+  "cfg-if 1.0.0",
+- "cfg_aliases 0.2.1",
++ "cfg_aliases",
+  "libc",
+ ]
+ 
+@@ -4179,7 +4160,7 @@ dependencies = [
   "crossbeam-channel",
   "filetime",
   "fsevent-sys",
@@ -123,15 +150,84 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd`
   "kqueue",
   "libc",
   "log",
-@@ -6618,7 +6617,7 @@ dependencies = [
+@@ -6840,7 +6821,7 @@ dependencies = [
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
  dependencies = [
 - "cfg-if 1.0.0",
 + "cfg-if 0.1.10",
-  "rand 0.8.5",
+  "rand",
   "static_assertions",
  ]
+@@ -8563,16 +8544,6 @@ dependencies = [
+ checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+ dependencies = [
+  "windows-core 0.54.0",
+- "windows-targets 0.52.5",
+-]
+-
+-[[package]]
+-name = "windows"
+-version = "0.57.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+-dependencies = [
+- "windows-core 0.57.0",
+  "windows-targets 0.52.5",
+ ]
+ 
+@@ -8600,42 +8571,8 @@ dependencies = [
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+ dependencies = [
+- "windows-result",
+- "windows-targets 0.52.5",
+-]
+-
+-[[package]]
+-name = "windows-core"
+-version = "0.57.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+-dependencies = [
+- "windows-implement",
+- "windows-interface",
+  "windows-result",
+  "windows-targets 0.52.5",
+-]
+-
+-[[package]]
+-name = "windows-implement"
+-version = "0.57.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+-dependencies = [
+- "proc-macro2 1.0.86",
+- "quote 1.0.36",
+- "syn 2.0.68",
+-]
+-
+-[[package]]
+-name = "windows-interface"
+-version = "0.57.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+-dependencies = [
+- "proc-macro2 1.0.86",
+- "quote 1.0.36",
+- "syn 2.0.68",
+ ]
+ 
+ [[package]]
+@@ -8860,7 +8797,7 @@ dependencies = [
+ dependencies = [
+  "android-activity",
+  "bitflags 1.3.2",
+- "cfg_aliases 0.1.1",
++ "cfg_aliases",
+  "core-foundation",
+  "core-graphics 0.22.3",
+  "dispatch",
 --- cargo-crates/gilrs-0.10.2/examples/ev.rs.orig	1970-01-01 00:00:00 UTC
 +++ cargo-crates/gilrs-0.10.2/examples/ev.rs
 @@ -9,6 +9,8 @@ use std::process;
diff --git a/games/veloren-weekly/files/patch-keyboard-keynames b/games/veloren-weekly/files/patch-keyboard-keynames
new file mode 100644
index 000000000000..10f126ce6f72
--- /dev/null
+++ b/games/veloren-weekly/files/patch-keyboard-keynames
@@ -0,0 +1,41 @@
+Assume X11/Wayland key names on every Unix-like system
+
+--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml.orig	2023-08-23 04:01:46 UTC
++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/Cargo.toml
+@@ -18,7 +18,7 @@ winapi = { version = "0.3.9", features = ["winuser"] }
+ [target.'cfg(windows)'.dependencies]
+ winapi = { version = "0.3.9", features = ["winuser"] }
+ 
+-[target.'cfg(target_os = "linux")'.dependencies]
++[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
+ xkbcommon = { version = "0.5", features = ["x11", "wayland"] }
+ xcb = { version = "1", features = ["as-raw-xcb-connection"] }
+ wayland-client = "0.29"
+--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs.orig	2023-08-23 04:01:46 UTC
++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/mod.rs
+@@ -1,5 +1,5 @@
+ //! The KeyLayout struct and supporting elements
+-#[cfg(target_os = "linux")]
++#[cfg(all(unix, not(target_os = "macos")))]
+ #[path = "unix/mod.rs"]
+ mod platform;
+ 
+@@ -7,7 +7,7 @@ mod platform;
+ #[path = "windows/mod.rs"]
+ mod platform;
+ 
+-#[cfg(not(any(target_os = "windows", target_os = "linux")))]
++#[cfg(target_os = "macos")]
+ #[path = "other/mod.rs"]
+ mod platform;
+ 
+--- ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs.orig	2023-08-23 04:01:46 UTC
++++ ../keyboard-keynames-veloren-winit-0.28-fca4bbdfa51bf054b155a455935b3792975c989d/src/platform/unix/key_layout.rs
+@@ -220,7 +220,6 @@ impl KeyLayout {
+ }
+ 
+ /// Methods for KeyLayout specific to Unix-based systems
+-#[cfg(target_os = "linux")]
+ pub trait KeyLayoutExtUnix {
+     /// Construct a KeyLayout explicitly using the Wayland protocol
+     fn new_wayland() -> Result<KeyLayout, KeyLayoutError>;
diff --git a/games/veloren-weekly/files/patch-rust-1.75.0 b/games/veloren-weekly/files/patch-rust-1.75.0
deleted file mode 100644
index e1c77e436da4..000000000000
--- a/games/veloren-weekly/files/patch-rust-1.75.0
+++ /dev/null
@@ -1,28 +0,0 @@
-Drop after lang/rust >= 1.76 update
-
-error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
-   --> rtsim/src/ai/mod.rs:114:16
-    |
-114 |         match (other as &dyn Any).downcast_ref::<Self>() {
-    |                ^^^^^
-    |
-error[E0658]: cannot cast `dyn ai::Action<S, R>` to `dyn std::any::Any`, trait upcasting coercion is experimental
-   --> rtsim/src/ai/mod.rs:339:16
-    |
-339 |         match (other as &dyn Any).downcast_ref::<Self>() {
-    |                ^^^^^
-    |
-    = note: see issue #65991 <https://github.com/rust-lang/rust/issues/65991> for more information
-    = help: add `#![feature(trait_upcasting)]` to the crate attributes to enable
-    = note: required when coercing `&(dyn ai::Action<S, R> + 'static)` into `&(dyn std::any::Any + 'static)`
-
---- rtsim/src/lib.rs.orig	2024-02-07 19:13:27 UTC
-+++ rtsim/src/lib.rs
-@@ -2,6 +2,7 @@
-     never_type,
-     try_blocks,
-     trait_alias,
-+    trait_upcasting,
-     control_flow_enum,
-     let_chains,
-     binary_heap_drain_sorted,
diff --git a/games/veloren-weekly/files/patch-rust-1.77.0 b/games/veloren-weekly/files/patch-rust-1.77.0
new file mode 100644
index 000000000000..d06c478abc10
--- /dev/null
+++ b/games/veloren-weekly/files/patch-rust-1.77.0
@@ -0,0 +1,176 @@
+Drop after lang/rust >= 1.78 update
+
+error[E0425]: cannot find function `simd_fma` in module `std::intrinsics::simd`
+    --> cargo-crates/vek-0.17.0/src/vec.rs:720:66
+     |
+720  |                     simd_llvm => unsafe { std::intrinsics::simd::simd_fma(self, mul, add) },
+     |                                                                  ^^^^^^^^ help: a function with a similar name exists: `simd_fmax
+
+error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr`
+   --> cargo-crates/shred-0.16.1/src/meta.rs:402:38
+    |
+402 |         let invalid_ptr = core::ptr::without_provenance_mut::<R>((self as *mut Self).addr());
+    |                                      ^^^^^^^^^^^^^^^^^^^^^^ not found in `core::ptr`
+
+--- Cargo.lock.orig	2024-05-29 15:52:55 UTC
++++ Cargo.lock
+@@ -6819,12 +6819,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "treeculler"
+-version = "0.4.0"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c11fcf82651ce9a4550c82beb88a38951fdde004917817eba244359720d74c06"
++checksum = "131f824862e9fe73c3b01e07c3b7f71fd14377fbfe2fa3e95fc63600bc646f51"
+ dependencies = [
+  "num-traits",
+- "vek 0.17.0",
++ "vek 0.16.1",
+ ]
+ 
+ [[package]]
+@@ -7010,9 +7010,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "vek"
+-version = "0.17.0"
++version = "0.16.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
++checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157"
+ dependencies = [
+  "approx 0.5.1",
+  "num-integer",
+@@ -7042,7 +7042,7 @@ dependencies = [
+  "specs",
+  "tokio",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-client-i18n",
+  "veloren-common",
+  "veloren-common-base",
+@@ -7113,7 +7113,7 @@ dependencies = [
+  "tracing",
+  "tracing-subscriber",
+  "uuid",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common-assets",
+  "veloren-common-base",
+  "veloren-common-i18n",
+@@ -7198,7 +7198,7 @@ dependencies = [
+  "specs",
+  "sum_type",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+ ]
+ 
+@@ -7222,7 +7222,7 @@ dependencies = [
+  "timer-queue",
+  "toml 0.8.13",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-assets",
+  "veloren-common-base",
+@@ -7242,7 +7242,7 @@ dependencies = [
+  "rayon",
+  "specs",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-ecs",
+@@ -7326,7 +7326,7 @@ dependencies = [
+  "serde",
+  "slotmap",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-world",
+ ]
+@@ -7369,7 +7369,7 @@ dependencies = [
+  "strum 0.24.1",
+  "tokio",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-ecs",
+@@ -7392,7 +7392,7 @@ dependencies = [
+  "rand 0.8.5",
+  "specs",
+  "tracing",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-dynlib",
+@@ -7489,7 +7489,7 @@ dependencies = [
+  "tokio",
+  "tracing",
+  "treeculler",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-client",
+  "veloren-client-i18n",
+  "veloren-common",
+@@ -7517,7 +7517,7 @@ version = "0.10.0"
+ dependencies = [
+  "bytemuck",
+  "lazy_static",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-dynlib",
+ ]
+@@ -7585,7 +7585,7 @@ dependencies = [
+  "svg_fmt",
+  "tracing",
+  "tracing-subscriber",
+- "vek 0.17.0",
++ "vek 0.16.1",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-dynlib",
+--- Cargo.toml.orig	2024-06-26 12:12:15 UTC
++++ Cargo.toml
+@@ -149,7 +149,7 @@ num-traits = { version = "0.2" }
+ ordered-float = { version = "4.2", default-features = true }
+ num = { version = "0.4" }
+ num-traits = { version = "0.2" }
+-vek = { version = "0.17.0", features = ["serde"] }
++vek = { version = "0.16.1", features = ["serde"] }
+ itertools = { version = "0.13" }
+ 
+ serde = { version = "1.0.118", features = ["derive"] }
+--- cargo-crates/shred-0.16.1/src/meta.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/shred-0.16.1/src/meta.rs
+@@ -399,7 +399,7 @@ impl<T: ?Sized> MetaTable<T> {
+     {
+         let ty_id = TypeId::of::<R>();
+         // use self.addr() for unpredictable address to use for checking consistency below
+-        let invalid_ptr = core::ptr::without_provenance_mut::<R>((self as *mut Self).addr());
++        let invalid_ptr = core::ptr::invalid_mut::<R>((self as *mut Self).addr());
+         let trait_ptr = <T as CastFrom<R>>::cast(invalid_ptr);
+         // assert that address not changed (to catch some mistakes in CastFrom impl)
+         assert_eq!(
+--- voxygen/Cargo.toml.orig	2024-05-20 18:26:00 UTC
++++ voxygen/Cargo.toml
+@@ -134,7 +134,7 @@ tracing = { workspace = true }
+ slab = { workspace = true }
+ strum = { workspace = true }
+ tracing = { workspace = true }
+-treeculler = "0.4"
++treeculler = "0.3"
+ tokio = { workspace = true, features = ["rt-multi-thread"] }
+ num_cpus = "1.0"
+ inline_tweak = { workspace = true }
diff --git a/games/veloren-weekly/files/patch-rustls-native-certs b/games/veloren-weekly/files/patch-rustls-native-certs
new file mode 100644
index 000000000000..8df282641ec1
--- /dev/null
+++ b/games/veloren-weekly/files/patch-rustls-native-certs
@@ -0,0 +1,36 @@
+https://github.com/rustls/rustls-native-certs/issues/28
+https://github.com/rustls/rustls-native-certs/commit/8162b232045e
+
+--- cargo-crates/rustls-native-certs-0.7.0/src/unix.rs.orig	1970-01-01 00:00:00 UTC
++++ cargo-crates/rustls-native-certs-0.7.0/src/unix.rs
+@@ -2,13 +2,27 @@ use pki_types::CertificateDer;
+ 
+ use pki_types::CertificateDer;
+ 
++use std::fs;
+ use std::io::Error;
+ 
+ pub fn load_native_certs() -> Result<Vec<CertificateDer<'static>>, Error> {
+     let likely_locations = openssl_probe::probe();
+ 
+-    match likely_locations.cert_file {
+-        Some(cert_file) => load_pem_certs(&cert_file),
+-        None => Ok(Vec::new()),
++    let mut certs = match likely_locations.cert_file {
++        Some(cert_file) => load_pem_certs(&cert_file)?,
++        None => Vec::new(),
++    };
++
++    if let Some(cert_dir) = likely_locations.cert_dir {
++        let dir_reader = fs::read_dir(cert_dir)?;
++        for entry in dir_reader {
++            let entry = entry?;
++            let path = entry.path();
++            if fs::metadata(&path)?.is_file() {
++                certs.append(&mut load_pem_certs(&path)?);
++            }
++        }
+     }
++
++    Ok(certs)
+ }
diff --git a/games/veloren-weekly/files/patch-shaderc b/games/veloren-weekly/files/patch-shaderc
index 45908a5ea850..3d44fe45b6f4 100644
--- a/games/veloren-weekly/files/patch-shaderc
+++ b/games/veloren-weekly/files/patch-shaderc
@@ -1,3 +1,6 @@
+This file is in the public domain.
+https://github.com/google/shaderc-rs/issues/62
+
 - Restore system shaderc support
 - Detect system shaderc on BSDs
 
@@ -27,35 +30,36 @@
  dependencies = [
   "cmake",
   "libc",
---- voxygen/Cargo.toml.orig	2024-02-07 19:13:27 UTC
+--- voxygen/Cargo.toml.orig	2024-05-20 18:26:00 UTC
 +++ voxygen/Cargo.toml
-@@ -29,14 +29,13 @@ egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend"
- tracy-memory = ["tracy"] # enables heap profiling with tracy
- plugins = ["client/plugins", "common-assets/plugins"]
+@@ -32,7 +32,6 @@ egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend"
+ tracy-memory = ["tracy"]                                                       # enables heap profiling with tracy
+ plugins = ["client/plugins", "common-assets/plugins", "server/plugins"]
  egui-ui = ["voxygen-egui", "egui", "egui_wgpu_backend", "egui_winit_platform"]
 -shaderc-from-source = ["shaderc/build-from-source"]
  discord = ["discord-sdk"]
  bin_img-export = ["common-assets"]
  
- # We don't ship egui with published release builds so a separate feature is required that excludes it.
- default-publish = ["singleplayer", "native-dialog", "plugins", "discord", "simd"]
+@@ -45,7 +44,7 @@ default-publish = [
+     "simd",
+ ]
  # Temp for bug on current wgpu version that has access violation in vulkan when constructing egui pipeline
 -default-no-egui = ["default-publish", "hot-reloading", "shaderc-from-source"]
 +default-no-egui = ["default-publish", "hot-reloading"]
  default = ["default-no-egui", "egui-ui"]
  
  [dependencies]
-@@ -60,9 +59,7 @@ bytemuck = { version="1.7", features=["derive"] }
- wgpu = { version = "0.18.0", default-features = false, features = ["trace", "spirv", "glsl"] }
+@@ -73,9 +72,7 @@ bytemuck = { version = "1.7", features = ["derive"] }
+ ] }
  wgpu-profiler = "0.15.0"
- bytemuck = { version="1.7", features=["derive"] }
+ bytemuck = { version = "1.7", features = ["derive"] }
 -# shaderc = "0.8.0"
 -# Working around a current bug in shaderc that causes it to use the system installation even if we specify compile from source
 -shaderc = { git = "https://github.com/pythonesque/shaderc-rs", rev = "f2605a02062834019bedff911aee2fd2998c49f9" }
 +shaderc = "0.8.0"
- # cmake crate used by shaderc, newer version 0.1.46 uses a new cmake command that is not available in our CI cmake version
- # see https://github.com/alexcrichton/cmake-rs/issues/131
- cmake = "=0.1.45"
+ 
+ # Ui
+ conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "copypasta_0.7" }
 --- cargo-crates/shaderc-sys-0.8.3/build/build.rs.orig	1970-01-01 00:00:00 UTC
 +++ cargo-crates/shaderc-sys-0.8.3/build/build.rs
 @@ -309,10 +309,13 @@ fn main() {
diff --git a/games/veloren-weekly/files/patch-wgpu-nvidia b/games/veloren-weekly/files/patch-wgpu-nvidia
new file mode 100644
index 000000000000..968ab7b7c858
--- /dev/null
+++ b/games/veloren-weekly/files/patch-wgpu-nvidia
@@ -0,0 +1,15 @@
+https://gitlab.com/veloren/veloren/-/issues/1975
+
+--- ../wgpu-0.18-with-fixes-for-veloren-v1/wgpu/src/backend/direct.rs.orig	2024-02-09 04:29:29 UTC
++++ ../wgpu-0.18-with-fixes-for-veloren-v1/wgpu/src/backend/direct.rs
+@@ -2279,9 +2279,7 @@ impl crate::Context for Context {
+             &size
+         )) {
+             Ok(()) => (),
+-            Err(err) => {
+-                self.handle_error_nolabel(&queue_data.error_sink, err, "Queue::write_texture")
+-            }
++            Err(_err) => ()
+         }
+     }
+ 
diff --git a/graphics/corrupter/Makefile b/graphics/corrupter/Makefile
index 5f6c964c79a3..72aa332f634c 100644
--- a/graphics/corrupter/Makefile
+++ b/graphics/corrupter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	corrupter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/gimp-jxl-plugin/Makefile b/graphics/gimp-jxl-plugin/Makefile
index 283f14816ea8..83496c0883f4 100644
--- a/graphics/gimp-jxl-plugin/Makefile
+++ b/graphics/gimp-jxl-plugin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gimp-jxl-plugin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.2
+DISTVERSION=	0.10.3
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/gimp-jxl-plugin/distinfo b/graphics/gimp-jxl-plugin/distinfo
index 577e469fa404..bb63a03a3b08 100644
--- a/graphics/gimp-jxl-plugin/distinfo
+++ b/graphics/gimp-jxl-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709885458
-SHA256 (libjxl-libjxl-v0.10.2_GH0.tar.gz) = 95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91
-SIZE (libjxl-libjxl-v0.10.2_GH0.tar.gz) = 1912303
+TIMESTAMP = 1719490208
+SHA256 (libjxl-libjxl-v0.10.3_GH0.tar.gz) = e0191411cfcd927eebe5392d030fe4283fe27ba1685ab7265104936e0b4283a6
+SIZE (libjxl-libjxl-v0.10.3_GH0.tar.gz) = 1912351
diff --git a/graphics/jp/Makefile b/graphics/jp/Makefile
index ab85caa080c3..022d6b4399bf 100644
--- a/graphics/jp/Makefile
+++ b/graphics/jp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jp
 DISTVERSION=	1.1.12
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	graphics
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/graphics/kf6-kimageformats/Makefile b/graphics/kf6-kimageformats/Makefile
index 6348a3c527db..e8dcf88fb124 100644
--- a/graphics/kf6-kimageformats/Makefile
+++ b/graphics/kf6-kimageformats/Makefile
@@ -2,6 +2,9 @@ PORTNAME=	kimageformats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
 CATEGORIES=	graphics kde kde-frameworks
 
+PATCH_SITES=	https://invent.kde.org/frameworks/kimageformats/-/commit/
+PATCHFILES+=	c2c12b1d7e38728e7533f1346deca0270973d22d.patch:-p1 # Fix build w/ Qt >= 6.7.0 on 32-bit
+
 COMMENT=	Plugins to allow QImage to support extra file formats
 MAINTAINER=	kde@FreeBSD.org
 
diff --git a/graphics/kf6-kimageformats/distinfo b/graphics/kf6-kimageformats/distinfo
index ea7d14e97c16..07e01f8a3e7a 100644
--- a/graphics/kf6-kimageformats/distinfo
+++ b/graphics/kf6-kimageformats/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1708670363
+TIMESTAMP = 1714791425
 SHA256 (KDE/frameworks/6.0.0/kimageformats-6.0.0.tar.xz) = 1ddd28f2fb8ac2c95556f792418c2b6190a04050ac31b27aa82ea11c1af0879c
 SIZE (KDE/frameworks/6.0.0/kimageformats-6.0.0.tar.xz) = 15920356
+SHA256 (KDE/frameworks/6.0.0/c2c12b1d7e38728e7533f1346deca0270973d22d.patch) = d1f4dd9590a8b51acfde4a8c6e5a998c12305094a25234efcdab7908a681de1d
+SIZE (KDE/frameworks/6.0.0/c2c12b1d7e38728e7533f1346deca0270973d22d.patch) = 887
diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile
index cae984150510..a5e6a0e1326f 100644
--- a/graphics/libjxl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libjxl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.10.2
+DISTVERSION=	0.10.3
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -27,6 +27,7 @@ CMAKE_OFF=	${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/}
 CMAKE_OFF+=	${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg
 CMAKE_OFF+=	${CMAKE_TESTING_ON}
 LDFLAGS+=	-Wl,--as-needed # brotlicommon, OPENEXR/PNG deps
+PLIST_SUB=	VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG
 OPTIONS_DEFAULT=GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG
diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo
index d437fd1d74d8..5d120e00ffd3 100644
--- a/graphics/libjxl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1709885458
-SHA256 (libjxl-libjxl-v0.10.2_GH0.tar.gz) = 95e807f63143856dc4d161c071cca01115d2c6405b3d3209854ac6989dc6bb91
-SIZE (libjxl-libjxl-v0.10.2_GH0.tar.gz) = 1912303
+TIMESTAMP = 1719490208
+SHA256 (libjxl-libjxl-v0.10.3_GH0.tar.gz) = e0191411cfcd927eebe5392d030fe4283fe27ba1685ab7265104936e0b4283a6
+SIZE (libjxl-libjxl-v0.10.3_GH0.tar.gz) = 1912351
 SHA256 (jbeich-skcms-42030a7_GH0.tar.gz) = b7537267dd0fda80a98939cc4e4d15614d2d6f433cc8421b797e0f47078c2979
 SIZE (jbeich-skcms-42030a7_GH0.tar.gz) = 10050433
 SHA256 (libjxl-testdata-ff8d743_GH0.tar.gz) = d225523e0576f21b6f8de106d2eac4e07650522bae7b65011993792a4dbc3eda
diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist
index 1ef7d9b49cff..d7d706b4e9aa 100644
--- a/graphics/libjxl/pkg-plist
+++ b/graphics/libjxl/pkg-plist
@@ -26,16 +26,16 @@ include/jxl/version.h
 %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so
 lib/libjxl.so
 lib/libjxl.so.0.10
-lib/libjxl.so.0.10.2
+lib/libjxl.so.%%VERSION%%
 lib/libjxl_cms.so
 lib/libjxl_cms.so.0.10
-lib/libjxl_cms.so.0.10.2
+lib/libjxl_cms.so.%%VERSION%%
 lib/libjxl_extras_codec.so
 lib/libjxl_extras_codec.so.0.10
-lib/libjxl_extras_codec.so.0.10.2
+lib/libjxl_extras_codec.so.%%VERSION%%
 lib/libjxl_threads.so
 lib/libjxl_threads.so.0.10
-lib/libjxl_threads.so.0.10.2
+lib/libjxl_threads.so.%%VERSION%%
 libdata/pkgconfig/libjxl.pc
 libdata/pkgconfig/libjxl_cms.pc
 libdata/pkgconfig/libjxl_threads.pc
diff --git a/graphics/librsvg2-rust/Makefile b/graphics/librsvg2-rust/Makefile
index b05395e5ad76..5dcffd6b90b1 100644
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	librsvg
-PORTVERSION=	2.58.0
-PORTREVISION=	1
+PORTVERSION=	2.58.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2-rust
diff --git a/graphics/librsvg2-rust/distinfo b/graphics/librsvg2-rust/distinfo
index b2e8cec8a014..d4e1c15c69dd 100644
--- a/graphics/librsvg2-rust/distinfo
+++ b/graphics/librsvg2-rust/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1710695192
-SHA256 (librsvg-2.58.0.tar.xz) = d7c444a926406b59790be0deae196e18ed26059da573fa1aa9ec9ca7658a559c
-SIZE (librsvg-2.58.0.tar.xz) = 5726268
+TIMESTAMP = 1716584078
+SHA256 (librsvg-2.58.1.tar.xz) = 3728596290a8576d305d06ec8afdf473516feee9dff22e03235eac433d56824e
+SIZE (librsvg-2.58.1.tar.xz) = 6217300
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
 SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 89bed5caba31..58eb2226e3af 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mesa
-DISTVERSION=	24.1-branchpoint-320
-DISTVERSIONSUFFIX=	-g894f7f43874
+DISTVERSION=	24.1-branchpoint-3263
+DISTVERSIONSUFFIX=	-gf9efedb1a1a
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -20,9 +20,9 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	Limited scope: no old drivers and no software rendering. \
 			See also https://mesamatrix.net/
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
+BUILD_DEPENDS=	libglvnd>=1.3.2:graphics/libglvnd \
+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
-		libOpenGL.so:graphics/libglvnd \
 		libexpat.so:textproc/expat2
 
 USES=		bison cpe compiler:c++11-lib meson pkgconfig python:build shebangfix
@@ -35,6 +35,7 @@ SHEBANG_FILES=	src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py
 MESON_ARGS=	-Dgallium-omx=disabled \
 		-Dgallium-xa=disabled \
 		-Dandroid-libbacktrace=disabled \
+		-Dlibunwind=disabled \
 		-Dlmsensors=disabled \
 		-Dmicrosoft-clc=disabled \
 		-Dvalgrind=disabled \
@@ -44,8 +45,8 @@ MESON_ARGS=	-Dgallium-omx=disabled \
 LDFLAGS+=	-Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003
 PLIST_SUB=	ARCH=${ARCH:S/amd/x86_/}
 
-OPTIONS_DEFINE=		LIBUNWIND LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
-OPTIONS_DEFAULT=	LIBUNWIND LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFINE=		LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
+OPTIONS_DEFAULT=	LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD
 OPTIONS_GROUP=		GALLIUM VULKAN
 OPTIONS_GROUP_GALLIUM=	crocus iris panfrost r600 radeonsi
 OPTIONS_GROUP_VULKAN=	anv hasvk radv
@@ -53,7 +54,6 @@ OPTIONS_EXCLUDE_i386=	LTO # anv: vkcube fails on vkCreateSwapchainKHR
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:C/.+/panfrost/}
 OPTIONS_EXCLUDE+=	${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus hasvk/}
 OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:Nx86_64:C/.+/anv iris/}
-OPTIONS_EXCLUDE+=	${ARCH:Naarch64:Namd64:Ni386:Npowerpc64:Npowerpc64le:Nx86_64:C/.+/LIBUNWIND/}
 OPTIONS_EXCLUDE+=	${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
 OPTIONS_SLAVE+=		${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
 OPTIONS_SUB=		yes
@@ -69,19 +69,20 @@ ${j}_VARS+=		${i}_DRIVERS+=${j:S/anv/intel/:S/hasvk/intel_&/:S/radv/amd/}
 
 GALLIUM_DESC=		Unified OpenGL drivers
 crocus_DESC=		Broadwater, Eaglelake, Ironlake, Sandybridge, Ivybridge, Haswell
-iris_DESC=		Broadwell and newer
+iris_DESC=		Broadwell and newer (implies OPENCL)
 iris_IMPLIES=		OPENCL
 panfrost_DESC=		Midgard, Bifrost
 r600_DESC=		R600, R700, Evergreen, Northern Islands (implies LLVM)
-radeonsi_DESC=		Southern Islands and newer (implies LLVM)
+r600_IMPLIES=		LLVM
+radeonsi_DESC=		Southern Islands and newer
 
 VULKAN_DESC=		Vulkan drivers
-anv_DESC=		Skylake and newer
+anv_DESC=		Skylake and newer (implies OPENCL)
 anv_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
 anv_MESON_ON=		${"${ARCH:Mamd64}":?:-Dintel-rt=disabled} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
 anv_IMPLIES=		OPENCL
 hasvk_DESC=		Ivy Bridge, Haswell, Broadwell
-radv_DESC=		Southern Islands and newer (implies LLVM)
+radv_DESC=		Southern Islands and newer
 radv_BUILD_DEPENDS=	glslangValidator:graphics/glslang
 
 COINST_DESC=		Allow co-installation with another Mesa port
@@ -92,17 +93,11 @@ COINST_SUB_FILES=	libmap.conf
 COINST_SUB_LIST=	SUFFIX=${PKGNAMESUFFIX}
 COINST_PLIST_SUB_OFF=	SUFFIX=
 
-LIBUNWIND_DESC=		Use libunwind for stacktraces
-LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
-LIBUNWIND_MESON_ENABLED=	libunwind
-
 LLVM_DESC=		Build with LLVM support (see implies)
 LLVM_USES=		llvm:min=15,lib,noexport
 LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG}
 LLVM_MESON_ENABLED=	llvm
-.for i in r600 radeonsi radv
-${i}_IMPLIES+=		LLVM
-.endfor
+LLVM_MESON_TRUE=	amd-use-llvm
 
 LTO_MESON_TRUE=		b_lto
 
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 2f1d710d9f09..94bc26dff606 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1714600520
-SHA256 (mesa-24.1-branchpoint-320-g894f7f43874.tar.bz2) = aa3d0491fd913868b4bee678699090a40dab2c3e99891d3ce2da32afc48b93ac
-SIZE (mesa-24.1-branchpoint-320-g894f7f43874.tar.bz2) = 37372912
+TIMESTAMP = 1720045057
+SHA256 (mesa-24.1-branchpoint-3263-gf9efedb1a1a.tar.bz2) = 3b5670c8106d5f04f173adb492e8f1b1a7daf699794d92248eb123bce4ee99d5
+SIZE (mesa-24.1-branchpoint-3263-gf9efedb1a1a.tar.bz2) = 37769076
 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
 SIZE (700efacda59c.patch) = 983
 SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 9c2bccb8b39f..c4f203ed0cd9 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -12,7 +12,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	24.0.6
+MESABASEVERSION=	24.0.7
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index 200570a26bdb..c6f994705d53 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1714022326
-SHA256 (mesa-24.0.6.tar.xz) = 8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604
-SIZE (mesa-24.0.6.tar.xz) = 20115628
+TIMESTAMP = 1715186008
+SHA256 (mesa-24.0.7.tar.xz) = 7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a
+SIZE (mesa-24.0.7.tar.xz) = 20144724
 SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
 SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626
 SHA256 (7c565db35d39bdbf4e4f867ea19f78b97c8c126f.patch) = 5af88a22abfadb91f6626c9244ed2a365e2bb283e0a42399082d1e909136d5f3
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 61970bccf156..acd132050242 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -39,6 +39,7 @@ GH_PROJECT=	oiio
 CMAKE_OFF=	BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \
 		STOP_ON_WARNING USE_OPENSSL OIIO_DOWNLOAD_MISSING_TESTDATA \
 		USE_Package
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 # OpenVDB uses the C++17 STL feature std::tuple_size_v; since the slave port py-openimageio excludes options - this is a global line here
 
 OPTIONS_DEFINE=		DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER \
 			OPENCV OPENJPEG PTEX RAW TBB TEST TOOLS VDB
diff --git a/graphics/py-qt6-3d/Makefile b/graphics/py-qt6-3d/Makefile
index 2f07d6714e78..506ec253c2c1 100644
--- a/graphics/py-qt6-3d/Makefile
+++ b/graphics/py-qt6-3d/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Python bindings for the Qt6 3D framework
 WWW=		https://www.riverbankcomputing.com/software/pyqt3d/
 
 USES=		gl pyqt:6 python qt:6
-USE_GL=		gl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYQT=	sip:build pyqt6 qtbuilder:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		3d base
diff --git a/graphics/py-qt6-3d/distinfo b/graphics/py-qt6-3d/distinfo
index f1658c3d4b99..bd44753804ba 100644
--- a/graphics/py-qt6-3d/distinfo
+++ b/graphics/py-qt6-3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698896095
-SHA256 (PyQt6_3D-6.6.0.tar.gz) = 372b206eb8185f2b6ff048629d3296cb137c9e5901b113119ffa46a317726988
-SIZE (PyQt6_3D-6.6.0.tar.gz) = 7469031
+TIMESTAMP = 1714271985
+SHA256 (PyQt6_3D-6.7.0.tar.gz) = 3e99bfc801918ab4758dd2660b2d2358e0057c943eb2bd9f8d0ddf156ea5ccd7
+SIZE (PyQt6_3D-6.7.0.tar.gz) = 7469641
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index 0d84af955b3f..65562eb0e243 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qgis
-DISTVERSION=	3.34.6
+DISTVERSION=	3.34.8
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 PKGNAMESUFFIX=	-ltr
diff --git a/graphics/qgis-ltr/distinfo b/graphics/qgis-ltr/distinfo
index 6064402e4cd5..230e30f16fc3 100644
--- a/graphics/qgis-ltr/distinfo
+++ b/graphics/qgis-ltr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713676902
-SHA256 (qgis-3.34.6.tar.bz2) = 57395caa3042c009e1446232d6356dc2d789201ea03c7106cc798fb257f61eff
-SIZE (qgis-3.34.6.tar.bz2) = 170944068
+TIMESTAMP = 1719146502
+SHA256 (qgis-3.34.8.tar.bz2) = 8851c056013ebe787a755683c5d4fb41f7818519aebd2aa2416e99badf9b6f2e
+SIZE (qgis-3.34.8.tar.bz2) = 171024011
diff --git a/graphics/qgis-ltr/pkg-plist b/graphics/qgis-ltr/pkg-plist
index a1ed32824d2c..00daac41cf82 100644
--- a/graphics/qgis-ltr/pkg-plist
+++ b/graphics/qgis-ltr/pkg-plist
@@ -1454,6 +1454,7 @@ include/qgis/qgsrastertransparencywidget.h
 include/qgis/qgsrasterviewport.h
 include/qgis/qgsratiolockbutton.h
 include/qgis/qgsray3d.h
+include/qgis/qgsraycastingutils.h
 include/qgis/qgsreadwritecontext.h
 include/qgis/qgsreadwritelocker.h
 include/qgis/qgsrecentstylehandler.h
@@ -3660,6 +3661,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_ko.qm
 %%DATADIR%%/i18n/qgis_ky.qm
 %%DATADIR%%/i18n/qgis_lt.qm
+%%DATADIR%%/i18n/qgis_lv.qm
 %%DATADIR%%/i18n/qgis_nb.qm
 %%DATADIR%%/i18n/qgis_nl.qm
 %%DATADIR%%/i18n/qgis_pl.qm
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 6cc228b7401f..3d5d94a3a67c 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qgis
-DISTVERSION=	3.36.2
+DISTVERSION=	3.36.3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://qgis.org/downloads/
 
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index b035396354cb..53e9d8bc8864 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713641923
-SHA256 (qgis-3.36.2.tar.bz2) = 8c886ab59094d7ea7fff5c299173b969509b88d896880d2c5d818c400cee69a4
-SIZE (qgis-3.36.2.tar.bz2) = 172387275
+TIMESTAMP = 1716009500
+SHA256 (qgis-3.36.3.tar.bz2) = fb8d153813f54164ddf5283cfd46f176839b4d55996de9acf6bac2bd2fb2da5d
+SIZE (qgis-3.36.3.tar.bz2) = 172648476
diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
index 23f61a4b814b..f6dbb9a47dc9 100644
--- a/graphics/qgis/pkg-plist
+++ b/graphics/qgis/pkg-plist
@@ -1467,6 +1467,7 @@ include/qgis/qgsrastertransparencywidget.h
 include/qgis/qgsrasterviewport.h
 include/qgis/qgsratiolockbutton.h
 include/qgis/qgsray3d.h
+include/qgis/qgsraycastingutils.h
 include/qgis/qgsreadwritecontext.h
 include/qgis/qgsreadwritelocker.h
 include/qgis/qgsrecentcoordinatereferencesystemsmodel.h
@@ -3692,6 +3693,7 @@ share/metainfo/org.qgis.qgis.appdata.xml
 %%DATADIR%%/i18n/qgis_ja.qm
 %%DATADIR%%/i18n/qgis_ko.qm
 %%DATADIR%%/i18n/qgis_lt.qm
+%%DATADIR%%/i18n/qgis_lv.qm
 %%DATADIR%%/i18n/qgis_nb.qm
 %%DATADIR%%/i18n/qgis_nl.qm
 %%DATADIR%%/i18n/qgis_pl.qm
diff --git a/graphics/qt5-3d/distinfo b/graphics/qt5-3d/distinfo
index fb7296e9da8a..8f64e956dd4e 100644
--- a/graphics/qt5-3d/distinfo
+++ b/graphics/qt5-3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771121
-SHA256 (KDE/Qt/5.15.13/kde-qt3d-5.15.13p0.tar.xz) = 84f76816d5d8c838d7c681a7280f4a1a2519ec69ab886d894d1b33f1cc246b80
-SIZE (KDE/Qt/5.15.13/kde-qt3d-5.15.13p0.tar.xz) = 118183168
+TIMESTAMP = 1716929162
+SHA256 (KDE/Qt/5.15.14/kde-qt3d-5.15.14p0.tar.xz) = ac0319252c8b6b0bd2b0b5284cc67aa463adba16f7ae9811bac0b1bd6ce33c68
+SIZE (KDE/Qt/5.15.14/kde-qt3d-5.15.14p0.tar.xz) = 118183096
diff --git a/graphics/qt5-graphicaleffects/distinfo b/graphics/qt5-graphicaleffects/distinfo
index 62eadb4c86ff..99e82d95d252 100644
--- a/graphics/qt5-graphicaleffects/distinfo
+++ b/graphics/qt5-graphicaleffects/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771122
-SHA256 (KDE/Qt/5.15.13/kde-qtgraphicaleffects-5.15.13p0.tar.xz) = 6ac895b75f7d8c236d6057cf68b7053c7148dbd128f9cb6771a8730db271097e
-SIZE (KDE/Qt/5.15.13/kde-qtgraphicaleffects-5.15.13p0.tar.xz) = 14018768
+TIMESTAMP = 1716929163
+SHA256 (KDE/Qt/5.15.14/kde-qtgraphicaleffects-5.15.14p0.tar.xz) = a908099c0b74d8848f658c3d209f84f4d088dd2151fe1cc958d9880bc7338522
+SIZE (KDE/Qt/5.15.14/kde-qtgraphicaleffects-5.15.14p0.tar.xz) = 14019408
diff --git a/graphics/qt5-imageformats/distinfo b/graphics/qt5-imageformats/distinfo
index 38fb7679845b..86631731a96b 100644
--- a/graphics/qt5-imageformats/distinfo
+++ b/graphics/qt5-imageformats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771123
-SHA256 (KDE/Qt/5.15.13/kde-qtimageformats-5.15.13p7.tar.xz) = 0d8766fc99e8b0cb189d729c3e3b814c3e728487c9c2109d69db2c65a0bfd185
-SIZE (KDE/Qt/5.15.13/kde-qtimageformats-5.15.13p7.tar.xz) = 1872288
+TIMESTAMP = 1716929164
+SHA256 (KDE/Qt/5.15.14/kde-qtimageformats-5.15.14p7.tar.xz) = 9ca36d6982040831594b3602c5c33d309821c44a9e57c7689014fdb1b11a4dc2
+SIZE (KDE/Qt/5.15.14/kde-qtimageformats-5.15.14p7.tar.xz) = 1877600
diff --git a/graphics/qt5-opengl/distinfo b/graphics/qt5-opengl/distinfo
index e548ed14d7d8..0a37da7b6b4d 100644
--- a/graphics/qt5-opengl/distinfo
+++ b/graphics/qt5-opengl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771124
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716929165
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/graphics/qt5-pixeltool/distinfo b/graphics/qt5-pixeltool/distinfo
index b6fe17f6dbdc..fe96f2018c20 100644
--- a/graphics/qt5-pixeltool/distinfo
+++ b/graphics/qt5-pixeltool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771126
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716929166
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/graphics/qt5-svg/distinfo b/graphics/qt5-svg/distinfo
index da070780b900..9f7e00d14bdc 100644
--- a/graphics/qt5-svg/distinfo
+++ b/graphics/qt5-svg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771127
-SHA256 (KDE/Qt/5.15.13/kde-qtsvg-5.15.13p6.tar.xz) = 500586c7b3d35afad1fb6288cf5304a3c828c040992d5387272dc4c102291b9d
-SIZE (KDE/Qt/5.15.13/kde-qtsvg-5.15.13p6.tar.xz) = 1865428
+TIMESTAMP = 1716929166
+SHA256 (KDE/Qt/5.15.14/kde-qtsvg-5.15.14p5.tar.xz) = d4618fa36748a1e18e4f7e2457ccbeb0fdbd9670baa2d72a0bc3ba1a68a5e3c6
+SIZE (KDE/Qt/5.15.14/kde-qtsvg-5.15.14p5.tar.xz) = 1865396
diff --git a/graphics/qt5-wayland/distinfo b/graphics/qt5-wayland/distinfo
index bc3390441707..a5816282dd0d 100644
--- a/graphics/qt5-wayland/distinfo
+++ b/graphics/qt5-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771128
-SHA256 (KDE/Qt/5.15.13/kde-qtwayland-5.15.13p60.tar.xz) = 7b8c1a09544ec5daab6920896111aca5acfb375729fbece21f13ef3edad4be0e
-SIZE (KDE/Qt/5.15.13/kde-qtwayland-5.15.13p60.tar.xz) = 538528
+TIMESTAMP = 1716929167
+SHA256 (KDE/Qt/5.15.14/kde-qtwayland-5.15.14p57.tar.xz) = 8e32d93023b8aa0e80296800636d2d55e4d832db1815a2df410b0d44755c842e
+SIZE (KDE/Qt/5.15.14/kde-qtwayland-5.15.14p57.tar.xz) = 538916
diff --git a/graphics/qt6-3d/distinfo b/graphics/qt6-3d/distinfo
index 51d2e618b592..f4fc4450cd8f 100644
--- a/graphics/qt6-3d/distinfo
+++ b/graphics/qt6-3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661369
-SHA256 (KDE/Qt/6.6.3/qt3d-everywhere-src-6.6.3.tar.xz) = a549747f0071542b4a12519e4ae755d2b054922566bc7aa48de4939c78bedf6c
-SIZE (KDE/Qt/6.6.3/qt3d-everywhere-src-6.6.3.tar.xz) = 141571616
+TIMESTAMP = 1718777711
+SHA256 (KDE/Qt/6.7.2/qt3d-everywhere-src-6.7.2.tar.xz) = 8bc087d904973133186e58471845c5df376bbfdcfcf079fda287e1cda27c8adf
+SIZE (KDE/Qt/6.7.2/qt3d-everywhere-src-6.7.2.tar.xz) = 141589248
diff --git a/graphics/qt6-imageformats/distinfo b/graphics/qt6-imageformats/distinfo
index f264978f66fe..3ed9705c7812 100644
--- a/graphics/qt6-imageformats/distinfo
+++ b/graphics/qt6-imageformats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661377
-SHA256 (KDE/Qt/6.6.3/qtimageformats-everywhere-src-6.6.3.tar.xz) = 3ca5ea60176603ce6ffc1bff59a4dcea139375233ce8e5e86c38f4e84c44627c
-SIZE (KDE/Qt/6.6.3/qtimageformats-everywhere-src-6.6.3.tar.xz) = 1964752
+TIMESTAMP = 1718777712
+SHA256 (KDE/Qt/6.7.2/qtimageformats-everywhere-src-6.7.2.tar.xz) = e1a1d8785fae67d16ad0a443b01d5f32663a6b68d275f1806ebab257485ce5d6
+SIZE (KDE/Qt/6.7.2/qtimageformats-everywhere-src-6.7.2.tar.xz) = 1974768
diff --git a/graphics/qt6-lottie/distinfo b/graphics/qt6-lottie/distinfo
index 3c14f7641833..b2b78a18c92f 100644
--- a/graphics/qt6-lottie/distinfo
+++ b/graphics/qt6-lottie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661379
-SHA256 (KDE/Qt/6.6.3/qtlottie-everywhere-src-6.6.3.tar.xz) = 9891fad0aef6fbc2f458f6d664698d9180b20255fc83e2c269960304c0920eb4
-SIZE (KDE/Qt/6.6.3/qtlottie-everywhere-src-6.6.3.tar.xz) = 83332
+TIMESTAMP = 1718777713
+SHA256 (KDE/Qt/6.7.2/qtlottie-everywhere-src-6.7.2.tar.xz) = d9afbc9358d352a4e521d4693d5bdad6a004272b6e8a9ec7a9f851700fe3f10e
+SIZE (KDE/Qt/6.7.2/qtlottie-everywhere-src-6.7.2.tar.xz) = 83636
diff --git a/graphics/qt6-quickeffectmaker/distinfo b/graphics/qt6-quickeffectmaker/distinfo
index f358d2a2995b..e862c9d86f6f 100644
--- a/graphics/qt6-quickeffectmaker/distinfo
+++ b/graphics/qt6-quickeffectmaker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661390
-SHA256 (KDE/Qt/6.6.3/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz) = bc242a13c9ab2ef4cbe6b739e63d7b8d116058f9056f451179e4c89918282357
-SIZE (KDE/Qt/6.6.3/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz) = 4358424
+TIMESTAMP = 1718777714
+SHA256 (KDE/Qt/6.7.2/qtquickeffectmaker-everywhere-src-6.7.2.tar.xz) = 3b0f26ce07c82c29f28d19b537b31c297799406428fbf0d31911464e717b756d
+SIZE (KDE/Qt/6.7.2/qtquickeffectmaker-everywhere-src-6.7.2.tar.xz) = 4358544
diff --git a/graphics/qt6-svg/distinfo b/graphics/qt6-svg/distinfo
index aded8c1880c1..defbd9bb55ac 100644
--- a/graphics/qt6-svg/distinfo
+++ b/graphics/qt6-svg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661401
-SHA256 (KDE/Qt/6.6.3/qtsvg-everywhere-src-6.6.3.tar.xz) = 4acb1e576eca55e955cf2b0d15c914a200df290e737accd7c1901fa1e33a25c7
-SIZE (KDE/Qt/6.6.3/qtsvg-everywhere-src-6.6.3.tar.xz) = 1643424
+TIMESTAMP = 1718777715
+SHA256 (KDE/Qt/6.7.2/qtsvg-everywhere-src-6.7.2.tar.xz) = fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01
+SIZE (KDE/Qt/6.7.2/qtsvg-everywhere-src-6.7.2.tar.xz) = 1791468
diff --git a/graphics/qt6-svg/pkg-plist b/graphics/qt6-svg/pkg-plist
index 1dd398947c9f..1860fea0b599 100644
--- a/graphics/qt6-svg/pkg-plist
+++ b/graphics/qt6-svg/pkg-plist
@@ -1,10 +1,13 @@
+%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfilter_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfont_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvggraphics_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghandler_p.h
+%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghelper_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgnode_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstructure_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgstyle_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgtinydocument_p.h
+%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgvisitor_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgexports_p.h
 %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qtsvgglobal_p.h
 %%QT_INCDIR%%/QtSvg/QSvgGenerator
diff --git a/graphics/qt6-wayland/distinfo b/graphics/qt6-wayland/distinfo
index 971f48dac553..2bbf40aeb278 100644
--- a/graphics/qt6-wayland/distinfo
+++ b/graphics/qt6-wayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661408
-SHA256 (KDE/Qt/6.6.3/qtwayland-everywhere-src-6.6.3.tar.xz) = a96ecc0fecc05f9e18cfb7806fe5ebd7416be94e8f51ebeca75c80412f66553d
-SIZE (KDE/Qt/6.6.3/qtwayland-everywhere-src-6.6.3.tar.xz) = 1120056
+TIMESTAMP = 1718777716
+SHA256 (KDE/Qt/6.7.2/qtwayland-everywhere-src-6.7.2.tar.xz) = a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b
+SIZE (KDE/Qt/6.7.2/qtwayland-everywhere-src-6.7.2.tar.xz) = 1123220
diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist
index 2dd0c39bc719..80cf5b266fdf 100644
--- a/graphics/qt6-wayland/pkg-plist
+++ b/graphics/qt6-wayland/pkg-plist
@@ -12,7 +12,7 @@
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v1.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v4-wip.h
+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v3.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-viewporter.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
@@ -68,6 +68,7 @@
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputinterface_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv1_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv2_p.h
+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtextinputv3_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandviewport_p.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
@@ -86,7 +87,7 @@
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v1-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
-%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v4-wip-client-protocol.h
+%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v3-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-viewporter-client-protocol.h
 %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
@@ -103,7 +104,6 @@
 %%QT_INCDIR%%/QtWaylandClient/qtwaylandclientexports.h
 %%QT_INCDIR%%/QtWaylandClient/qtwaylandclientglobal.h
 %%QT_INCDIR%%/QtWaylandClient/qtwaylandclientversion.h
-%%QT_INCDIR%%/QtWaylandClient/qwaylandclientexport.h
 %%QT_INCDIR%%/QtWaylandClient/qwaylandclientextension.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositor-config_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h
@@ -118,7 +118,7 @@
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-scaler.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h
-%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v4-wip.h
+%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v3.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-touch-extension.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-viewporter.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h
@@ -154,6 +154,8 @@
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandsurface_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinput_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanager_p.h
+%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanagerv3_p.h
+%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputv3_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtouch_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandutils_p.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandview_p.h
@@ -196,7 +198,7 @@
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-scaler-server-protocol.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v2-server-protocol.h
-%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v4-wip-server-protocol.h
+%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v3-server-protocol.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-touch-extension-server-protocol.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-viewporter-server-protocol.h
 %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h
@@ -242,6 +244,8 @@
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandSurfaceRole
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInput
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManager
+%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManagerV3
+%%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputV3
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandTouch
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandView
 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandViewporter
@@ -268,7 +272,6 @@
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandcompositorextension.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylanddestroylistener.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylanddrag.h
-%%QT_INCDIR%%/QtWaylandCompositor/qwaylandexport.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandidleinhibitv1.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandinputmethodcontrol.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandiviapplication.h
@@ -298,6 +301,8 @@
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandsurfacegrabber.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinput.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanager.h
+%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanagerv3.h
+%%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputv3.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtouch.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandview.h
 %%QT_INCDIR%%/QtWaylandCompositor/qwaylandviewporter.h
diff --git a/graphics/satty/Makefile b/graphics/satty/Makefile
index d3a482e79b12..820a501ad6fa 100644
--- a/graphics/satty/Makefile
+++ b/graphics/satty/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	satty
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.12.0
+DISTVERSION=	0.12.1
 CATEGORIES=	graphics wayland
 MASTER_SITES=	CRATESIO
 
diff --git a/graphics/satty/Makefile.crates b/graphics/satty/Makefile.crates
index 4fdf476ac95c..0528d13fcfca 100644
--- a/graphics/satty/Makefile.crates
+++ b/graphics/satty/Makefile.crates
@@ -1,46 +1,46 @@
-CARGO_CRATES=	addr2line-0.21.0 \
+CARGO_CRATES=	addr2line-0.22.0 \
 		adler-1.0.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
-		anstream-0.6.13 \
-		anstyle-1.0.6 \
-		anstyle-parse-0.2.3 \
-		anstyle-query-1.0.2 \
-		anstyle-wincon-3.0.2 \
-		anyhow-1.0.81 \
+		anstream-0.6.14 \
+		anstyle-1.0.7 \
+		anstyle-parse-0.2.4 \
+		anstyle-query-1.0.3 \
+		anstyle-wincon-3.0.3 \
+		anyhow-1.0.86 \
 		arrayvec-0.7.4 \
-		autocfg-1.2.0 \
-		backtrace-0.3.71 \
+		autocfg-1.3.0 \
+		backtrace-0.3.72 \
 		bitflags-1.3.2 \
 		bitflags-2.5.0 \
-		bumpalo-3.15.4 \
-		bytemuck-1.15.0 \
+		bumpalo-3.16.0 \
+		bytemuck-1.16.0 \
 		byteorder-1.5.0 \
 		bytes-1.6.0 \
-		cairo-rs-0.19.2 \
+		cairo-rs-0.19.4 \
 		cairo-sys-rs-0.19.2 \
-		cc-1.0.90 \
-		cfg-expr-0.15.7 \
+		cc-1.0.98 \
+		cfg-expr-0.15.8 \
 		cfg-if-1.0.0 \
-		chrono-0.4.37 \
+		chrono-0.4.38 \
 		clap-4.5.4 \
 		clap_builder-4.5.2 \
-		clap_complete-4.5.1 \
+		clap_complete-4.5.2 \
 		clap_complete_fig-4.5.0 \
 		clap_complete_nushell-4.5.1 \
 		clap_derive-4.5.4 \
 		clap_lex-0.7.0 \
 		color_quant-1.1.0 \
-		colorchoice-1.0.0 \
+		colorchoice-1.0.1 \
 		core-foundation-sys-0.8.6 \
-		crc32fast-1.4.0 \
+		crc32fast-1.4.2 \
 		cstr-0.2.12 \
 		dlib-0.5.2 \
 		epoxy-0.1.0 \
 		equivalent-1.0.1 \
 		femtovg-0.8.2 \
 		field-offset-0.3.6 \
-		flate2-1.0.28 \
+		flate2-1.0.30 \
 		flume-0.11.0 \
 		fnv-1.0.7 \
 		fontconfig-0.8.0 \
@@ -55,29 +55,29 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		futures-task-0.3.30 \
 		futures-util-0.3.30 \
 		gdk-pixbuf-0.19.2 \
-		gdk-pixbuf-sys-0.19.0 \
-		gdk4-0.8.1 \
-		gdk4-sys-0.8.1 \
+		gdk-pixbuf-sys-0.19.5 \
+		gdk4-0.8.2 \
+		gdk4-sys-0.8.2 \
 		generational-arena-0.2.9 \
-		getrandom-0.2.12 \
-		gimli-0.28.1 \
-		gio-0.19.3 \
-		gio-sys-0.19.0 \
+		getrandom-0.2.15 \
+		gimli-0.29.0 \
+		gio-0.19.5 \
+		gio-sys-0.19.5 \
 		gl_generator-0.9.0 \
-		glib-0.19.3 \
-		glib-macros-0.19.3 \
-		glib-sys-0.19.0 \
+		glib-0.19.7 \
+		glib-macros-0.19.7 \
+		glib-sys-0.19.5 \
 		glow-0.13.1 \
-		gobject-sys-0.19.0 \
+		gobject-sys-0.19.5 \
 		graphene-rs-0.19.2 \
-		graphene-sys-0.19.0 \
-		gsk4-0.8.1 \
-		gsk4-sys-0.8.1 \
-		gtk4-0.8.1 \
-		gtk4-macros-0.8.1 \
-		gtk4-sys-0.8.1 \
+		graphene-sys-0.19.5 \
+		gsk4-0.8.2 \
+		gsk4-sys-0.8.2 \
+		gtk4-0.8.2 \
+		gtk4-macros-0.8.2 \
+		gtk4-sys-0.8.2 \
 		gvdb-0.5.3 \
-		hashbrown-0.14.3 \
+		hashbrown-0.14.5 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
 		hex_color-3.0.0 \
@@ -86,84 +86,83 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		image-0.24.9 \
 		imgref-1.10.1 \
 		indexmap-2.2.6 \
+		is_terminal_polyfill-1.70.0 \
 		itoa-1.0.11 \
 		js-sys-0.3.69 \
 		khronos_api-2.2.0 \
 		lazy_static-1.4.0 \
 		libadwaita-0.6.0 \
 		libadwaita-sys-0.6.0 \
-		libc-0.2.153 \
+		libc-0.2.155 \
 		libloading-0.8.3 \
-		lock_api-0.4.11 \
+		lock_api-0.4.12 \
 		log-0.4.21 \
 		lru-0.12.3 \
 		memchr-2.7.2 \
 		memoffset-0.9.1 \
-		miniz_oxide-0.7.2 \
+		miniz_oxide-0.7.3 \
 		mio-0.8.11 \
 		nanorand-0.7.0 \
-		num-traits-0.2.18 \
+		num-traits-0.2.19 \
 		num_cpus-1.16.0 \
-		object-0.32.2 \
+		object-0.35.0 \
 		once_cell-1.19.0 \
-		pango-0.19.3 \
-		pango-sys-0.19.0 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.9 \
+		pango-0.19.5 \
+		pango-sys-0.19.5 \
+		parking_lot-0.12.3 \
+		parking_lot_core-0.9.10 \
 		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
 		pkg-config-0.3.30 \
 		ppv-lite86-0.2.17 \
 		proc-macro-crate-1.3.1 \
 		proc-macro-crate-3.1.0 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.79 \
+		proc-macro2-1.0.84 \
 		quick-xml-0.31.0 \
-		quote-1.0.35 \
+		quote-1.0.36 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
-		redox_syscall-0.4.1 \
+		redox_syscall-0.5.1 \
 		relm4-0.8.1 \
-		relm4-icons-0.8.2 \
+		relm4-icons-0.8.3 \
 		relm4-macros-0.8.1 \
 		resource-0.5.0 \
 		rgb-0.8.37 \
-		rustc-demangle-0.1.23 \
+		rustc-demangle-0.1.24 \
 		rustc_version-0.4.0 \
 		rustybuzz-0.11.0 \
-		ryu-1.0.17 \
-		safe-transmute-0.11.2 \
+		ryu-1.0.18 \
+		safe-transmute-0.11.3 \
 		same-file-1.0.6 \
 		scopeguard-1.2.0 \
-		semver-1.0.22 \
-		serde-1.0.197 \
-		serde_derive-1.0.197 \
-		serde_json-1.0.115 \
-		serde_spanned-0.6.5 \
+		semver-1.0.23 \
+		serde-1.0.203 \
+		serde_derive-1.0.203 \
+		serde_json-1.0.117 \
+		serde_spanned-0.6.6 \
 		shared_library-0.1.9 \
-		signal-hook-registry-1.4.1 \
+		signal-hook-registry-1.4.2 \
 		slab-0.4.9 \
 		slotmap-1.0.7 \
 		smallvec-1.13.2 \
-		socket2-0.5.6 \
+		socket2-0.5.7 \
 		spin-0.9.8 \
 		static_assertions-1.1.0 \
 		strsim-0.11.1 \
 		syn-1.0.109 \
-		syn-2.0.58 \
+		syn-2.0.66 \
 		system-deps-6.2.2 \
 		target-lexicon-0.12.14 \
-		thiserror-1.0.58 \
-		thiserror-impl-1.0.58 \
+		thiserror-1.0.61 \
+		thiserror-impl-1.0.61 \
 		tokio-1.37.0 \
 		tokio-macros-2.2.0 \
-		toml-0.8.12 \
-		toml_datetime-0.6.5 \
+		toml-0.8.13 \
+		toml_datetime-0.6.6 \
 		toml_edit-0.19.15 \
 		toml_edit-0.21.1 \
-		toml_edit-0.22.9 \
+		toml_edit-0.22.13 \
 		tracing-0.1.40 \
 		tracing-attributes-0.1.27 \
 		tracing-core-0.1.32 \
@@ -186,31 +185,29 @@ CARGO_CRATES=	addr2line-0.21.0 \
 		wasm-bindgen-macro-support-0.2.92 \
 		wasm-bindgen-shared-0.2.92 \
 		web-sys-0.3.69 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.6 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.8 \
 		windows-core-0.52.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
 		windows-targets-0.48.5 \
-		windows-targets-0.52.4 \
+		windows-targets-0.52.5 \
 		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_gnullvm-0.52.5 \
 		windows_aarch64_msvc-0.48.5 \
-		windows_aarch64_msvc-0.52.4 \
+		windows_aarch64_msvc-0.52.5 \
 		windows_i686_gnu-0.48.5 \
-		windows_i686_gnu-0.52.4 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
 		windows_i686_msvc-0.48.5 \
-		windows_i686_msvc-0.52.4 \
+		windows_i686_msvc-0.52.5 \
 		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnu-0.52.5 \
 		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_gnullvm-0.52.5 \
 		windows_x86_64_msvc-0.48.5 \
-		windows_x86_64_msvc-0.52.4 \
+		windows_x86_64_msvc-0.52.5 \
 		winnow-0.5.40 \
-		winnow-0.6.5 \
+		winnow-0.6.9 \
 		xdg-2.5.2 \
 		xml-rs-0.7.0 \
 		yeslogic-fontconfig-sys-5.0.0 \
diff --git a/graphics/satty/distinfo b/graphics/satty/distinfo
index 5471a75446dd..4435f73d29b4 100644
--- a/graphics/satty/distinfo
+++ b/graphics/satty/distinfo
@@ -1,60 +1,60 @@
-TIMESTAMP = 1712218227
-SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
-SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+TIMESTAMP = 1717072420
+SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678
+SIZE (rust/crates/addr2line-0.22.0.crate) = 39156
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
-SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
-SIZE (rust/crates/anstream-0.6.13.crate) = 30928
-SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
-SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
-SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
-SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
-SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
-SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
-SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
-SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
-SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
-SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
+SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
+SIZE (rust/crates/anstream-0.6.14.crate) = 29160
+SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
+SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
+SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
+SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
+SHA256 (rust/crates/anstyle-query-1.0.3.crate) = a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5
+SIZE (rust/crates/anstyle-query-1.0.3.crate) = 9742
+SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
+SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
+SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
+SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
-SHA256 (rust/crates/autocfg-1.2.0.crate) = f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80
-SIZE (rust/crates/autocfg-1.2.0.crate) = 14808
-SHA256 (rust/crates/backtrace-0.3.71.crate) = 26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d
-SIZE (rust/crates/backtrace-0.3.71.crate) = 86553
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/backtrace-0.3.72.crate) = 17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11
+SIZE (rust/crates/backtrace-0.3.72.crate) = 87877
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
 SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
 SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
-SHA256 (rust/crates/bumpalo-3.15.4.crate) = 7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa
-SIZE (rust/crates/bumpalo-3.15.4.crate) = 85028
-SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
-SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytemuck-1.16.0.crate) = 78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5
+SIZE (rust/crates/bytemuck-1.16.0.crate) = 48015
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
 SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
 SIZE (rust/crates/bytes-1.6.0.crate) = 60605
-SHA256 (rust/crates/cairo-rs-0.19.2.crate) = 2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c
-SIZE (rust/crates/cairo-rs-0.19.2.crate) = 52323
+SHA256 (rust/crates/cairo-rs-0.19.4.crate) = b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562
+SIZE (rust/crates/cairo-rs-0.19.4.crate) = 52285
 SHA256 (rust/crates/cairo-sys-rs-0.19.2.crate) = fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64
 SIZE (rust/crates/cairo-sys-rs-0.19.2.crate) = 11874
-SHA256 (rust/crates/cc-1.0.90.crate) = 8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5
-SIZE (rust/crates/cc-1.0.90.crate) = 73954
-SHA256 (rust/crates/cfg-expr-0.15.7.crate) = fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d
-SIZE (rust/crates/cfg-expr-0.15.7.crate) = 42003
+SHA256 (rust/crates/cc-1.0.98.crate) = 41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f
+SIZE (rust/crates/cc-1.0.98.crate) = 76780
+SHA256 (rust/crates/cfg-expr-0.15.8.crate) = d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02
+SIZE (rust/crates/cfg-expr-0.15.8.crate) = 42108
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chrono-0.4.37.crate) = 8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e
-SIZE (rust/crates/chrono-0.4.37.crate) = 234441
+SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
+SIZE (rust/crates/chrono-0.4.38.crate) = 220559
 SHA256 (rust/crates/clap-4.5.4.crate) = 90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0
 SIZE (rust/crates/clap-4.5.4.crate) = 55401
 SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
 SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
-SHA256 (rust/crates/clap_complete-4.5.1.crate) = 885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c
-SIZE (rust/crates/clap_complete-4.5.1.crate) = 37823
+SHA256 (rust/crates/clap_complete-4.5.2.crate) = dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e
+SIZE (rust/crates/clap_complete-4.5.2.crate) = 37850
 SHA256 (rust/crates/clap_complete_fig-4.5.0.crate) = 54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110
 SIZE (rust/crates/clap_complete_fig-4.5.0.crate) = 10932
 SHA256 (rust/crates/clap_complete_nushell-4.5.1.crate) = 80d0e48e026ce7df2040239117d25e4e79714907420c70294a5ce4b6bbe6a7b6
@@ -65,12 +65,12 @@ SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97
 SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
 SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b
 SIZE (rust/crates/color_quant-1.1.0.crate) = 6649
-SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
-SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
+SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
 SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
 SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
-SHA256 (rust/crates/crc32fast-1.4.0.crate) = b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa
-SIZE (rust/crates/crc32fast-1.4.0.crate) = 38665
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
 SHA256 (rust/crates/cstr-0.2.12.crate) = 68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636
 SIZE (rust/crates/cstr-0.2.12.crate) = 6078
 SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412
@@ -83,8 +83,8 @@ SHA256 (rust/crates/femtovg-0.8.2.crate) = 18ab822e58e8bc2b89840dc5dde49afe39302
 SIZE (rust/crates/femtovg-0.8.2.crate) = 240266
 SHA256 (rust/crates/field-offset-0.3.6.crate) = 38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f
 SIZE (rust/crates/field-offset-0.3.6.crate) = 10032
-SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
-SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
+SIZE (rust/crates/flate2-1.0.30.crate) = 75511
 SHA256 (rust/crates/flume-0.11.0.crate) = 55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181
 SIZE (rust/crates/flume-0.11.0.crate) = 67502
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
@@ -113,52 +113,52 @@ SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987
 SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
 SHA256 (rust/crates/gdk-pixbuf-0.19.2.crate) = f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92
 SIZE (rust/crates/gdk-pixbuf-0.19.2.crate) = 17734
-SHA256 (rust/crates/gdk-pixbuf-sys-0.19.0.crate) = 3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96
-SIZE (rust/crates/gdk-pixbuf-sys-0.19.0.crate) = 9745
-SHA256 (rust/crates/gdk4-0.8.1.crate) = 9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b
-SIZE (rust/crates/gdk4-0.8.1.crate) = 89125
-SHA256 (rust/crates/gdk4-sys-0.8.1.crate) = d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626
-SIZE (rust/crates/gdk4-sys-0.8.1.crate) = 65737
+SHA256 (rust/crates/gdk-pixbuf-sys-0.19.5.crate) = 1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f
+SIZE (rust/crates/gdk-pixbuf-sys-0.19.5.crate) = 9781
+SHA256 (rust/crates/gdk4-0.8.2.crate) = db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07
+SIZE (rust/crates/gdk4-0.8.2.crate) = 90346
+SHA256 (rust/crates/gdk4-sys-0.8.2.crate) = c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd
+SIZE (rust/crates/gdk4-sys-0.8.2.crate) = 65864
 SHA256 (rust/crates/generational-arena-0.2.9.crate) = 877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7
 SIZE (rust/crates/generational-arena-0.2.9.crate) = 21409
-SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
-SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
-SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
-SIZE (rust/crates/gimli-0.28.1.crate) = 270497
-SHA256 (rust/crates/gio-0.19.3.crate) = c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f
-SIZE (rust/crates/gio-0.19.3.crate) = 201442
-SHA256 (rust/crates/gio-sys-0.19.0.crate) = bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4
-SIZE (rust/crates/gio-sys-0.19.0.crate) = 81621
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/gimli-0.29.0.crate) = 40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd
+SIZE (rust/crates/gimli-0.29.0.crate) = 275756
+SHA256 (rust/crates/gio-0.19.5.crate) = be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7
+SIZE (rust/crates/gio-0.19.5.crate) = 201706
+SHA256 (rust/crates/gio-sys-0.19.5.crate) = d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40
+SIZE (rust/crates/gio-sys-0.19.5.crate) = 81676
 SHA256 (rust/crates/gl_generator-0.9.0.crate) = 7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a
 SIZE (rust/crates/gl_generator-0.9.0.crate) = 21595
-SHA256 (rust/crates/glib-0.19.3.crate) = 01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf
-SIZE (rust/crates/glib-0.19.3.crate) = 274906
-SHA256 (rust/crates/glib-macros-0.19.3.crate) = 9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d
-SIZE (rust/crates/glib-macros-0.19.3.crate) = 62904
-SHA256 (rust/crates/glib-sys-0.19.0.crate) = 630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4
-SIZE (rust/crates/glib-sys-0.19.0.crate) = 63769
+SHA256 (rust/crates/glib-0.19.7.crate) = e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490
+SIZE (rust/crates/glib-0.19.7.crate) = 275483
+SHA256 (rust/crates/glib-macros-0.19.7.crate) = 70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e
+SIZE (rust/crates/glib-macros-0.19.7.crate) = 63235
+SHA256 (rust/crates/glib-sys-0.19.5.crate) = 767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282
+SIZE (rust/crates/glib-sys-0.19.5.crate) = 63434
 SHA256 (rust/crates/glow-0.13.1.crate) = bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1
 SIZE (rust/crates/glow-0.13.1.crate) = 150940
-SHA256 (rust/crates/gobject-sys-0.19.0.crate) = c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979
-SIZE (rust/crates/gobject-sys-0.19.0.crate) = 19026
+SHA256 (rust/crates/gobject-sys-0.19.5.crate) = c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b
+SIZE (rust/crates/gobject-sys-0.19.5.crate) = 19074
 SHA256 (rust/crates/graphene-rs-0.19.2.crate) = 99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91
 SIZE (rust/crates/graphene-rs-0.19.2.crate) = 17322
-SHA256 (rust/crates/graphene-sys-0.19.0.crate) = 236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0
-SIZE (rust/crates/graphene-sys-0.19.0.crate) = 11615
-SHA256 (rust/crates/gsk4-0.8.1.crate) = c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e
-SIZE (rust/crates/gsk4-0.8.1.crate) = 32346
-SHA256 (rust/crates/gsk4-sys-0.8.1.crate) = bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738
-SIZE (rust/crates/gsk4-sys-0.8.1.crate) = 15283
-SHA256 (rust/crates/gtk4-0.8.1.crate) = aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83
-SIZE (rust/crates/gtk4-0.8.1.crate) = 465401
-SHA256 (rust/crates/gtk4-macros-0.8.1.crate) = 40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567
-SIZE (rust/crates/gtk4-macros-0.8.1.crate) = 16752
-SHA256 (rust/crates/gtk4-sys-0.8.1.crate) = 0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18
-SIZE (rust/crates/gtk4-sys-0.8.1.crate) = 109403
+SHA256 (rust/crates/graphene-sys-0.19.5.crate) = 2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d
+SIZE (rust/crates/graphene-sys-0.19.5.crate) = 11653
+SHA256 (rust/crates/gsk4-0.8.2.crate) = 7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be
+SIZE (rust/crates/gsk4-0.8.2.crate) = 32331
+SHA256 (rust/crates/gsk4-sys-0.8.2.crate) = 23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc
+SIZE (rust/crates/gsk4-sys-0.8.2.crate) = 15321
+SHA256 (rust/crates/gtk4-0.8.2.crate) = b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab
+SIZE (rust/crates/gtk4-0.8.2.crate) = 466329
+SHA256 (rust/crates/gtk4-macros-0.8.2.crate) = ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408
+SIZE (rust/crates/gtk4-macros-0.8.2.crate) = 16529
+SHA256 (rust/crates/gtk4-sys-0.8.2.crate) = 8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5
+SIZE (rust/crates/gtk4-sys-0.8.2.crate) = 109719
 SHA256 (rust/crates/gvdb-0.5.3.crate) = 0bb9136c388a1e7b3017d18fe7c2f263b0a2b13f215c48e8eb44935d413ce0f9
 SIZE (rust/crates/gvdb-0.5.3.crate) = 39227
-SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
-SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
@@ -175,6 +175,8 @@ SHA256 (rust/crates/imgref-1.10.1.crate) = 44feda355f4159a7c757171a77de25daf6411
 SIZE (rust/crates/imgref-1.10.1.crate) = 61797
 SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
 SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
+SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
+SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
 SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
 SIZE (rust/crates/itoa-1.0.11.crate) = 10563
 SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
@@ -187,12 +189,12 @@ SHA256 (rust/crates/libadwaita-0.6.0.crate) = 91b4990248b9e1ec5e72094a2ccaea70ec
 SIZE (rust/crates/libadwaita-0.6.0.crate) = 108068
 SHA256 (rust/crates/libadwaita-sys-0.6.0.crate) = 23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8
 SIZE (rust/crates/libadwaita-sys-0.6.0.crate) = 26809
-SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
-SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
 SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
 SIZE (rust/crates/libloading-0.8.3.crate) = 28480
-SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
-SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
 SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
 SIZE (rust/crates/log-0.4.21.crate) = 43442
 SHA256 (rust/crates/lru-0.12.3.crate) = d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc
@@ -201,28 +203,28 @@ SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2
 SIZE (rust/crates/memchr-2.7.2.crate) = 96220
 SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
 SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
-SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
-SIZE (rust/crates/miniz_oxide-0.7.2.crate) = 55731
+SHA256 (rust/crates/miniz_oxide-0.7.3.crate) = 87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae
+SIZE (rust/crates/miniz_oxide-0.7.3.crate) = 55774
 SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
 SIZE (rust/crates/mio-0.8.11.crate) = 102983
 SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
-SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
-SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
 SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
 SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
-SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
-SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object-0.35.0.crate) = b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e
+SIZE (rust/crates/object-0.35.0.crate) = 317792
 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
 SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
-SHA256 (rust/crates/pango-0.19.3.crate) = b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1
-SIZE (rust/crates/pango-0.19.3.crate) = 44890
-SHA256 (rust/crates/pango-sys-0.19.0.crate) = f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea
-SIZE (rust/crates/pango-sys-0.19.0.crate) = 24787
-SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
-SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
-SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
-SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/pango-0.19.5.crate) = 504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d
+SIZE (rust/crates/pango-0.19.5.crate) = 45385
+SHA256 (rust/crates/pango-sys-0.19.5.crate) = e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505
+SIZE (rust/crates/pango-sys-0.19.5.crate) = 24861
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
 SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
 SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
@@ -235,70 +237,66 @@ SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
 SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
-SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
-SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
-SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
-SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e
-SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200
+SHA256 (rust/crates/proc-macro2-1.0.84.crate) = ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6
+SIZE (rust/crates/proc-macro2-1.0.84.crate) = 48922
 SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
 SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
-SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
-SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
-SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/redox_syscall-0.5.1.crate) = 469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e
+SIZE (rust/crates/redox_syscall-0.5.1.crate) = 22536
 SHA256 (rust/crates/relm4-0.8.1.crate) = e6e0e187b58db367305e8486d3228158251da1c8ba1e18baa9de61894e822649
 SIZE (rust/crates/relm4-0.8.1.crate) = 117199
-SHA256 (rust/crates/relm4-icons-0.8.2.crate) = 8603f50e9ed5ca2e3759a9c6033e4058c7b984f1bd22b1fc3b1a162c5612eb64
-SIZE (rust/crates/relm4-icons-0.8.2.crate) = 1201000
+SHA256 (rust/crates/relm4-icons-0.8.3.crate) = d5738f52d978a211bd4b3ec3b37f1593297ad34f0f1789d8115eabe1df7958a8
+SIZE (rust/crates/relm4-icons-0.8.3.crate) = 1200986
 SHA256 (rust/crates/relm4-macros-0.8.1.crate) = 0774e846889823aa5766f5b62cface3189a5b36280e65b2faaa6df0319da1726
 SIZE (rust/crates/relm4-macros-0.8.1.crate) = 40557
 SHA256 (rust/crates/resource-0.5.0.crate) = 11a7f6703c396037a02da99195e49138c37f3cc5146cb95f2f7d26debc0c5622
 SIZE (rust/crates/resource-0.5.0.crate) = 6500
 SHA256 (rust/crates/rgb-0.8.37.crate) = 05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8
 SIZE (rust/crates/rgb-0.8.37.crate) = 16644
-SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
-SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
+SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
 SHA256 (rust/crates/rustybuzz-0.11.0.crate) = 2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa
 SIZE (rust/crates/rustybuzz-0.11.0.crate) = 241297
-SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
-SIZE (rust/crates/ryu-1.0.17.crate) = 47537
-SHA256 (rust/crates/safe-transmute-0.11.2.crate) = 98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8
-SIZE (rust/crates/safe-transmute-0.11.2.crate) = 27427
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
+SHA256 (rust/crates/safe-transmute-0.11.3.crate) = 3944826ff8fa8093089aba3acb4ef44b9446a99a16f3bf4e74af3f77d340ab7d
+SIZE (rust/crates/safe-transmute-0.11.3.crate) = 27428
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
-SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
-SIZE (rust/crates/semver-1.0.22.crate) = 30446
-SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
-SIZE (rust/crates/serde-1.0.197.crate) = 77087
-SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
-SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
-SHA256 (rust/crates/serde_json-1.0.115.crate) = 12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd
-SIZE (rust/crates/serde_json-1.0.115.crate) = 147100
-SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
-SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b
+SIZE (rust/crates/semver-1.0.23.crate) = 30622
+SHA256 (rust/crates/serde-1.0.203.crate) = 7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094
+SIZE (rust/crates/serde-1.0.203.crate) = 77935
+SHA256 (rust/crates/serde_derive-1.0.203.crate) = 500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba
+SIZE (rust/crates/serde_derive-1.0.203.crate) = 55867
+SHA256 (rust/crates/serde_json-1.0.117.crate) = 455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3
+SIZE (rust/crates/serde_json-1.0.117.crate) = 146921
+SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
+SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
 SHA256 (rust/crates/shared_library-0.1.9.crate) = 5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11
 SIZE (rust/crates/shared_library-0.1.9.crate) = 10566
-SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
-SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
 SHA256 (rust/crates/slotmap-1.0.7.crate) = dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a
 SIZE (rust/crates/slotmap-1.0.7.crate) = 61390
 SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
 SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
-SHA256 (rust/crates/socket2-0.5.6.crate) = 05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871
-SIZE (rust/crates/socket2-0.5.6.crate) = 55270
+SHA256 (rust/crates/socket2-0.5.7.crate) = ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c
+SIZE (rust/crates/socket2-0.5.7.crate) = 55758
 SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
 SIZE (rust/crates/spin-0.9.8.crate) = 38958
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
@@ -307,30 +305,30 @@ SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3
 SIZE (rust/crates/strsim-0.11.1.crate) = 14266
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.58.crate) = 44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687
-SIZE (rust/crates/syn-2.0.58.crate) = 254920
+SHA256 (rust/crates/syn-2.0.66.crate) = c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5
+SIZE (rust/crates/syn-2.0.66.crate) = 264855
 SHA256 (rust/crates/system-deps-6.2.2.crate) = a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349
 SIZE (rust/crates/system-deps-6.2.2.crate) = 25546
 SHA256 (rust/crates/target-lexicon-0.12.14.crate) = e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f
 SIZE (rust/crates/target-lexicon-0.12.14.crate) = 25508
-SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297
-SIZE (rust/crates/thiserror-1.0.58.crate) = 21025
-SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7
-SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645
+SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
+SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
+SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
+SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
 SHA256 (rust/crates/tokio-1.37.0.crate) = 1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787
 SIZE (rust/crates/tokio-1.37.0.crate) = 764297
 SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
 SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
-SHA256 (rust/crates/toml-0.8.12.crate) = e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3
-SIZE (rust/crates/toml-0.8.12.crate) = 51145
-SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
-SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml-0.8.13.crate) = a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba
+SIZE (rust/crates/toml-0.8.13.crate) = 50517
+SHA256 (rust/crates/toml_datetime-0.6.6.crate) = 4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf
+SIZE (rust/crates/toml_datetime-0.6.6.crate) = 11698
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
 SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
 SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
-SHA256 (rust/crates/toml_edit-0.22.9.crate) = 8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4
-SIZE (rust/crates/toml_edit-0.22.9.crate) = 104173
+SHA256 (rust/crates/toml_edit-0.22.13.crate) = c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c
+SIZE (rust/crates/toml_edit-0.22.13.crate) = 103518
 SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
 SIZE (rust/crates/tracing-0.1.40.crate) = 79459
 SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
@@ -375,14 +373,8 @@ SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b
 SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
 SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
 SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
-SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
-SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
-SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
+SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
 SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -391,40 +383,42 @@ SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9b
 SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
 SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
 SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
-SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
 SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
-SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
 SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
 SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
-SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
 SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
 SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
-SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
 SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
 SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
-SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
 SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
-SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (rust/crates/winnow-0.6.5.crate) = dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8
-SIZE (rust/crates/winnow-0.6.5.crate) = 159316
+SHA256 (rust/crates/winnow-0.6.9.crate) = 86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6
+SIZE (rust/crates/winnow-0.6.9.crate) = 160195
 SHA256 (rust/crates/xdg-2.5.2.crate) = 213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546
 SIZE (rust/crates/xdg-2.5.2.crate) = 14394
 SHA256 (rust/crates/xml-rs-0.7.0.crate) = 3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2
@@ -437,5 +431,5 @@ SHA256 (rust/crates/zvariant_derive-3.15.2.crate) = 37c24dc0bed72f5f90d1f8bb5b07
 SIZE (rust/crates/zvariant_derive-3.15.2.crate) = 10936
 SHA256 (rust/crates/zvariant_utils-1.0.1.crate) = 7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200
 SIZE (rust/crates/zvariant_utils-1.0.1.crate) = 6223
-SHA256 (gabm-Satty-v0.12.0_GH0.tar.gz) = 42403b36e7babe245de2bebc78d4bebab68aeaa4594b28bb9d83f44808e52920
-SIZE (gabm-Satty-v0.12.0_GH0.tar.gz) = 1002094
+SHA256 (gabm-Satty-v0.12.1_GH0.tar.gz) = 6ecd5a1ac7ac4b1e70754b27db398ed339c04227b5aeb2fccf3277876b9548b9
+SIZE (gabm-Satty-v0.12.1_GH0.tar.gz) = 1002083
diff --git a/graphics/satty/files/patch-icons b/graphics/satty/files/patch-icons
index 1054e51e2fd1..e30f6b6e8237 100644
--- a/graphics/satty/files/patch-icons
+++ b/graphics/satty/files/patch-icons
@@ -1,5 +1,5 @@
---- cargo-crates/relm4-icons-0.8.2/build.rs.orig	2006-07-24 01:21:28 UTC
-+++ cargo-crates/relm4-icons-0.8.2/build.rs
+--- cargo-crates/relm4-icons-0.8.3/build.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/relm4-icons-0.8.3/build.rs
 @@ -52,7 +52,7 @@ fn main() {
      let mut manifest_dir = Path::new(&out_dir).canonicalize().unwrap();
      eprintln!("Canonical manifest dir: {manifest_dir:?}");
diff --git a/graphics/vhs/Makefile b/graphics/vhs/Makefile
index 91399ecec1d0..c3b0ac461067 100644
--- a/graphics/vhs/Makefile
+++ b/graphics/vhs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vhs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile
index 8996b1f9a448..00bae39a90be 100644
--- a/graphics/vkd3d/Makefile
+++ b/graphics/vkd3d/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	https://dl.winehq.org/${PORTNAME}/source/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	jbeich@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Direct3D 12 to Vulkan translation
 WWW=		https://www.winehq.org/
 
diff --git a/irc/ergo/Makefile b/irc/ergo/Makefile
index 94d564577410..a9bffe866b51 100644
--- a/irc/ergo/Makefile
+++ b/irc/ergo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ergo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.13.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	irc
 PKGNAMESUFFIX=	-irc-server
 
diff --git a/irc/soju/Makefile b/irc/soju/Makefile
index 53235627bee3..99a3c237a168 100644
--- a/irc/soju/Makefile
+++ b/irc/soju/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	soju
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	irc
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/lang/gcc11/Makefile b/lang/gcc11/Makefile
index a2fc68a4418d..56ecc447de4c 100644
--- a/lang/gcc11/Makefile
+++ b/lang/gcc11/Makefile
@@ -12,7 +12,7 @@ WWW=		https://gcc.gnu.org
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le riscv64
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
diff --git a/lang/gcc12/Makefile b/lang/gcc12/Makefile
index 147099e9720e..beba427302f6 100644
--- a/lang/gcc12/Makefile
+++ b/lang/gcc12/Makefile
@@ -11,7 +11,7 @@ WWW=		https://gcc.gnu.org
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le riscv64
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
diff --git a/lang/gcc13/Makefile b/lang/gcc13/Makefile
index 4edd71bb7c29..3c0a3841de61 100644
--- a/lang/gcc13/Makefile
+++ b/lang/gcc13/Makefile
@@ -12,7 +12,7 @@ WWW=		https://gcc.gnu.org
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le riscv64
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
diff --git a/lang/gcc14-devel/Makefile b/lang/gcc14-devel/Makefile
index 60562e38e9c0..228ecb8978cc 100644
--- a/lang/gcc14-devel/Makefile
+++ b/lang/gcc14-devel/Makefile
@@ -84,7 +84,11 @@ USE_GCC=	yes
 USE_GCC=	yes
 .endif
 
+.if ${ARCH} == i386
+LANGUAGES:=	c,c++,objc,fortran
+.else
 LANGUAGES:=	c,c++,objc,fortran,jit
+.endif
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 TARGLIB32=	${PREFIX}/lib32	# The version information is added later
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index efdba686a96b..ffe05d7a40d8 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -87,6 +87,8 @@ GCC6AUX_BUILD_DEPENDS=		gcc6-aux>0:lang/gcc6-aux
 GCC6AUX_VARS=			_GCC6AUX_PATH=${LOCALBASE}/gcc6-aux/bin
 .if exists(/usr/lib32/libc.so)
 MULTILIB_CONFIGURE_ENABLE=	multilib
+.else
+CONFIGURE_ARGS+=		--disable-multilib
 .endif
 NLS_CONFIGURE_ON=		--enable-nls
 NLS_CONFIGURE_OFF=		--disable-nls
diff --git a/lang/gnat13/Makefile b/lang/gnat13/Makefile
index 3a397b905940..04e485915608 100644
--- a/lang/gnat13/Makefile
+++ b/lang/gnat13/Makefile
@@ -85,6 +85,8 @@ GNAT12_BUILD_DEPENDS=		gnat12>0:lang/gnat12
 GNAT12_VARS=			_GNAT12_PATH=${LOCALBASE}/gnat12/bin
 .if exists(/usr/lib32/libc.so)
 MULTILIB_CONFIGURE_ENABLE=	multilib
+.else
+CONFIGURE_ARGS+=		--disable-multilib
 .endif
 NLS_CONFIGURE_ON=		--enable-nls
 NLS_CONFIGURE_OFF=		--disable-nls
diff --git a/lang/go/Makefile b/lang/go/Makefile
index bf7b125c7d01..b6cad0a32df5 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	go
 DISTVERSION=	${GO_DEFAULT}
-PORTREVISION=	1
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	lang
 MASTER_SITES=	# not applicable
diff --git a/lang/go121/Makefile b/lang/go121/Makefile
index 47adcb7c3f7c..a6b0d9accbb1 100644
--- a/lang/go121/Makefile
+++ b/lang/go121/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION=	1.21.9
+DISTVERSION=	1.21.11
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
 PORTREVISION=	0
 MASTER_SITES=	https://golang.org/dl/ \
diff --git a/lang/go121/distinfo b/lang/go121/distinfo
index 7d8db86edc66..a047e6dc3447 100644
--- a/lang/go121/distinfo
+++ b/lang/go121/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1713165093
-SHA256 (go1.21.9.src.tar.gz) = 58f0c5ced45a0012bce2ff7a9df03e128abcc8818ebabe5027bb92bafe20e421
-SIZE (go1.21.9.src.tar.gz) = 26993426
+TIMESTAMP = 1718257193
+SHA256 (go1.21.11.src.tar.gz) = 42aee9bf2b6956c75a7ad6aa3f0a51b5821ffeac57f5a2e733a2d6eae1e6d9d2
+SIZE (go1.21.11.src.tar.gz) = 26994914
 SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
 SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
diff --git a/lang/go122/Makefile b/lang/go122/Makefile
index e0beadaa98b5..7c7cb1509efd 100644
--- a/lang/go122/Makefile
+++ b/lang/go122/Makefile
@@ -1,6 +1,5 @@
-DISTVERSION=	1.22.2
+DISTVERSION=	1.22.4
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
-PORTREVISION=	0
 MASTER_SITES=	https://golang.org/dl/ \
 		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
@@ -9,6 +8,7 @@ DISTFILES=	go${DISTVERSION}.src.tar.gz \
 
 # Avoid conflicting patch files
 PATCHFILES=
+PATCHDIR=	${.CURDIR}/files
 
 COMMENT=	Go programming language
 
diff --git a/lang/go122/distinfo b/lang/go122/distinfo
index 03068a85b694..c4af9a0c5092 100644
--- a/lang/go122/distinfo
+++ b/lang/go122/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1713165123
-SHA256 (go1.22.2.src.tar.gz) = 374ea82b289ec738e968267cac59c7d5ff180f9492250254784b2044e90df5a9
-SIZE (go1.22.2.src.tar.gz) = 27551470
+TIMESTAMP = 1718257204
+SHA256 (go1.22.4.src.tar.gz) = fed720678e728a7ca30ba8d1ded1caafe27d16028fab0232b8ba8e22008fb784
+SIZE (go1.22.4.src.tar.gz) = 27555503
 SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
 SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
diff --git a/lang/go122/files/patch-src_cmd_dist_build.go b/lang/go122/files/patch-src_cmd_dist_build.go
new file mode 100644
index 000000000000..59fd0c6539f8
--- /dev/null
+++ b/lang/go122/files/patch-src_cmd_dist_build.go
@@ -0,0 +1,23 @@
+--- src/cmd/dist/build.go.orig	2024-03-29 15:27:02 UTC
++++ src/cmd/dist/build.go
+@@ -891,6 +891,20 @@ func runInstall(pkg string, ch chan struct{}) {
+ 			asmArgs = append(asmArgs, "-D", "GOPPC64_power8")
+ 		}
+ 	}
++	if goarch == "arm" {
++		// Define GOARM_value from goarm, which can be either a version
++		// like "6", or a version and a FP mode, like "7,hardfloat".
++		switch {
++		case strings.Contains(goarm, "7"):
++			asmArgs = append(asmArgs, "-D", "GOARM_7")
++			fallthrough
++		case strings.Contains(goarm, "6"):
++			asmArgs = append(asmArgs, "-D", "GOARM_6")
++			fallthrough
++		default:
++			asmArgs = append(asmArgs, "-D", "GOARM_5")
++		}
++	}
+ 	goasmh := pathf("%s/go_asm.h", workdir)
+ 
+ 	// Collect symabis from assembly code.
diff --git a/lang/gomacro/Makefile b/lang/gomacro/Makefile
index b5cea9b463c0..361b67949490 100644
--- a/lang/gomacro/Makefile
+++ b/lang/gomacro/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	gomacro
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7-601
 DISTVERSIONSUFFIX=	-g9aafa23
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	lang
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/lang/gptscript/Makefile b/lang/gptscript/Makefile
index b89bd79a1d71..2b3109fbdc7c 100644
--- a/lang/gptscript/Makefile
+++ b/lang/gptscript/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gptscript
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	lang
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/lang/opensycl/Makefile b/lang/opensycl/Makefile
index 1c58094888a1..6af45cda9410 100644
--- a/lang/opensycl/Makefile
+++ b/lang/opensycl/Makefile
@@ -11,6 +11,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	fails to compile: error: static_assert failed due to requirement 'sizeof(hipsycl::glue::unique_id) == 2 * sizeof(void *)'
+BROKEN_FreeBSD_13_armv7=	configure fails: Cannot run simple program using std::filesystem
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 
diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index 3e84b20992aa..2da5dd8831e0 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php81
-DISTVERSION=	8.1.28
+DISTVERSION=	8.1.29
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -11,8 +11,8 @@ WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
-DEPRECATED=	Upstream EOL reaches on 2024-11-25
-EXPIRATION_DATE=	2024-11-26
+DEPRECATED=	Upstream EOL reaches on 2025-12-31
+EXPIRATION_DATE=	2025-12-31
 
 USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
@@ -357,11 +357,6 @@ USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
-.if ${PHP_MODNAME} == "json"
-CONFIGURE_ARGS+=	--enable-json
-BUILD_DEPENDS=		re2c:devel/re2c
-.endif
-
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
@@ -575,18 +570,6 @@ USE_GNOME=	libxml2
 USE_PHP=	dom:build
 .endif
 
-.if ${PHP_MODNAME} == "xmlrpc"
-CONFIGURE_ARGS+=	--with-iconv-dir=${LOCALBASE} \
-			--with-xmlrpc
-
-USES+=		iconv:translit
-USE_GNOME=	libxml2
-
-PHP_HEADER_DIRS=	libxmlrpc
-
-USE_PHP=	xml:build
-.endif
-
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
diff --git a/lang/php81/distinfo b/lang/php81/distinfo
index c0beb444ed21..dc21da65012f 100644
--- a/lang/php81/distinfo
+++ b/lang/php81/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713000963
-SHA256 (php-8.1.28.tar.xz) = 95d0b2e9466108fd750dab5c30a09e5c67f5ad2cb3b1ffb3625a038a755ad080
-SIZE (php-8.1.28.tar.xz) = 11848504
+TIMESTAMP = 1717709327
+SHA256 (php-8.1.29.tar.xz) = 288884af60581d4284baba2ace9ca6d646f72facbd3e3c2dd2acc7fe6f903536
+SIZE (php-8.1.29.tar.xz) = 11826292
diff --git a/lang/php81/files/php-fpm.in b/lang/php81/files/php-fpm.in
index 511e53426b71..9f753ea485e9 100644
--- a/lang/php81/files/php-fpm.in
+++ b/lang/php81/files/php-fpm.in
@@ -7,7 +7,7 @@
 #
 # Add the following line to /etc/rc.conf to enable php-fpm:
 # php-fpm_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable nginx
+#                               Set it to "YES" to enable php-fpm
 # php-fpm_profiles (str):       Set to "" by default.
 #                               Define your profiles here.
 # php_fpm_pid_prefix (str):     Set to "" by default.
@@ -32,6 +32,7 @@ load_rc_config "${name}"
 
 : ${php_fpm_enable="NO"}
 : ${php_fpm_umask=""}
+: ${php_fpm_svcj_options:="net_basic"}
 
 if [ -n "$2" ]; then
         profile="$2"
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index 15d7041e8ac7..1cdb8385392e 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -354,11 +354,6 @@ USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
-.if ${PHP_MODNAME} == "json"
-CONFIGURE_ARGS+=	--enable-json
-BUILD_DEPENDS=		re2c:devel/re2c
-.endif
-
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
diff --git a/lang/php83/Makefile b/lang/php83/Makefile
index e653aac29e4f..cc6d68e1bce2 100644
--- a/lang/php83/Makefile
+++ b/lang/php83/Makefile
@@ -372,11 +372,6 @@ USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
-.if ${PHP_MODNAME} == "json"
-CONFIGURE_ARGS+=	--enable-json
-BUILD_DEPENDS=		re2c:devel/re2c
-.endif
-
 .if ${PHP_MODNAME} == "ldap"
 LIB_DEPENDS+=libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 44c4fa1ed2c1..9f8d453d4424 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -121,7 +121,8 @@ post-patch:
 # openssl/opensslv.h so setup.py just detects the string as 00000000
 # However care should be taken for the OSVERSION. If OpenSSL 3.0.9
 # lands later the OSVERSION string should be fixed accordingly
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && (${SSL_DEFAULT} == base || ${SSL_DEFAULT:Mopenssl3*} )
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && (${SSL_DEFAULT} == base || \
+	${SSL_DEFAULT} == openssl || ${SSL_DEFAULT:Mopenssl3*} )
 	@${REINPLACE_CMD} -e 's|00907000|00000000|' \
 		${WRKSRC}/setup.py
 .endif
diff --git a/mail/aerc/Makefile b/mail/aerc/Makefile
index ca4f74109f32..abe5334eae52 100644
--- a/mail/aerc/Makefile
+++ b/mail/aerc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	aerc
 DISTVERSION=	0.16.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	mail
 
 MAINTAINER=	iamsleepy@ryuki.me
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index b3c75282e273..876d2ddb9c79 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.4.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -20,6 +20,8 @@ http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	34
 
+EXTRA_PATCHES=		${FILESDIR}/v34-CVE-2024-34055.patch:-p1
+
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
diff --git a/mail/cyrus-imapd34/files/v34-CVE-2024-34055.patch b/mail/cyrus-imapd34/files/v34-CVE-2024-34055.patch
new file mode 100644
index 000000000000..c1719ea49b28
--- /dev/null
+++ b/mail/cyrus-imapd34/files/v34-CVE-2024-34055.patch
@@ -0,0 +1,5815 @@
+From b6682068bf8c754a87f98ee59d2616d48ed756c7 Mon Sep 17 00:00:00 2001
+From: Robert Stepanek <rsto@fastmailteam.com>
+Date: Wed, 3 Jan 2024 09:51:36 +0100
+Subject: [PATCH 01/22] SearchFuzzy.pm: do not use non-standard XSNIPPETS
+ command
+
+The XSNIPPETS and XCONVMULTISTANDARD commands in Cyrus got
+deprecated, so don't keep our test using it.
+
+Signed-off-by: Robert Stepanek <rsto@fastmailteam.com>
+---
+ cassandane/Cassandane/Cyrus/SearchFuzzy.pm | 344 +++++++++------------
+ 1 file changed, 146 insertions(+), 198 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+index 1ac00dc49..dd1a369bd 100644
+--- a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
++++ b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+@@ -43,6 +43,8 @@ use warnings;
+ use Cwd qw(abs_path);
+ use DateTime;
+ use Data::Dumper;
++use MIME::Base64 qw(encode_base64);
++use Encode qw(decode encode);
+ 
+ use lib '.';
+ use base qw(Cassandane::Cyrus::TestCase);
+@@ -50,10 +52,19 @@ use Cassandane::Util::Log;
+ 
+ sub new
+ {
++
+     my ($class, @args) = @_;
+     my $config = Cassandane::Config->default()->clone();
+-    $config->set(conversations => 'on');
+-    return $class->SUPER::new({ config => $config }, @args);
++    $config->set(
++        conversations => 'on',
++        httpallowcompress => 'no',
++        httpmodules => 'jmap',
++    );
++    return $class->SUPER::new({
++        config => $config,
++        jmap => 1,
++        services => [ 'imap', 'http' ]
++    }, @args);
+ }
+ 
+ sub set_up
+@@ -134,6 +145,55 @@ sub create_testmessages
+     $self->{instance}->run_command({cyrus => 1}, 'squatter');
+ }
+ 
++sub get_snippets
++{
++    # Previous versions of this test module used XSNIPPETS to
++    # assert snippets but this command got removed from Cyrus.
++    # Use JMAP instead.
++
++    my ($self, $folder, $uids, $filter) = @_;
++
++    my $imap = $self->{store}->get_client();
++    my $jmap = $self->{jmap};
++
++    $self->assert_not_null($jmap);
++
++    $imap->select($folder);
++    my $res = $imap->fetch($uids, ['emailid']);
++    my %emailIdToImapUid = map { $res->{$_}{emailid}[0] => $_ } keys %$res;
++
++    $res = $jmap->CallMethods([
++        ['SearchSnippet/get', {
++            filter => $filter,
++            emailIds => [ keys %emailIdToImapUid ],
++        }, 'R1'],
++    ]);
++
++    my @snippets;
++    foreach (@{$res->[0][1]{list}}) {
++        if ($_->{subject}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'SUBJECT',
++                $_->{subject},
++            ]);
++        }
++        if ($_->{preview}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'BODY',
++                $_->{preview},
++            ]);
++        }
++    }
++
++    return {
++        snippets => [ sort { $a->[1] <=> $b->[1] } @snippets ],
++    };
++}
++
+ sub test_copy_messages
+     :needs_search_xapian
+ {
+@@ -151,12 +211,13 @@ sub test_copy_messages
+ }
+ 
+ sub test_stem_verbs
+-    :min_version_3_0 :needs_search_xapian
++    :min_version_3_0 :needs_search_xapian :JMAPExtensions
+ {
+     my ($self) = @_;
+     $self->create_testmessages();
+ 
+     my $talk = $self->{store}->get_client();
++    $self->assert_not_null($self->{jmap});
+ 
+     xlog $self, "Select INBOX";
+     my $r = $talk->select("INBOX") || die;
+@@ -175,11 +236,8 @@ sub test_stem_verbs
+     $r = $talk->search('fuzzy', ['subject', { Quote => "runs" }]) || die;
+     $self->assert_num_equals(3, scalar @$r);
+ 
+-    xlog $self, 'XSNIPPETS for FUZZY subject "runs"';
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'subject', { Quote => 'runs' }]
+-    ) || die;
++    xlog $self, 'Get snippets for FUZZY subject "runs"';
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'runs' });
+     $self->assert_num_equals(3, scalar @{$r->{snippets}});
+ }
+ 
+@@ -250,12 +308,8 @@ sub test_snippet_wildcard
+     $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+ 
+-    xlog $self, "XSNIPPETS for $term";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => "$term*" }]
+-    ) || die;
+-    xlog $self, Dumper($r);
++    xlog $self, "Get snippets for $term";
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => "$term*" });
+     $self->assert_num_equals(2, scalar @{$r->{snippets}});
+ }
+ 
+@@ -358,13 +412,17 @@ sub test_normalize_snippets
+     my ($self) = @_;
+ 
+     # Set up test message with funny characters
+-    my $body = "foo gären советской diĝir naïve léger";
+-    my @terms = split / /, $body;
++use utf8;
++    my @terms = ( "gären", "советской", "diĝir", "naïve", "léger" );
++no utf8;
++    my $body = encode_base64(encode('UTF-8', join(' ', @terms)));
++    $body =~ s/\r?\n/\r\n/gs;
+ 
+     xlog $self, "Generate and index test messages.";
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+@@ -380,24 +438,20 @@ sub test_normalize_snippets
+ 
+     # Assert that diacritics are matched and returned
+     foreach my $term (@terms) {
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++        $r = $self->get_snippets('INBOX', $uids, { text => $term });
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+     }
+ 
+     # Assert that search without diacritics matches
+     if ($self->{skipdiacrit}) {
+         my $term = "naive";
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>naïve</b>"), -1);
++        xlog $self, "Get snippets for FUZZY text \"$term\"";
++        $r = $self->get_snippets('INBOX', $uids, { 'text' => $term });
++use utf8;
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>naïve</mark>"), -1);
++no utf8;
+     }
++
+ }
+ 
+ sub test_skipdiacrit
+@@ -499,38 +553,23 @@ sub test_snippets_termcover
+     my $r = $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-    my $want = "<b>favourite</b> <b>cereal</b>";
++    my $want = "<mark>favourite</mark> <mark>cereal</mark>";
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite',
+-           'fuzzy', 'text', 'cereal',
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        operator => 'AND',
++        conditions => [{
++            text => 'favourite',
++        }, {
++           text => 'cereal',
++        }, {
++           text => '"bogus gnarly"'
++        }],
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite cereal'
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    # Regression - a phrase is treated as a loose term
+-    $r = $talk->xsnippets( [ [ 'INBOX', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite nope cereal' },
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite cereal' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        text => 'favourite cereal',
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ }
+ 
+@@ -542,18 +581,28 @@ sub test_cjk_words
+ 
+     xlog $self, "Generate and index test messages.";
+ 
++use utf8;
+     my $body = "明末時已經有香港地方的概念";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+     # Splits into the words: "み, 円, 月額, 申込
++use utf8;
+     $body = "申込み！月額円";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("2", %params) || die;
+ 
+@@ -569,50 +618,45 @@ sub test_cjk_words
+ 
+     my $term;
+     # Search for a two-character CJK word
++use utf8;
+     $term = "已經";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
+-    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
++    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+ 
+     # Search for the CJK words 明末 and 時, note that the
+     # word order is reversed to the original message
++use utf8;
+     $term = "時明末";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ 
+     # Search for the partial CJK word 月
++use utf8;
+     $term = "月";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for the interleaved, partial CJK word 額申
++use utf8;
+     $term = "額申";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for three of four words: "み, 月額, 申込",
+     # in different order than the original.
++use utf8;
+     $term = "月額み申込";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ }
+ 
+@@ -805,86 +849,6 @@ sub test_xattachmentname
+ }
+ 
+ 
+-sub test_xapianv2
+-    :min_version_3_0 :needs_search_xapian
+-{
+-    my ($self) = @_;
+-
+-    my $talk = $self->{store}->get_client();
+-
+-    # This is a smallish regression test to check if we break something
+-    # obvious by moving Xapian indexing from folder:uid to message guids.
+-    #
+-    # Apart from the tests in this module, at least also the following
+-    # imodules are relevant: Metadata for SORT, Thread for THREAD.
+-
+-    xlog $self, "Generate message";
+-    my $r = $self->make_message("I run", body => "Run, Forrest! Run!" ) || die;
+-    my $uid = $r->{attrs}->{uid};
+-
+-    xlog $self, "Copy message into INBOX";
+-    $talk->copy($uid, "INBOX");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Create target mailbox";
+-    $talk->create("INBOX.target");
+-
+-    xlog $self, "Copy message into INBOX.target";
+-    $talk->copy($uid, "INBOX.target");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(3, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Generate message";
+-    $self->make_message("You run", body => "A running joke" ) || die;
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}});
+-
+-    xlog $self, "SEARCH FUZZY";
+-    $r = $talk->search(
+-        "charset", "utf-8", "fuzzy", "text", "run",
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @$r);
+-
+-    xlog $self, "Select INBOX";
+-    $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-
+-    xlog $self, "XSNIPPETS";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'body', 'run'],
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @{$r->{snippets}});
+-}
+-
+ sub test_snippets_escapehtml
+     :min_version_3_0 :needs_search_xapian
+ {
+@@ -914,21 +878,15 @@ sub test_snippets_escapehtml
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+     my %m;
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test1' ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test1' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test1</b> body with the same tag as snippets", $m{body});
+-    $self->assert_str_equals("<b>Test1</b> subject with an unescaped &amp; in it", $m{subject});
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test2' ]
+-    ) || die;
++    $self->assert_str_equals("<mark>Test1</mark> body with the same tag as snippets", $m{body});
++    $self->assert_str_equals("<mark>Test1</mark> subject with an unescaped &amp; in it", $m{subject});
+ 
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test2' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test2</b> body with a &lt;tag/&gt;, although it's plain text", $m{body});
+-    $self->assert_str_equals("<b>Test2</b> subject with a &lt;tag&gt; in it", $m{subject});
++    $self->assert_str_equals("<mark>Test2</mark> body with a &lt;tag/&gt;, although it's plain text", $m{body});
++    $self->assert_str_equals("<mark>Test2</mark> subject with a &lt;tag&gt; in it", $m{subject});
+ }
+ 
+ sub test_search_exactmatch
+@@ -963,13 +921,10 @@ sub test_search_exactmatch
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { body => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert(index($m{body}, "<b>some text</b>") != -1);
+-    $self->assert(index($m{body}, "<b>some</b> long <b>text</b>") == -1);
++    $self->assert(index($m{body}, "<mark>some text</mark>") != -1);
++    $self->assert(index($m{body}, "<mark>some</mark> long <mark>text</mark>") == -1);
+ }
+ 
+ sub test_search_subjectsnippet
+@@ -1004,10 +959,7 @@ sub test_search_subjectsnippet
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { text => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+     $self->assert_matches(qr/^\[plumbing\]/, $m{subject});
+ }
+@@ -1317,11 +1269,10 @@ sub test_detect_language
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', 'atmet' ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <b>atmeten</b>.'));
++    $r = $self->get_snippets('INBOX', $uids, { body => 'atmet' });
++use utf8;
++    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <mark>atmeten</mark>.'));
++no utf8;
+ }
+ 
+ sub test_detect_language_subject
+@@ -1377,12 +1328,9 @@ sub test_detect_language_subject
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'subject', 'Landschaft' ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'Landschaft' });
+     $self->assert_str_equals(
+-        'A subject with the German word <b>Landschaften</b>',
++        'A subject with the German word <mark>Landschaften</mark>',
+         $r->{snippets}[0][3]
+     );
+ }
+-- 
+2.39.2
+
+
+From 00aafb0fd51aaac1badc3370a250605cff4313b0 Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@fastmail.fm>
+Date: Fri, 20 Nov 2020 11:24:58 +1100
+Subject: [PATCH 02/22] imapd: maxsize for appends
+
+---
+ imap/imapd.c    | 4 ++++
+ lib/imapoptions | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index a617ff80c..48055ccce 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3829,6 +3829,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     const char *parseerr = NULL, *url = NULL;
+     struct appendstage *curstage;
+     mbentry_t *mbentry = NULL;
++    size_t maxsize = config_getint(IMAPOPT_APPEND_MAXSIZE) * 1024;
++    if (!maxsize) maxsize = UINT32_MAX;
+ 
+     memset(&appendstate, 0, sizeof(struct appendstate));
+ 
+@@ -4004,12 +4006,14 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             size = 0;
+             r = append_catenate(curstage->f, cur_name, &size,
+                                 &(curstage->binary), &parseerr, &url);
++            if (!r && size > maxsize) r = IMAP_MESSAGE_TOO_LARGE;
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+             r = getliteralsize(arg.s, c, &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
++            if (!r && size > maxsize) r = IMAP_MESSAGE_TOO_LARGE;
+             if (r) goto done;
+ 
+             /* Copy message to stage */
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 5cb8ef7b8..786b288fe 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -296,6 +296,10 @@ Blank lines and lines beginning with ``#'' are ignored.
+    but might be useful in the meantime for supporting old clients that
+    do not implement the RFC 5464 IMAP METADATA extension. */
+ 
++{ "append_maxsize", 0, INT, "3.3.2" }
++/* The size in kilobytes of the largest message that can be appended
++   via IMAP.  If zero, no limit (i.e UINT32_MAX) */
++
+ { "aps_topic", NULL, STRING, "3.0.0" }
+ /* Topic for Apple Push Service registration. */
+ { "aps_topic_caldav", NULL, STRING, "3.0.0" }
+-- 
+2.39.2
+
+
+From 02f158782578d4d99e0915c317ffe9d339180cca Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@fastmail.fm>
+Date: Fri, 20 Nov 2020 12:54:58 +1100
+Subject: [PATCH 03/22] imapd: push the maxsize down into each parser to avoid
+ spooling
+
+---
+ imap/imap_proxy.c |  7 ++++++-
+ imap/imap_proxy.h |  2 +-
+ imap/imapd.c      | 42 ++++++++++++++++++------------------------
+ imap/index.c      |  7 ++++++-
+ imap/index.h      |  2 +-
+ 5 files changed, 32 insertions(+), 28 deletions(-)
+
+diff --git a/imap/imap_proxy.c b/imap/imap_proxy.c
+index fb585e680..2dac80455 100644
+--- a/imap/imap_proxy.c
++++ b/imap/imap_proxy.c
+@@ -1207,7 +1207,7 @@ void proxy_copy(const char *tag, char *sequence, char *name, int myrights,
+ /* xxx  end of separate proxy-only code */
+ 
+ int proxy_catenate_url(struct backend *s, struct imapurl *url, FILE *f,
+-                       unsigned long *size, const char **parseerr)
++                       size_t maxsize, unsigned long *size, const char **parseerr)
+ {
+     char mytag[128];
+     int c, r = 0, found = 0;
+@@ -1309,6 +1309,11 @@ int proxy_catenate_url(struct backend *s, struct imapurl *url, FILE *f,
+                     if (c == '}') c = prot_getc(s->in);
+                     if (c == '\r') c = prot_getc(s->in);
+                     if (c != '\n') c = EOF;
++                    if (sz > maxsize) {
++                        r = IMAP_MESSAGE_TOO_LARGE;
++                        eatline(s->in, c);
++                        goto next_resp;
++                    }
+                 }
+                 else if (c == 'n' || c == 'N') {
+                     c = chomp(s->in, "il");
+diff --git a/imap/imap_proxy.h b/imap/imap_proxy.h
+index aa2170960..89cb02002 100644
+--- a/imap/imap_proxy.h
++++ b/imap/imap_proxy.h
+@@ -86,7 +86,7 @@ void proxy_copy(const char *tag, char *sequence, char *name, int myrights,
+                 int usinguid, struct backend *s);
+ 
+ int proxy_catenate_url(struct backend *s, struct imapurl *url, FILE *f,
+-                       unsigned long *size, const char **parseerr);
++                       size_t maxsize, unsigned long *size, const char **parseerr);
+ 
+ int annotate_fetch_proxy(const char *server, const char *mbox_pat,
+                          const strarray_t *entry_pat,
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 48055ccce..2e55a6285 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3534,7 +3534,7 @@ static int isokflag(char *s, int *isseen)
+     }
+ }
+ 
+-static int getliteralsize(const char *p, int c,
++static int getliteralsize(const char *p, int c, size_t maxsize,
+                           unsigned *size, int *binary, const char **parseerr)
+ 
+ {
+@@ -3573,6 +3573,9 @@ static int getliteralsize(const char *p, int c,
+         return IMAP_PROTOCOL_ERROR;
+     }
+ 
++    if (num > maxsize)
++        return IMAP_MESSAGE_TOO_LARGE;
++
+     if (!isnowait) {
+         /* Tell client to send the message */
+         prot_printf(imapd_out, "+ go ahead\r\n");
+@@ -3584,7 +3587,7 @@ static int getliteralsize(const char *p, int c,
+     return 0;
+ }
+ 
+-static int catenate_text(FILE *f, unsigned *totalsize, int *binary,
++static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *binary,
+                          const char **parseerr)
+ {
+     int c;
+@@ -3597,11 +3600,9 @@ static int catenate_text(FILE *f, unsigned *totalsize, int *binary,
+     c = getword(imapd_in, &arg);
+ 
+     /* Read size from literal */
+-    r = getliteralsize(arg.s, c, &size, binary, parseerr);
++    r = getliteralsize(arg.s, c, maxsize - *totalsize, &size, binary, parseerr);
+     if (r) return r;
+ 
+-    if (*totalsize > UINT_MAX - size) r = IMAP_MESSAGE_TOO_LARGE;
+-
+     /* Catenate message part to stage */
+     while (size) {
+         n = prot_read(imapd_in, buf, size > 4096 ? 4096 : size);
+@@ -3629,7 +3630,7 @@ static int catenate_text(FILE *f, unsigned *totalsize, int *binary,
+ }
+ 
+ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+-                        unsigned *totalsize, const char **parseerr)
++                        size_t maxsize, unsigned *totalsize, const char **parseerr)
+ {
+     struct imapurl url;
+     struct index_state *state;
+@@ -3668,11 +3669,8 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+                                  proxy_userid, &backend_cached,
+                                  &backend_current, &backend_inbox, imapd_in);
+             if (be) {
+-                r = proxy_catenate_url(be, &url, f, &size, parseerr);
+-                if (*totalsize > UINT_MAX - size)
+-                    r = IMAP_MESSAGE_TOO_LARGE;
+-                else
+-                    *totalsize += size;
++                r = proxy_catenate_url(be, &url, f, maxsize - *totalsize, &size, parseerr);
++                *totalsize += size;
+             }
+             else
+                 r = IMAP_SERVER_UNAVAILABLE;
+@@ -3727,14 +3725,12 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+         struct protstream *s = prot_new(fileno(f), 1);
+ 
+         r = index_urlfetch(state, msgno, 0, url.section,
+-                           url.start_octet, url.octet_count, s, &size);
++                           url.start_octet, url.octet_count, s,
++                           maxsize - *totalsize, &size);
+         if (r == IMAP_BADURL)
+             *parseerr = "No such message part";
+         else if (!r) {
+-            if (*totalsize > UINT_MAX - size)
+-                r = IMAP_MESSAGE_TOO_LARGE;
+-            else
+-                *totalsize += size;
++            *totalsize += size;
+         }
+ 
+         prot_flush(s);
+@@ -3751,7 +3747,7 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+     return r;
+ }
+ 
+-static int append_catenate(FILE *f, const char *cur_name, unsigned *totalsize,
++static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsigned *totalsize,
+                            int *binary, const char **parseerr, const char **url)
+ {
+     int c, r = 0;
+@@ -3765,7 +3761,7 @@ static int append_catenate(FILE *f, const char *cur_name, unsigned *totalsize,
+         }
+ 
+         if (!strcasecmp(arg.s, "TEXT")) {
+-            int r1 = catenate_text(f, totalsize, binary, parseerr);
++            int r1 = catenate_text(f, maxsize, totalsize, binary, parseerr);
+             if (r1) return r1;
+ 
+             /* if we see a SP, we're trying to catenate more than one part */
+@@ -3781,7 +3777,7 @@ static int append_catenate(FILE *f, const char *cur_name, unsigned *totalsize,
+             }
+ 
+             if (!r) {
+-                r = catenate_url(arg.s, cur_name, f, totalsize, parseerr);
++                r = catenate_url(arg.s, cur_name, f, maxsize, totalsize, parseerr);
+                 if (r) {
+                     *url = arg.s;
+                     return r;
+@@ -4004,16 +4000,14 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, &size,
++            r = append_catenate(curstage->f, cur_name, maxsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+-            if (!r && size > maxsize) r = IMAP_MESSAGE_TOO_LARGE;
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(arg.s, c, maxsize, &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+-            if (!r && size > maxsize) r = IMAP_MESSAGE_TOO_LARGE;
+             if (r) goto done;
+ 
+             /* Copy message to stage */
+@@ -14010,7 +14004,7 @@ static void cmd_urlfetch(char *tag)
+         } else {
+             r = index_urlfetch(state, msgno, params, url.section,
+                                url.start_octet, url.octet_count,
+-                               imapd_out, NULL);
++                               imapd_out, UINT32_MAX, NULL);
+         }
+ 
+     err:
+diff --git a/imap/index.c b/imap/index.c
+index ef537aa55..35ca866aa 100644
+--- a/imap/index.c
++++ b/imap/index.c
+@@ -4550,7 +4550,7 @@ static int index_fetchreply(struct index_state *state, uint32_t msgno,
+ EXPORTED int index_urlfetch(struct index_state *state, uint32_t msgno,
+                    unsigned params, const char *section,
+                    unsigned long start_octet, unsigned long octet_count,
+-                   struct protstream *pout, unsigned long *outsize)
++                   struct protstream *pout, size_t maxsize, unsigned long *outsize)
+ {
+     /* dumbass eM_Client sends this:
+      * A4 APPEND "INBOX.Junk Mail" () "14-Jul-2013 17:01:02 +0000"
+@@ -4723,6 +4723,11 @@ EXPORTED int index_urlfetch(struct index_state *state, uint32_t msgno,
+         n = size - start_octet;
+     }
+ 
++    if (n > maxsize) {
++        r = IMAP_MESSAGE_TOO_LARGE;
++        goto done;
++    }
++
+     if (outsize) {
+         /* Return size (CATENATE) */
+         *outsize = n;
+diff --git a/imap/index.h b/imap/index.h
+index 196607f3f..bf8006d9b 100644
+--- a/imap/index.h
++++ b/imap/index.h
+@@ -303,7 +303,7 @@ extern struct seqset *index_vanished(struct index_state *state,
+ extern int index_urlfetch(struct index_state *state, uint32_t msgno,
+                           unsigned params, const char *section,
+                           unsigned long start_octet, unsigned long octet_count,
+-                          struct protstream *pout, unsigned long *size);
++                          struct protstream *pout, size_t maxsize, unsigned long *size);
+ extern char *index_get_msgid(struct index_state *state, uint32_t msgno);
+ extern struct nntp_overview *index_overview(struct index_state *state,
+                                             uint32_t msgno);
+-- 
+2.39.2
+
+
+From 133a11ebfd9e3f659da3081d8e7c9f416c8ead3b Mon Sep 17 00:00:00 2001
+From: Bron Gondwana <brong@fastmail.fm>
+Date: Tue, 1 Dec 2020 08:11:31 +1100
+Subject: [PATCH 04/22] use maxmessagesize rather than our own config option
+
+---
+ imap/imapd.c    | 2 +-
+ lib/imapoptions | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 2e55a6285..d9a9dd776 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3825,7 +3825,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     const char *parseerr = NULL, *url = NULL;
+     struct appendstage *curstage;
+     mbentry_t *mbentry = NULL;
+-    size_t maxsize = config_getint(IMAPOPT_APPEND_MAXSIZE) * 1024;
++    size_t maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE) * 1024;
+     if (!maxsize) maxsize = UINT32_MAX;
+ 
+     memset(&appendstate, 0, sizeof(struct appendstate));
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 786b288fe..5cb8ef7b8 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -296,10 +296,6 @@ Blank lines and lines beginning with ``#'' are ignored.
+    but might be useful in the meantime for supporting old clients that
+    do not implement the RFC 5464 IMAP METADATA extension. */
+ 
+-{ "append_maxsize", 0, INT, "3.3.2" }
+-/* The size in kilobytes of the largest message that can be appended
+-   via IMAP.  If zero, no limit (i.e UINT32_MAX) */
+-
+ { "aps_topic", NULL, STRING, "3.0.0" }
+ /* Topic for Apple Push Service registration. */
+ { "aps_topic_caldav", NULL, STRING, "3.0.0" }
+-- 
+2.39.2
+
+
+From ddc431769b61eef06550da624c1c99a2fd620dbb Mon Sep 17 00:00:00 2001
+From: ellie timoney <ellie@fastmail.com>
+Date: Wed, 27 Mar 2024 11:31:58 +1100
+Subject: [PATCH 05/22] imapd: read maxmsgsize once at startup
+
+Based on:
+40793dfde8c96797d86f80e9f461bea61bca3bc9 imapd.c: Advertise APPENDLIMIT= capability
+
+but without introducing the APPENDLIMIT= capability
+---
+ imap/imapd.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index d9a9dd776..e7cf600c7 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -135,6 +135,7 @@ static int imaps = 0;
+ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
++static size_t maxsize = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -908,6 +909,9 @@ int service_init(int argc, char **argv, char **envp)
+ 
+     prometheus_increment(CYRUS_IMAP_READY_LISTENERS);
+ 
++    maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE) * 1024;
++    if (!maxsize) maxsize = UINT32_MAX;
++
+     return 0;
+ }
+ 
+@@ -3825,8 +3829,6 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     const char *parseerr = NULL, *url = NULL;
+     struct appendstage *curstage;
+     mbentry_t *mbentry = NULL;
+-    size_t maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE) * 1024;
+-    if (!maxsize) maxsize = UINT32_MAX;
+ 
+     memset(&appendstate, 0, sizeof(struct appendstate));
+ 
+-- 
+2.39.2
+
+
+From a32fe042bc503a36393e7d888b26b6c1759cf6b0 Mon Sep 17 00:00:00 2001
+From: Matthew Horsfall <wolfsage@gmail.com>
+Date: Wed, 15 Jun 2022 14:57:02 -0400
+Subject: [PATCH 06/22] imap/imapd.c: IMAPOPT_MAXMESSAGESIZE is bytes, not
+ kilobytes
+
+I think this was a mistake added in bf28aa3fb6 when replacing
+IMAPOPT_APPEND_MAXSIZE.
+
+Signed-off-by: Matthew Horsfall <wolfsage@gmail.com>
+---
+ imap/imapd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index e7cf600c7..ce8c6f675 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -909,7 +909,7 @@ int service_init(int argc, char **argv, char **envp)
+ 
+     prometheus_increment(CYRUS_IMAP_READY_LISTENERS);
+ 
+-    maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE) * 1024;
++    maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+     if (!maxsize) maxsize = UINT32_MAX;
+ 
+     return 0;
+-- 
+2.39.2
+
+
+From 2139228a5f43371258e1c460d0db509dcae7a4aa Mon Sep 17 00:00:00 2001
+From: ellie timoney <ellie@fastmail.com>
+Date: Wed, 20 Jan 2021 13:25:16 +1100
+Subject: [PATCH 07/22] tools/config2header: allow "UNRELEASED" as imapoptions
+ version string
+
+---
+ tools/config2header | 26 ++++++++++++++++++++++++--
+ 1 file changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/tools/config2header b/tools/config2header
+index 98418e147..4393e06e0 100755
+--- a/tools/config2header
++++ b/tools/config2header
+@@ -128,6 +128,7 @@ EXPORTED struct imapopt_s imapopts[] =
+ EOF
+     ;
+ 
++my $__warned_unreleased = 0;
+ sub parse_last_modified
+ {
+     my ($version) = @_;
+@@ -141,6 +142,23 @@ sub parse_last_modified
+ 
+         return sprintf "0x%2.2X%2.2X%2.2X00", $maj, $min, $rev;
+     }
++    elsif ($version eq 'UNRELEASED') {
++        if (not $__warned_unreleased) {
++            # This warning is to remind the release manager to replace
++            # "UNRELEASED" strings in lib/imapoptions with the version
++            # number that is about to be released.
++            # If you're not building a release, ignore it. :)
++            my $w = join q{ },
++                    "$0:",
++                    -t STDERR ? "\033[33;1mwarning:\033[0m" : 'warning:',
++                    'build contains UNRELEASED config options';
++            print STDERR "$w\n";
++
++            $__warned_unreleased ++;
++        }
++
++        return "0xFFFFFFFF";
++    }
+     else {
+         die "unparseable version: $version";
+     }
+@@ -301,15 +319,19 @@ while (<STDIN>) {
+             # option is deprecated
+             if ($6 =~ m|
+                     ,\s*            # comma and optional whitespace
+-                    (\"[^,]+\")     # $1: 'deprecated since' version string
++                    \"([^,]+)\"     # $1: 'deprecated since' version string
+                     \s*             # optional whitespace
+                     (               # $2: (unused)
+                         ,\s*        # comma and optional whitespace
+                         \"(.+)\"    # $3: 'in favour of' option name
+                     )?
+                 |x) {
+-                $depver = $1;
++                $depver = qq{"$1"};
+                 $newopt = $3 if $3;
++
++                # we don't use the parsed value here, but we do still want to
++                # detect and report if "UNRELEASED" is seen
++                (undef) = parse_last_modified($1);
+             } else {
+                 #chomp;
+                 #print "rejected '$6'\n";
+-- 
+2.39.2
+
+
+From 75533e89b6fa79695b6f2cc0aec28add82660419 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:00:00 -0500
+Subject: [PATCH 08/22] imapd.c: UIDVALIDITY should be uint32_t and parse it as
+ such
+
+---
+ imap/imapd.c | 10 +++-------
+ imap/index.h |  2 +-
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index ce8c6f675..f3ccf2006 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -4256,15 +4256,11 @@ static void cmd_select(char *tag, char *cmd, char *name)
+             }
+             else if ((client_capa & CAPA_QRESYNC) &&
+                      !strcmp(arg.s, "QRESYNC")) {
+-                char *p;
+-
+                 if (c != ' ') goto badqresync;
+                 c = prot_getc(imapd_in);
+                 if (c != '(') goto badqresync;
+-                c = getastring(imapd_in, imapd_out, &arg);
+-                v->uidvalidity = strtoul(arg.s, &p, 10);
+-                if (*p || !v->uidvalidity || v->uidvalidity == ULONG_MAX) goto badqresync;
+-                if (c != ' ') goto badqresync;
++                c = getuint32(imapd_in, &v->uidvalidity);
++                if (c != ' ' || !v->uidvalidity) goto badqresync;
+                 c = getmodseq(imapd_in, &v->modseq);
+                 if (c == EOF) goto badqresync;
+                 if (c == ' ') {
+@@ -4404,7 +4400,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         prot_printf(backend_current->out, "%s %s {" SIZE_T_FMT "+}\r\n%s",
+                     tag, cmd, strlen(name), name);
+         if (v->uidvalidity) {
+-            prot_printf(backend_current->out, " (QRESYNC (%lu " MODSEQ_FMT,
++            prot_printf(backend_current->out, " (QRESYNC (%u " MODSEQ_FMT,
+                         v->uidvalidity, v->modseq);
+             if (v->sequence) {
+                 prot_printf(backend_current->out, " %s", v->sequence);
+diff --git a/imap/index.h b/imap/index.h
+index bf8006d9b..5530ed61a 100644
+--- a/imap/index.h
++++ b/imap/index.h
+@@ -72,7 +72,7 @@ extern unsigned client_capa;
+ struct message;
+ 
+ struct vanished_params {
+-    unsigned long uidvalidity;
++    uint32_t uidvalidity;
+     modseq_t modseq;
+     const char *match_seq;
+     const char *match_uid;
+-- 
+2.39.2
+
+
+From 9b6bc78da02d04a5fc639fd557c49922066409ab Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 08:13:05 -0500
+Subject: [PATCH 09/22] imapd.c: consolidate ID field-value parse error
+ response
+
+---
+ imap/imapd.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index f3ccf2006..7bbb99740 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3085,19 +3085,12 @@ static void cmd_id(char *tag)
+ 
+             /* get field name */
+             c = getstring(imapd_in, imapd_out, &field);
+-            if (c != ' ') {
++            if (c != ' ' ||
++                /* get field value */
++                (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
++                (c != ' ' && c != ')')) {
+                 prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing field name in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
+-                return;
+-            }
+-
+-            /* get field value */
+-            c = getnstring(imapd_in, imapd_out, &arg);
+-            if (c != ' ' && c != ')') {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing value in Id\r\n",
++                            "%s BAD Invalid field-value pair in Id\r\n",
+                             tag);
+                 eatline(imapd_in, c);
+                 return;
+-- 
+2.39.2
+
+
+From 64521529535738a933041e5b4c41a454df65b8dc Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:12:41 -0500
+Subject: [PATCH 10/22] imapd.c: response code in fatal() string MUST
+ immediately follow "* BYE"
+
+---
+ imap/imapd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 7bbb99740..c3b9b42ea 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1182,7 +1182,8 @@ EXPORTED void fatal(const char *s, int code)
+     }
+     recurse_code = code;
+     if (imapd_out) {
+-        prot_printf(imapd_out, "* BYE Fatal error: %s\r\n", s);
++        prot_printf(imapd_out, "* BYE %s%s\r\n",
++                    *s == '[' /* resp-text-code */ ? "" : "Fatal error: ", s);
+         prot_flush(imapd_out);
+     }
+     if (stages.count) {
+-- 
+2.39.2
+
+
+From afd1e5f4ceb98b6caf0ee01b83f61468ccb1ca96 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 11:00:19 -0500
+Subject: [PATCH 11/22] imapparse.c: include [TOOBIG] response code for
+ oversized word/qstring
+
+---
+ imap/imapparse.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index b2852a357..e8e6f1b94 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_IOERR);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
+             }
+         }
+ 
+@@ -212,6 +212,9 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                     return c;
+                 }
+                 buf_putc(buf, c);
++                if (config_maxword && buf_len(buf) > config_maxword) {
++                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                }
+                 c = prot_getc(pin);
+             }
+             /* never gets here */
+-- 
+2.39.2
+
+
+From 23d153f65745bba51c70a92644cf0d5ea286539f Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 13:31:11 -0500
+Subject: [PATCH 12/22] imapparse.c: fatal() when a client violates LITERAL-
+ limit
+
+---
+ imap/imap_err.et | 3 +++
+ imap/imapparse.c | 7 +++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 8d6ca361e..eab15f0b1 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,9 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_MINUS_TOO_LARGE,
++   "[TOOBIG] Non-synchronizing literal size exceeds 4K"
++
+ ec IMAP_USERFLAG_EXHAUSTED,
+    "Too many user flags in mailbox"
+ 
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index e8e6f1b94..80b29354c 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -153,8 +153,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         buf_reset(buf);
+         c = getint32(pin, &len);
+         if (c == '+') {
+-            // LITERAL- says maximum size is 4096!
+-            if (lminus && len > 4096) return EOF;
++            /* LITERAL- says maximum size is 4096! */
++            if (lminus && len > 4096) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+-- 
+2.39.2
+
+
+From f4827451e59bc04169ab462c3805f72e9dd134c4 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 12 Feb 2024 10:54:03 -0500
+Subject: [PATCH 13/22] Cleanup and document the use of prot_setisclient()
+
+Only IMAP(-like) clients send LITERAL+ syntax
+---
+ backup/backupd.c       | 3 +--
+ backup/lcb.c           | 1 -
+ backup/lcb_read.c      | 2 --
+ backup/lcb_verify.c    | 2 --
+ cunit/getxstring.testc | 4 ----
+ imap/append.c          | 1 -
+ imap/backend.c         | 2 --
+ imap/cyr_dbtool.c      | 1 -
+ imap/dlist.c           | 5 ++++-
+ imap/imapd.c           | 4 ++++
+ imap/imapparse.c       | 5 +++--
+ imap/message.c         | 3 ---
+ imap/mupdate.c         | 3 +++
+ imap/sync_server.c     | 3 +--
+ imap/sync_support.c    | 4 ----
+ lib/prot.h             | 2 +-
+ 16 files changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/backup/backupd.c b/backup/backupd.c
+index e34c8ab3a..275711bb3 100644
+--- a/backup/backupd.c
++++ b/backup/backupd.c
+@@ -229,9 +229,8 @@ EXPORTED int service_main(int argc __attribute__((unused)),
+     backupd_in = prot_new(0, 0);
+     backupd_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow use of LITERAL+ */
+     prot_setisclient(backupd_in, 1);
+-    prot_setisclient(backupd_out, 1);
+ 
+     /* Find out name of client host */
+     backupd_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/backup/lcb.c b/backup/lcb.c
+index 53bf8dc21..8f0de3b8f 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -595,7 +595,6 @@ EXPORTED int backup_reindex(const char *name,
+             fprintf(out, "\nfound chunk at offset " OFF_T_FMT "\n\n", member_offset);
+ 
+         struct protstream *member = prot_readcb(_prot_fill_cb, gzuc);
+-        prot_setisclient(member, 1); /* don't sync literals */
+ 
+         // FIXME stricter timestamp sequence checks
+         time_t member_start_ts = -1;
+diff --git a/backup/lcb_read.c b/backup/lcb_read.c
+index 201b59696..cc9410242 100644
+--- a/backup/lcb_read.c
++++ b/backup/lcb_read.c
+@@ -113,7 +113,6 @@ EXPORTED int backup_read_message_data(struct backup *backup,
+     if (r) return r;
+ 
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+     r = parse_backup_line(ps, NULL, NULL, &dl);
+     prot_free(ps);
+ 
+@@ -203,7 +202,6 @@ EXPORTED int backup_prepare_message_upload(struct backup *backup,
+         if (!r) {
+             struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+             int c;
+-            prot_setisclient(ps, 1); /* don't sync literals */
+             c = parse_backup_line(ps, NULL, NULL, &dl);
+             prot_free(ps);
+             ps = NULL;
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index 45a08bb66..a59984471 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -228,7 +228,6 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+         if (r) return r;
+ 
+         struct protstream *ps = prot_readcb(_prot_fill_cb, vmrock->gzuc);
+-        prot_setisclient(ps, 1); /* don't sync literals */
+         r = parse_backup_line(ps, NULL, NULL, &dl);
+ 
+         if (r == EOF) {
+@@ -527,7 +526,6 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+         goto done;
+     }
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+ 
+     struct buf cmd = BUF_INITIALIZER;
+     while (1) {
+diff --git a/cunit/getxstring.testc b/cunit/getxstring.testc
+index 3de9b8569..5946c5676 100644
+--- a/cunit/getxstring.testc
++++ b/cunit/getxstring.testc
+@@ -72,9 +72,6 @@ static int tear_down(void)
+ 
+ /*
+  * Run a single testcase.
+- *
+- * Note: prot_setisclient() turns off off literal synchronising so
+- * we don't have to futz around with testing that.
+  */
+ #define _TESTCASE_PRE(fut, input, retval, consumed)                 \
+     do {                                                            \
+@@ -83,7 +80,6 @@ static int tear_down(void)
+         int c;                                                      \
+         p = prot_readmap(input, sizeof(input)-1);                   \
+         CU_ASSERT_PTR_NOT_NULL_FATAL(p);                            \
+-        prot_setisclient(p, 1);                                     \
+         c = fut(p, NULL, &b);                                       \
+         CU_ASSERT_EQUAL(c, retval);                                 \
+         if (consumed >= 0) {                                        \
+diff --git a/imap/append.c b/imap/append.c
+index 55eb140b0..81526b09b 100644
+--- a/imap/append.c
++++ b/imap/append.c
+@@ -436,7 +436,6 @@ static int callout_receive_reply(const char *callout,
+     }
+ 
+     p = prot_new(fd, /*write*/0);
+-    prot_setisclient(p, 1);
+ 
+     /* read and parse the reply as a dlist */
+     c = dlist_parse(results, /*parsekeys*/0, /*isbackup*/0, p);
+diff --git a/imap/backend.c b/imap/backend.c
+index 08429c915..4d4af461e 100644
+--- a/imap/backend.c
++++ b/imap/backend.c
+@@ -955,7 +955,6 @@ EXPORTED struct backend *backend_connect_pipe(int infd, int outfd,
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+@@ -1153,7 +1152,6 @@ EXPORTED struct backend *backend_connect(struct backend *ret_backend, const char
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+diff --git a/imap/cyr_dbtool.c b/imap/cyr_dbtool.c
+index 56cb4dd92..3f750149c 100644
+--- a/imap/cyr_dbtool.c
++++ b/imap/cyr_dbtool.c
+@@ -155,7 +155,6 @@ static void batch_commands(struct db *db)
+     int r = 0;
+ 
+     prot_setisclient(in, 1);
+-    prot_setisclient(out, 1);
+ 
+     while (1) {
+         buf_reset(&cmd);
+diff --git a/imap/dlist.c b/imap/dlist.c
+index 8a3a975b4..5d2782356 100644
+--- a/imap/dlist.c
++++ b/imap/dlist.c
+@@ -1167,7 +1167,10 @@ EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey, int isbackup,
+     struct dlist *dl = NULL;
+ 
+     stream = prot_readmap(base, len);
+-    prot_setisclient(stream, 1); /* don't sync literals */
++
++    /* Allow LITERAL+ - this is silly, but required to parse personal CALDATA */
++    prot_setisclient(stream, 1);
++
+     c = dlist_parse(&dl, parsekey, isbackup, stream);
+     prot_free(stream);
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index c3b9b42ea..abf0e7153 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -953,6 +953,10 @@ int service_main(int argc __attribute__((unused)),
+ 
+     imapd_in = prot_new(0, 0);
+     imapd_out = prot_new(1, 1);
++
++    /* Allow LITERAL+ */
++    prot_setisclient(imapd_in, 1);
++
+     protgroup_insert(protin, imapd_in);
+ 
+     /* Find out name of client host */
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 80b29354c..14e6be226 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -149,10 +149,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         /* Literal */
+-        isnowait = pin->isclient;
++        isnowait = !pin->isclient;
+         buf_reset(buf);
+         c = getint32(pin, &len);
+-        if (c == '+') {
++
++        if (pin->isclient && c == '+') {
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+diff --git a/imap/message.c b/imap/message.c
+index 30e2003d1..b9ccb1b0d 100644
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -3371,7 +3371,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read envelope response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_ENVELOPE),
+                         cacheitem_size(record, CACHE_ENVELOPE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_envelope(strm, *body);
+     prot_free(strm);
+@@ -3379,7 +3378,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read bodystructure response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_BODYSTRUCTURE),
+                         cacheitem_size(record, CACHE_BODYSTRUCTURE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_body(strm, *body, NULL);
+     prot_free(strm);
+@@ -4646,7 +4644,6 @@ static int message_parse_cbodystructure(message_t *m)
+                         cacheitem_size(&m->record, CACHE_BODYSTRUCTURE));
+     if (!prot)
+         return IMAP_MAILBOX_BADFORMAT;
+-    prot_setisclient(prot, 1);  /* don't crash parsing literals */
+ 
+     m->body = xzmalloc(sizeof(struct body));
+     r = parse_bodystructure_part(prot, m->body, NULL);
+diff --git a/imap/mupdate.c b/imap/mupdate.c
+index eef0f4b83..f6087e019 100644
+--- a/imap/mupdate.c
++++ b/imap/mupdate.c
+@@ -249,6 +249,9 @@ static struct conn *conn_new(int fd)
+     C->pin = prot_new(C->fd, 0);
+     C->pout = prot_new(C->fd, 1);
+ 
++    /* Allow LITERAL+ */
++    prot_setisclient(C->pin, 1);
++
+     prot_setflushonread(C->pin, C->pout);
+     prot_settimeout(C->pin, 180*60);
+ 
+diff --git a/imap/sync_server.c b/imap/sync_server.c
+index 27f219636..f834cac5c 100644
+--- a/imap/sync_server.c
++++ b/imap/sync_server.c
+@@ -316,9 +316,8 @@ int service_main(int argc __attribute__((unused)),
+     sync_in = prot_new(0, 0);
+     sync_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow LITERAL+ */
+     prot_setisclient(sync_in, 1);
+-    prot_setisclient(sync_out, 1);
+ 
+     /* Find out name of client host */
+     sync_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/imap/sync_support.c b/imap/sync_support.c
+index e7fe3cbdb..16595d50c 100644
+--- a/imap/sync_support.c
++++ b/imap/sync_support.c
+@@ -7516,10 +7516,6 @@ connected:
+     if (timeout < 3) timeout = 3;
+     prot_settimeout(backend->in, timeout);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
+-    prot_setisclient(backend->in, 1);
+-    prot_setisclient(backend->out, 1);
+-
+     sync_cs->backend = backend;
+ 
+     return 0;
+diff --git a/lib/prot.h b/lib/prot.h
+index 98af5d160..89b0b0a2a 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -133,7 +133,7 @@ struct protstream {
+     int can_unget;
+     int bytes_in;
+     int bytes_out;
+-    int isclient;
++    int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+     prot_readcallback_t *readcallback_proc;
+-- 
+2.39.2
+
+
+From 05a832afb53643944b49497ab658251366ce3828 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 22:48:58 -0400
+Subject: [PATCH 14/22] imapd.c: LITERAL- also applies to APPEND
+
+imap_err.et: add IMAP_MESSAGE_TOOBIG error message
+---
+ imap/imap_err.et |  4 ++++
+ imap/imapd.c     | 12 ++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index eab15f0b1..77297a405 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,10 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++# Same as IMAP_MESSAGE_TOO_LARGE, but with TOOBIG response code
++ec IMAP_MESSAGE_TOOBIG,
++   "[TOOBIG] Message size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index abf0e7153..9ebd11d09 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3542,6 +3542,9 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+ {
+     int isnowait = 0;
+     uint32_t num;
++    static int lminus = -1;
++
++    if (lminus == -1) lminus = config_getswitch(IMAPOPT_LITERALMINUS);
+ 
+     /* Check for literal8 */
+     if (*p == '~') {
+@@ -3562,6 +3565,15 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     }
+ 
+     if (*p == '+') {
++        /* LITERAL- says maximum size is 4096! */
++        if (lminus && num > 4096) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++        }
++        if (num > maxsize) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++        }
+         isnowait++;
+         p++;
+     }
+-- 
+2.39.2
+
+
+From e5e874efe32e3afc90469c493f3a114e9bc30a54 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 14:52:22 -0500
+Subject: [PATCH 15/22] imapd.c: remove XSNIPPETS and XCONV* commands
+
+---
+ cassandane/Cassandane/Cyrus/Conversations.pm |  71 --
+ imap/imapd.c                                 | 997 -------------------
+ 2 files changed, 1068 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/Conversations.pm b/cassandane/Cassandane/Cyrus/Conversations.pm
+index acafb3f74..e857f6d52 100755
+--- a/cassandane/Cassandane/Cyrus/Conversations.pm
++++ b/cassandane/Cassandane/Cyrus/Conversations.pm
+@@ -706,77 +706,6 @@ sub bogus_test_replication_clash
+     $self->check_messages(\%exp, store => $replica_store);
+ }
+ 
+-sub test_xconvfetch
+-    :min_version_3_0
+-{
+-    my ($self) = @_;
+-    my $store = $self->{store};
+-
+-    # check IMAP server has the XCONVERSATIONS capability
+-    $self->assert($store->get_client()->capability()->{xconversations});
+-
+-    xlog $self, "generating messages";
+-    my $generator = Cassandane::ThreadedGenerator->new();
+-    $store->write_begin();
+-    while (my $msg = $generator->generate())
+-    {
+-        $store->write_message($msg);
+-    }
+-    $store->write_end();
+-
+-    xlog $self, "reading the whole folder again to discover CIDs etc";
+-    my %cids;
+-    my %uids;
+-    $store->read_begin();
+-    while (my $msg = $store->read_message())
+-    {
+-        my $uid = $msg->get_attribute('uid');
+-        my $cid = $msg->get_attribute('cid');
+-        my $threadid = $msg->get_header('X-Cassandane-Thread');
+-        if (defined $cids{$cid})
+-        {
+-            $self->assert_num_equals($threadid, $cids{$cid});
+-        }
+-        else
+-        {
+-            $cids{$cid} = $threadid;
+-            xlog $self, "Found CID $cid";
+-        }
+-        $self->assert_null($uids{$uid});
+-        $uids{$uid} = 1;
+-    }
+-    $store->read_end();
+-
+-    xlog $self, "Using XCONVFETCH on each conversation";
+-    foreach my $cid (keys %cids)
+-    {
+-        xlog $self, "XCONVFETCHing CID $cid";
+-
+-        my $result = $store->xconvfetch_begin($cid);
+-        $self->assert_not_null($result->{xconvmeta});
+-        $self->assert_num_equals(1, scalar keys %{$result->{xconvmeta}});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid}->{modseq});
+-        while (my $msg = $store->xconvfetch_message())
+-        {
+-            my $muid = $msg->get_attribute('uid');
+-            my $mcid = $msg->get_attribute('cid');
+-            my $threadid = $msg->get_header('X-Cassandane-Thread');
+-            $self->assert_str_equals($cid, $mcid);
+-            $self->assert_num_equals($cids{$cid}, $threadid);
+-            $self->assert_num_equals(1, $uids{$muid});
+-            $uids{$muid} |= 2;
+-        }
+-        $store->xconvfetch_end();
+-    }
+-
+-    xlog $self, "checking that all the UIDs in the folder were XCONVFETCHed";
+-    foreach my $uid (keys %uids)
+-    {
+-        $self->assert_num_equals(3, $uids{$uid});
+-    }
+-}
+-
+ #
+ # Test APPEND of a new composed draft message to the Drafts folder by
+ # the Fastmail webui, which sets the X-ME-Message-ID header to thread
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 9ebd11d09..67e864d1a 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -438,14 +438,6 @@ static void cmd_idle(char* tag);
+ 
+ static void cmd_starttls(char *tag, int imaps);
+ 
+-static void cmd_xconvsort(char *tag, int updates);
+-static void cmd_xconvmultisort(char *tag);
+-static void cmd_xconvmeta(const char *tag);
+-static void cmd_xconvfetch(const char *tag);
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs);
+-static void cmd_xsnippets(char *tag);
+ static void cmd_xstats(char *tag);
+ 
+ static void cmd_xapplepushservice(const char *tag,
+@@ -502,12 +494,8 @@ static int parse_metadata_store_data(const char *tag,
+ static int getlistselopts(char *tag, struct listargs *args);
+ static int getlistretopts(char *tag, struct listargs *args);
+ 
+-static int get_snippetargs(struct snippetargs **sap);
+-static void free_snippetargs(struct snippetargs **sap);
+ static int getsortcriteria(char *tag, struct sortcrit **sortcrit);
+ static int getdatetime(time_t *date);
+-static int parse_windowargs(const char *tag, struct windowargs **, int);
+-static void free_windowargs(struct windowargs *wa);
+ 
+ static void appendfieldlist(struct fieldlist **l, char *section,
+                      strarray_t *fields, char *trail,
+@@ -2273,32 +2261,6 @@ static void cmdloop(void)
+ 
+                 prometheus_increment(CYRUS_IMAP_XBACKUP_TOTAL);
+             }
+-            else if (!strcmp(cmd.s, "Xconvfetch")) {
+-                cmd_xconvfetch(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVFETCH_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvmultisort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvmultisort(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVMULTISORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvsort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 0);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVSORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvupdates")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 1);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVUPDATES_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xfer")) {
+                 if (readonly) goto noreadonly;
+                 int havepartition = 0;
+@@ -2324,9 +2286,6 @@ static void cmdloop(void)
+                          (havepartition ? arg3.s : NULL));
+                 /* XXX prometheus_increment(CYRUS_IMAP_XFER_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xconvmeta")) {
+-                cmd_xconvmeta(tag.s);
+-            }
+             else if (!strcmp(cmd.s, "Xlist")) {
+                 struct listargs listargs;
+ 
+@@ -2359,13 +2318,6 @@ static void cmdloop(void)
+                 cmd_xrunannotator(tag.s, arg1.s, usinguid);
+                 /* XXX prometheus_increment(CYRUS_IMAP_XRUNANNOTATOR_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xsnippets")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xsnippets(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XSNIPPETS_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xstats")) {
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xstats(tag.s);
+@@ -5165,8 +5117,6 @@ badannotation:
+     }
+     if (config_getswitch(IMAPOPT_CONVERSATIONS)
+         && (fa->fetchitems & (FETCH_MAILBOXIDS|FETCH_MAILBOXES))) {
+-        // annoyingly, this codepath COULD be called from xconv* commands, but it never is,
+-        // in reality, so it's safe leaving this as shared
+         int r = conversations_open_user(imapd_userid, 0/*shared*/, &fa->convstate);
+         if (r) {
+             syslog(LOG_WARNING, "error opening conversations for %s: %s",
+@@ -5254,136 +5204,6 @@ static void cmd_fetch(char *tag, char *sequence, int usinguid)
+     fetchargs_fini(&fetchargs);
+ }
+ 
+-static void do_one_xconvmeta(struct conversations_state *state,
+-                             conversation_id_t cid,
+-                             conversation_t *conv,
+-                             struct dlist *itemlist)
+-{
+-    struct dlist *item = dlist_newpklist(NULL, "");
+-    struct dlist *fl;
+-
+-    assert(conv);
+-    assert(itemlist);
+-
+-    for (fl = itemlist->head; fl; fl = fl->next) {
+-        const char *key = dlist_cstring(fl);
+-
+-        /* xxx - parse to a fetchitems? */
+-        if (!strcasecmp(key, "MODSEQ"))
+-            dlist_setnum64(item, "MODSEQ", conv->modseq);
+-        else if (!strcasecmp(key, "EXISTS"))
+-            dlist_setnum32(item, "EXISTS", conv->exists);
+-        else if (!strcasecmp(key, "UNSEEN"))
+-            dlist_setnum32(item, "UNSEEN", conv->unseen);
+-        else if (!strcasecmp(key, "SIZE"))
+-            dlist_setnum32(item, "SIZE", conv->size);
+-        else if (!strcasecmp(key, "COUNT")) {
+-            struct dlist *flist = dlist_newlist(item, "COUNT");
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *lookup = dlist_cstring(tmp);
+-                    int i = strarray_find_case(state->counted_flags, lookup, 0);
+-                    if (i >= 0) {
+-                        dlist_setflag(flist, "FLAG", lookup);
+-                        dlist_setnum32(flist, "COUNT", conv->counts[i]);
+-                    }
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "SENDERS")) {
+-            conv_sender_t *sender;
+-            struct dlist *slist = dlist_newlist(item, "SENDERS");
+-            for (sender = conv->senders; sender; sender = sender->next) {
+-                struct dlist *sli = dlist_newlist(slist, "");
+-                dlist_setatom(sli, "NAME", sender->name);
+-                dlist_setatom(sli, "ROUTE", sender->route);
+-                dlist_setatom(sli, "MAILBOX", sender->mailbox);
+-                dlist_setatom(sli, "DOMAIN", sender->domain);
+-            }
+-        }
+-        /* XXX - maybe rename FOLDERCOUNTS or something? */
+-        else if (!strcasecmp(key, "FOLDEREXISTS")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDEREXISTS");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "EXISTS", folder ? folder->exists : 0);
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "FOLDERUNSEEN")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDERUNSEEN");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "UNSEEN", folder ? folder->unseen : 0);
+-                }
+-            }
+-        }
+-        else {
+-            dlist_setatom(item, key, NULL); /* add a NIL response */
+-        }
+-    }
+-
+-    prot_printf(imapd_out, "* XCONVMETA %s ", conversation_id_encode(cid));
+-    dlist_print(item, 0, imapd_out);
+-    prot_printf(imapd_out, "\r\n");
+-
+-    dlist_free(&item);
+-}
+-
+-static void do_xconvmeta(const char *tag,
+-                         struct conversations_state *state,
+-                         struct dlist *cidlist,
+-                         struct dlist *itemlist)
+-{
+-    conversation_id_t cid;
+-    struct dlist *dl;
+-    int r;
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        const char *cidstr = dlist_cstring(dl);
+-        conversation_t *conv = NULL;
+-
+-        if (!conversation_id_decode(&cid, cidstr) || !cid) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID %s\r\n", tag, cidstr);
+-            return;
+-        }
+-
+-        r = conversation_load(state, cid, &conv);
+-        if (r) {
+-            prot_printf(imapd_out, "%s BAD Failed to read %s\r\n", tag, cidstr);
+-            conversation_free(conv);
+-            return;
+-        }
+-
+-        if (conv && conv->exists)
+-            do_one_xconvmeta(state, cid, conv, itemlist);
+-
+-        conversation_free(conv);
+-    }
+-
+-    prot_printf(imapd_out, "%s OK Completed\r\n", tag);
+-}
+-
+ static int do_xbackup(const char *channel,
+                       const ptrarray_t *list)
+ {
+@@ -5527,261 +5347,6 @@ done:
+     }
+ }
+ 
+-/*
+- * Parse and perform a XCONVMETA command.
+- */
+-void cmd_xconvmeta(const char *tag)
+-{
+-    int r;
+-    int c = ' ';
+-    struct conversations_state *state = NULL;
+-    struct dlist *cidlist = NULL;
+-    struct dlist *itemlist = NULL;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVMETA ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Failed to parse CID list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&itemlist, 0, imapd_in);
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out, "%s BAD Failed to parse item list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    // this one is OK, xconvmeta doesn't do an expunge
+-    r = conversations_open_user(imapd_userid, 1/*shared*/, &state);
+-    if (r) {
+-        prot_printf(imapd_out, "%s BAD failed to open db: %s\r\n",
+-                    tag, error_message(r));
+-        goto done;
+-    }
+-
+-    do_xconvmeta(tag, state, cidlist, itemlist);
+-
+- done:
+-
+-    dlist_free(&itemlist);
+-    dlist_free(&cidlist);
+-    conversations_commit(&state);
+-}
+-
+-/*
+- * Parse and perform a XCONVFETCH command.
+- */
+-void cmd_xconvfetch(const char *tag)
+-{
+-    int c = ' ';
+-    struct fetchargs fetchargs;
+-    int r;
+-    clock_t start = clock();
+-    modseq_t ifchangedsince = 0;
+-    char mytime[100];
+-    struct dlist *cidlist = NULL;
+-    struct dlist *item;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVFETCH ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        return;
+-    }
+-
+-    /* local mailbox */
+-    memset(&fetchargs, 0, sizeof(struct fetchargs));
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    /* check CIDs */
+-    for (item = cidlist->head; item; item = item->next) {
+-        if (!dlist_ishex64(item)) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID\r\n", tag);
+-            eatline(imapd_in, c);
+-            goto freeargs;
+-        }
+-    }
+-
+-    c = getmodseq(imapd_in, &ifchangedsince);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    r = parse_fetch_args(tag, "Xconvfetch", 0, &fetchargs);
+-    if (r)
+-        goto freeargs;
+-    fetchargs.fetchitems |= (FETCH_UIDVALIDITY|FETCH_FOLDER);
+-    fetchargs.namespace = &imapd_namespace;
+-    fetchargs.userid = imapd_userid;
+-
+-    r = do_xconvfetch(cidlist, ifchangedsince, &fetchargs);
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-
+-    if (r) {
+-        prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+-                    error_message(r), mytime);
+-    } else {
+-        prot_printf(imapd_out, "%s OK Completed (%s sec)\r\n",
+-                    tag, mytime);
+-    }
+-
+-freeargs:
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-    return;
+-
+-syntax_error:
+-    prot_printf(imapd_out, "%s BAD Syntax error\r\n", tag);
+-    eatline(imapd_in, c);
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-}
+-
+-static int xconvfetch_lookup(struct conversations_state *statep,
+-                             conversation_id_t cid,
+-                             modseq_t ifchangedsince,
+-                             hash_table *wanted_cids,
+-                             strarray_t *folder_list)
+-{
+-    const char *key = conversation_id_encode(cid);
+-    conversation_t *conv = NULL;
+-    conv_folder_t *folder;
+-    int r;
+-
+-    r = conversation_load(statep, cid, &conv);
+-    if (r) return r;
+-
+-    if (!conv)
+-        goto out;
+-
+-    if (!conv->exists)
+-        goto out;
+-
+-    /* output the metadata for this conversation */
+-    {
+-        struct dlist *dl = dlist_newlist(NULL, "");
+-        dlist_setatom(dl, "", "MODSEQ");
+-        do_one_xconvmeta(statep, cid, conv, dl);
+-        dlist_free(&dl);
+-    }
+-
+-    if (ifchangedsince >= conv->modseq)
+-        goto out;
+-
+-    hash_insert(key, (void *)1, wanted_cids);
+-
+-    for (folder = conv->folders; folder; folder = folder->next) {
+-        /* no contents */
+-        if (!folder->exists)
+-            continue;
+-
+-        /* finally, something worth looking at */
+-        strarray_add(folder_list, strarray_nth(statep->folder_names, folder->number));
+-    }
+-
+-out:
+-    conversation_free(conv);
+-    return 0;
+-}
+-
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs)
+-{
+-    struct conversations_state *state = NULL;
+-    int r = 0;
+-    struct index_state *index_state = NULL;
+-    struct dlist *dl;
+-    hash_table wanted_cids = HASH_TABLE_INITIALIZER;
+-    strarray_t folder_list = STRARRAY_INITIALIZER;
+-    struct index_init init;
+-    int i;
+-
+-    // this one expunges each mailbox it enters, so we need to lock exclusively
+-    r = conversations_open_user(imapd_userid, 0/*shared*/, &state);
+-    if (r) goto out;
+-
+-    construct_hash_table(&wanted_cids, 1024, 0);
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        r = xconvfetch_lookup(state, dlist_num(dl), ifchangedsince,
+-                              &wanted_cids, &folder_list);
+-        if (r) goto out;
+-    }
+-
+-    /* unchanged, woot */
+-    if (!folder_list.count)
+-        goto out;
+-
+-    fetchargs->cidhash = &wanted_cids;
+-
+-    memset(&init, 0, sizeof(struct index_init));
+-    init.userid = imapd_userid;
+-    init.authstate = imapd_authstate;
+-    init.out = imapd_out;
+-
+-    for (i = 0; i < folder_list.count; i++) {
+-        const char *mboxname = folder_list.data[i];
+-
+-        r = index_open(mboxname, &init, &index_state);
+-        if (r == IMAP_MAILBOX_NONEXISTENT)
+-            continue;
+-        if (r)
+-            goto out;
+-
+-        index_checkflags(index_state, 0, 0);
+-
+-        /* make sure \Deleted messages are expunged.  Will also lock the
+-         * mailbox state and read any new information */
+-        r = index_expunge(index_state, NULL, 1);
+-
+-        if (!r)
+-            index_fetchresponses(index_state, NULL, /*usinguid*/1,
+-                                 fetchargs, NULL);
+-
+-        index_close(&index_state);
+-
+-        if (r) goto out;
+-    }
+-
+-    r = 0;
+-
+-out:
+-    index_close(&index_state);
+-    conversations_commit(&state);
+-    free_hash_table(&wanted_cids, NULL);
+-    strarray_fini(&folder_list);
+-    return r;
+-}
+-
+ #undef PARSE_PARTIAL /* cleanup */
+ 
+ /*
+@@ -6176,314 +5741,6 @@ error:
+     freesearchargs(searchargs);
+ }
+ 
+-/*
+- * Perform a XCONVSORT or XCONVUPDATES command
+- */
+-void cmd_xconvsort(char *tag, int updates)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct index_init init;
+-    struct index_state *oldstate = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvsort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, updates);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    if (updates) {
+-        /* in XCONVUPDATES, need to force a re-read from scratch into
+-         * a new index, because we ask for deleted messages */
+-
+-        oldstate = imapd_index;
+-        imapd_index = NULL;
+-
+-        memset(&init, 0, sizeof(struct index_init));
+-        init.userid = imapd_userid;
+-        init.authstate = imapd_authstate;
+-        init.out = imapd_out;
+-        init.want_expunged = 1;
+-
+-        r = index_open(index_mboxname(oldstate), &init, &imapd_index);
+-        if (r) {
+-            prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                        error_message(r));
+-            goto error;
+-        }
+-
+-        index_checkflags(imapd_index, 0, 0);
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xconvsort\r\n", tag);
+-        goto error;
+-    }
+-
+-    if (updates)
+-        r = index_convupdates(imapd_index, sortcrit, searchargs, windowargs);
+-    else
+-        r = index_convsort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (oldstate) {
+-        index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVSORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    if (oldstate) {
+-        if (imapd_index) index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-/*
+- * Perform a XCONVMULTISORT command.  This is like XCONVSORT but returns
+- * search results from multiple folders.  It still requires a selected
+- * mailbox, for two reasons:
+- *
+- * a) it's a useful shorthand for choosing what the current
+- * conversations scope is, and
+- *
+- * b) the code to parse a search program currently relies on a selected
+- * mailbox.
+- *
+- * Unlike ESEARCH it doesn't take folder names for scope, instead the
+- * search scope is implicitly the current conversation scope.  This is
+- * implemented more or less by accident because both the Sphinx index
+- * and the conversations database are hardcoded to be per-user.
+- */
+-static void cmd_xconvmultisort(char *tag)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvmultisort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvMultiSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, /*updates*/0);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to XconvMultiSort\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_convmultisort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVMULTISORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-static void cmd_xsnippets(char *tag)
+-{
+-    int c;
+-    struct searchargs *searchargs = NULL;
+-    struct snippetargs *snippetargs = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xsnippets";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    c = get_snippetargs(&snippetargs);
+-    if (c == EOF) {
+-        prot_printf(imapd_out, "%s BAD Syntax error in snippet arguments\r\n", tag);
+-        goto error;
+-    }
+-    if (c != ' ') {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected arguments in Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_snippets(imapd_index, snippetargs, searchargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    freesearchargs(searchargs);
+-    free_snippetargs(&snippetargs);
+-    return;
+-
+-error:
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+ static void cmd_xstats(char *tag)
+ {
+     int metric;
+@@ -10800,81 +10057,6 @@ out_noprint:
+     if (uids) seqset_free(uids);
+ }
+ 
+-static void free_snippetargs(struct snippetargs **sap)
+-{
+-    while (*sap) {
+-        struct snippetargs *sa = *sap;
+-        *sap = sa->next;
+-        free(sa->mboxname);
+-        free(sa->uids.data);
+-        free(sa);
+-    }
+-}
+-
+-static int get_snippetargs(struct snippetargs **sap)
+-{
+-    int c;
+-    struct snippetargs **prevp = sap;
+-    struct snippetargs *sa = NULL;
+-    struct buf arg = BUF_INITIALIZER;
+-    uint32_t uid;
+-    char *intname = NULL;
+-
+-    c = prot_getc(imapd_in);
+-    if (c != '(') goto syntax_error;
+-
+-    for (;;) {
+-        c = prot_getc(imapd_in);
+-        if (c == ')') break;
+-        if (c != '(') goto syntax_error;
+-
+-        c = getastring(imapd_in, imapd_out, &arg);
+-        if (c != ' ') goto syntax_error;
+-
+-        intname = mboxname_from_external(buf_cstring(&arg), &imapd_namespace, imapd_userid);
+-
+-        /* allocate a new snippetargs */
+-        sa = xzmalloc(sizeof(struct snippetargs));
+-        sa->mboxname = xstrdup(intname);
+-        /* append to the list */
+-        *prevp = sa;
+-        prevp = &sa->next;
+-
+-        c = getuint32(imapd_in, &sa->uidvalidity);
+-        if (c != ' ') goto syntax_error;
+-
+-        c = prot_getc(imapd_in);
+-        if (c != '(') break;
+-        for (;;) {
+-            c = getuint32(imapd_in, &uid);
+-            if (c != ' ' && c != ')') goto syntax_error;
+-            if (sa->uids.count + 1 > sa->uids.alloc) {
+-                sa->uids.alloc += 64;
+-                sa->uids.data = xrealloc(sa->uids.data,
+-                                         sizeof(uint32_t) * sa->uids.alloc);
+-            }
+-            sa->uids.data[sa->uids.count++] = uid;
+-            if (c == ')') break;
+-        }
+-
+-        c = prot_getc(imapd_in);
+-        if (c != ')') goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ') goto syntax_error;
+-
+-out:
+-    free(intname);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free_snippetargs(sap);
+-    c = EOF;
+-    goto out;
+-}
+-
+ static void cmd_dump(char *tag, char *name, int uid_start)
+ {
+     int r = 0;
+@@ -12329,185 +11511,6 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     return EOF;
+ }
+ 
+-static int parse_windowargs(const char *tag,
+-                            struct windowargs **wa,
+-                            int updates)
+-{
+-    struct windowargs windowargs;
+-    struct buf arg = BUF_INITIALIZER;
+-    struct buf ext_folder = BUF_INITIALIZER;
+-    int c;
+-
+-    memset(&windowargs, 0, sizeof(windowargs));
+-
+-    c = prot_getc(imapd_in);
+-    if (c == EOF)
+-        goto out;
+-    if (c != '(') {
+-        /* no window args at all */
+-        prot_ungetc(c, imapd_in);
+-        goto out;
+-    }
+-
+-    for (;;)
+-    {
+-        c = prot_getc(imapd_in);
+-        if (c == EOF)
+-            goto out;
+-        if (c == ')')
+-            break;  /* end of window args */
+-
+-        prot_ungetc(c, imapd_in);
+-        c = getword(imapd_in, &arg);
+-        if (!arg.len)
+-            goto syntax_error;
+-
+-        if (!strcasecmp(arg.s, "CONVERSATIONS"))
+-            windowargs.conversations = 1;
+-        else if (!strcasecmp(arg.s, "POSITION")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.position);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.position == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "ANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "MULTIANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getastring(imapd_in, imapd_out, &ext_folder);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "CHANGEDSINCE")) {
+-            if (!updates)
+-                goto syntax_error;
+-            windowargs.changedsince = 1;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getmodseq(imapd_in, &windowargs.modseq);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.uidnext);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-        } else if (!strcasecmp(arg.s, "UPTO")) {
+-            if (!updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.upto);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-
+-            if (windowargs.upto == 0)
+-                goto syntax_error;
+-        }
+-        else
+-            goto syntax_error;
+-
+-        if (c == ')')
+-            break;
+-        if (c != ' ')
+-            goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-out:
+-    /* these two are mutually exclusive */
+-    if (windowargs.anchor && windowargs.position)
+-        goto syntax_error;
+-    /* changedsince is mandatory for XCONVUPDATES
+-     * and illegal for XCONVSORT */
+-    if (!!updates != windowargs.changedsince)
+-        goto syntax_error;
+-
+-    if (ext_folder.len) {
+-        windowargs.anchorfolder = mboxname_from_external(buf_cstring(&ext_folder),
+-                                                         &imapd_namespace,
+-                                                         imapd_userid);
+-    }
+-
+-    *wa = xmemdup(&windowargs, sizeof(windowargs));
+-    buf_free(&ext_folder);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free(windowargs.anchorfolder);
+-    buf_free(&ext_folder);
+-    prot_printf(imapd_out, "%s BAD Syntax error in window arguments\r\n", tag);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
+-    return EOF;
+-}
+-
+-static void free_windowargs(struct windowargs *wa)
+-{
+-    if (!wa)
+-        return;
+-    free(wa->anchorfolder);
+-    free(wa);
+-}
+-
+ /*
+  * Parse LIST selection options.
+  * The command has been parsed up to and including the opening '('.
+-- 
+2.39.2
+
+
+From 9901ee2eae0d2c99ecb4e7057d7e3802fb5b64e4 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 26 Feb 2024 10:11:15 -0500
+Subject: [PATCH 16/22] imapd.c: add 'maxliteral' option
+
+---
+ changes/next/imap_literal_limits |  19 +++
+ imap/imap_err.et                 |   3 +
+ imap/imapd.c                     | 214 ++++++++++++++++++++++---------
+ imap/imapparse.c                 |  69 +++++-----
+ lib/imapoptions                  |  12 +-
+ lib/libconfig.c                  |   3 +
+ lib/libconfig.h                  |   1 +
+ 7 files changed, 229 insertions(+), 92 deletions(-)
+ create mode 100644 changes/next/imap_literal_limits
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+new file mode 100644
+index 000000000..c7fc35bbc
+--- /dev/null
++++ b/changes/next/imap_literal_limits
+@@ -0,0 +1,19 @@
++Description:
++
++Adds a config option to limit the size of a single literal allowed
++by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++
++
++Config changes:
++
++New 'maxliteral' option.
++
++
++Upgrade instructions:
++
++None.
++
++
++GitHub issue:
++
++None.
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 77297a405..e309c1203 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_TOO_LARGE,
++   "[TOOBIG] Literal size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 67e864d1a..28d0f299d 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1428,7 +1428,7 @@ static void cmdloop(void)
+                 if (c == '\r') goto missingargs;
+                 if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/0);
+@@ -1441,7 +1441,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1468,7 +1468,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 0, 0);
+ 
+@@ -1480,7 +1480,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, NULL);
+ 
+@@ -1525,7 +1525,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Examine")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -1556,7 +1556,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Getacl")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getacl(tag.s, arg1.s);
+ 
+@@ -1581,7 +1581,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquota")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquota(tag.s, arg1.s);
+ 
+@@ -1590,7 +1590,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquotaroot")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquotaroot(tag.s, arg1.s);
+ 
+@@ -1715,7 +1715,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1731,7 +1731,7 @@ static void cmdloop(void)
+                 /* delete a mailbox locally only */
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 1, 1);
+ 
+@@ -1744,7 +1744,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Myrights")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_myrights(tag.s, arg1.s);
+ 
+@@ -1754,7 +1754,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if(c == EOF) goto missingargs;
++                if(c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_mupdatepush(tag.s, arg1.s);
+ 
+@@ -1770,7 +1770,7 @@ static void cmdloop(void)
+                 if (c == '\r') goto missingargs;
+                 if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/1);
+@@ -1805,7 +1805,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     havepartition = 1;
+                     c = getword(imapd_in, &arg3);
+@@ -1878,7 +1878,7 @@ static void cmdloop(void)
+                 if (c == ' ') {
+                     have_mbox = 1;
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto missingargs;
++                    if (c <= EOF) goto missingargs;
+                     if (c == ' ') {
+                         have_mech = 1;
+                         c = getword(imapd_in, &arg2);
+@@ -1950,7 +1950,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Select")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -1976,7 +1976,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 1);
+@@ -1994,7 +1994,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg2);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg3);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, arg3.s);
+ 
+@@ -2195,7 +2195,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 0);
+@@ -2342,7 +2342,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Xmeid")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xmeid(tag.s, arg1.s);
+             }
+@@ -2354,7 +2354,7 @@ static void cmdloop(void)
+ 
+                 do {
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto aps_missingargs;
++                    if (c <= EOF) goto aps_missingargs;
+ 
+                     if (!strcmp(arg1.s, "mailboxes")) {
+                         c = prot_getc(imapd_in);
+@@ -2366,7 +2366,7 @@ static void cmdloop(void)
+                             prot_ungetc(c, imapd_in);
+                             do {
+                                 c = getastring(imapd_in, imapd_out, &arg2);
+-                                if (c == EOF) break;
++                                if (c <= EOF) break;
+                                 strarray_push(&applepushserviceargs.mailboxes, arg2.s);
+                             } while (c == ' ');
+                         }
+@@ -2447,6 +2447,8 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     missingargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+@@ -2459,11 +2461,18 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     extraargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+         continue;
+ 
++    maxliteral:
++        prot_printf(imapd_out, "%s NO %s in %s\r\n",
++                    tag.s, error_message(IMAP_LITERAL_TOO_LARGE), cmd.s);
++        continue;
++
+     badsequence:
+         prot_printf(imapd_out,
+                     "%s BAD Invalid sequence in %s\r\n", tag.s, cmd.s);
+@@ -2630,10 +2639,14 @@ static void cmd_login(char *tag, char *user)
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         buf_free(&passwdbuf);
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to LOGIN\r\n",
+-                    tag);
+-        eatline(imapd_in, c);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in LOGIN\r\n", tag, error_message(c));
++        } else {
++            prot_printf(imapd_out,
++                        "%s BAD Unexpected extra arguments to LOGIN\r\n",
++                        tag);
++            eatline(imapd_in, c);
++        }
+         return;
+     }
+ 
+@@ -3046,10 +3059,16 @@ static void cmd_id(char *tag)
+                 /* get field value */
+                 (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
+                 (c != ' ' && c != ')')) {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid field-value pair in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
++                if (c == IMAP_LITERAL_TOO_LARGE) {
++                    prot_printf(imapd_out, "%s NO %s in Id\r\n",
++                                tag, error_message(c));
++                }
++                else {
++                    prot_printf(imapd_out,
++                                "%s BAD Invalid field-value pair in Id\r\n",
++                                tag);
++                    eatline(imapd_in, c);
++                }
+                 return;
+             }
+ 
+@@ -3737,6 +3756,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+         else if (!strcasecmp(arg.s, "URL")) {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ' && c != ')') {
+                 *parseerr = "Missing URL in Append command";
+                 return IMAP_PROTOCOL_ERROR;
+@@ -3935,8 +3955,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+                 c = parse_annotate_store_data(tag,
+                                               /*permessage_flag*/1,
+                                               &curstage->annotations);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto cleanup;
+                 }
+                 qdiffs[QUOTA_ANNOTSTORAGE] += sizeentryatts(curstage->annotations);
+@@ -4061,6 +4080,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+     if (r == IMAP_PROTOCOL_ERROR && parseerr) {
+         prot_printf(imapd_out, "%s BAD %s\r\n", tag, parseerr);
++    } else if (r == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+     } else if (r == IMAP_BADURL) {
+         prot_printf(imapd_out, "%s NO [BADURL \"%s\"] %s\r\n",
+                     tag, url, parseerr);
+@@ -4603,8 +4624,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+                                               /*permessage_flag*/1,
+                                               &fa->entries,
+                                               &fa->attribs);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto freeargs;
+                 }
+                 if (c != ')') {
+@@ -4717,6 +4737,11 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (c == IMAP_LITERAL_TOO_LARGE) {
++                            prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                        tag, error_message(c), cmd, fetchatt.s);
++                            goto freeargs;
++                        }
+                         for (p = fieldname.s; *p; p++) {
+                             if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                         }
+@@ -4947,6 +4972,11 @@ badannotation:
+                 }
+                 do {
+                     c = getastring(imapd_in, imapd_out, &fieldname);
++                    if (c == IMAP_LITERAL_TOO_LARGE) {
++                        prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                    tag, error_message(c), cmd, fetchatt.s);
++                        goto freeargs;
++                    }
+                     for (p = fieldname.s; *p; p++) {
+                         if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                     }
+@@ -5462,8 +5492,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         c = parse_annotate_store_data(tag, /*permessage_flag*/1,
+                                       &storeargs.entryatts);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeflags;
+         }
+         storeargs.namespace = &imapd_namespace;
+@@ -5637,6 +5666,12 @@ static void cmd_search(char *tag, int usinguid)
+         return;
+     }
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Search\r\n", tag, error_message(c));
++        freesearchargs(searchargs);
++        return;
++    }
++
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out, "%s BAD Unexpected extra arguments to Search\r\n", tag);
+         eatline(imapd_in, c);
+@@ -5812,16 +5847,19 @@ static void cmd_thread(char *tag, int usinguid)
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
++    }
++
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Thread\r\n", tag, error_message(c));
++        goto done;
+     }
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to Thread\r\n", tag);
+         eatline(imapd_in, c);
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
+     }
+ 
+     n = index_thread(imapd_index, alg, searchargs, usinguid);
+@@ -5830,6 +5868,7 @@ static void cmd_thread(char *tag, int usinguid)
+     prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
+                 error_message(IMAP_OK_COMPLETED), n, mytime);
+ 
++  done:
+     freesearchargs(searchargs);
+     return;
+ }
+@@ -7333,8 +7372,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == '(') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistselopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             return;
+         }
+     }
+@@ -7346,6 +7384,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     /* Read in reference name */
+     c = getastring(imapd_in, imapd_out, &reference);
++    if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+     if (c == EOF && !*reference.s) {
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to List: reference name\r\n",
+@@ -7368,6 +7407,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+             if (c != ' ') break;
+@@ -7383,6 +7423,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     else {
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &buf);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to List: mailbox pattern\r\n",
+@@ -7397,8 +7438,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == ' ') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistretopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeargs;
+         }
+     }
+@@ -7417,6 +7457,10 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     return;
+ 
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in List\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++
+   freeargs:
+     strarray_fini(&listargs->pat);
+     strarray_fini(&listargs->metaitems);
+@@ -8816,6 +8860,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation entry\r\n", tag);
+@@ -8843,6 +8888,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -8865,6 +8911,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute(s)\r\n", tag);
+@@ -8892,6 +8939,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation attribute\r\n", tag);
+@@ -8904,8 +8952,13 @@ static int parse_annotate_fetch_data(const char *tag,
+     return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -8936,6 +8989,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing metadata entry\r\n", tag);
+@@ -8962,6 +9016,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* single entry -- add it to the list */
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE)  goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -8980,8 +9035,13 @@ static int parse_metadata_string_or_list(const char *tag,
+     if (c == ' ' || c == '\r' || c == ')') return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9033,6 +9093,7 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -9053,6 +9114,7 @@ static int parse_annotate_store_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &attrib);
+             else
+                 c = getqstring(imapd_in, imapd_out, &attrib);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute\r\n", tag);
+@@ -9066,6 +9128,7 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+             c = getbnstring(imapd_in, imapd_out, &value);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation value\r\n", tag);
+@@ -9107,8 +9170,14 @@ static int parse_annotate_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9141,6 +9210,7 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -9153,6 +9223,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata value\r\n", tag);
+@@ -9193,7 +9264,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+     if (c != ')') {
+         prot_printf(imapd_out,
+-                    "%s BAD Missing close paren in annotation entry list \r\n",
++                    "%s BAD Missing close paren in metadata entry list \r\n",
+                     tag);
+         goto baddata;
+     }
+@@ -9204,8 +9275,14 @@ static int parse_metadata_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ static void getannotation_response(const char *mboxname,
+@@ -9384,8 +9461,7 @@ static void cmd_getannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_fetch_data(tag, /*permessage_flag*/0, &entries, &attribs);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9619,8 +9695,10 @@ static void cmd_getmetadata(const char *tag)
+     while (nlists < 3)
+     {
+         c = parse_metadata_string_or_list(tag, &lists[nlists], &is_list[nlists]);
++        if (c <= EOF) goto freeargs;
++
+         nlists++;
+-        if (c == '\r' || c == EOF)
++        if (c == '\r')
+             break;
+     }
+ 
+@@ -9777,8 +9855,7 @@ static void cmd_setannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_store_data(tag, 0, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9845,8 +9922,7 @@ static void cmd_setmetadata(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_metadata_store_data(tag, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9954,6 +10030,10 @@ static void cmd_xwarmup(const char *tag)
+     /* parse arguments: expect <mboxname> '('<warmup-items>')' */
+ 
+     c = getastring(imapd_in, imapd_out, &arg);
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Xwarmup\r\n", tag, error_message(c));
++        goto out_noprint;
++    }
+     if (c != ' ') {
+ syntax_error:
+         prot_printf(imapd_out, "%s BAD syntax error in %s\r\n", tag, cmd);
+@@ -11423,9 +11503,11 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_ANNOTATION;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ') goto missingarg;
+             (*sortcrit)[n].args.annot.entry = xstrdup(criteria.s);
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             if (!strcmp(criteria.s, "value.shared"))
+                 userid = "";
+@@ -11443,6 +11525,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11456,6 +11539,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASCONVFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11561,10 +11645,10 @@ static int getlistselopts(char *tag, struct listargs *args)
+ 
+             strarray_t options = STRARRAY_INITIALIZER;
+             c = parse_metadata_string_or_list(tag, &options, NULL);
++            if (c <= EOF) return c;
+             parse_getmetadata_options(&options, &opts);
+             args->metaopts = opts;
+             strarray_fini(&options);
+-            if (c == EOF) return EOF;
+         } else {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid List selection option \"%s\"\r\n",
+@@ -11592,7 +11676,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -11662,7 +11746,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+             args->ret |= LIST_RET_METADATA;
+             /* outputs the error for us */
+             c = parse_metadata_string_or_list(tag, &args->metaitems, NULL);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else {
+             prot_printf(imapd_out,
+@@ -11683,7 +11767,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -12847,6 +12931,11 @@ static void cmd_urlfetch(char *tag)
+         else prot_ungetc(c, imapd_in);
+ 
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Urlfetch\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         (void)prot_putc(' ', imapd_out);
+         prot_printstring(imapd_out, arg.s);
+ 
+@@ -13079,6 +13168,11 @@ static void cmd_genurlauth(char *tag)
+         char *intname = NULL;
+ 
+         c = getastring(imapd_in, imapd_out, &arg1);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Genurlauth\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to Genurlauth\r\n",
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 14e6be226..ddf5c2756 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -159,6 +159,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+                 fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+             }
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+@@ -181,6 +185,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         if (!isnowait) {
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                return IMAP_LITERAL_TOO_LARGE;
++            }
++
+             prot_printf(pout, "+ go ahead\r\n");
+             prot_flush(pout);
+         }
+@@ -689,7 +697,7 @@ static int get_search_annotation(struct protstream *pin,
+ 
+     /* parse the value */
+     c = getbnstring(pin, pout, &value);
+-    if (c == EOF)
++    if (c <= EOF)
+         goto bad;
+ 
+     sa = xzmalloc(sizeof(*sa));
+@@ -710,6 +718,7 @@ bad:
+     buf_free(&attrib);
+     buf_free(&value);
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
+     if (c != EOF) prot_ungetc(c, pin);
+     return EOF;
+ }
+@@ -842,7 +851,7 @@ static int get_search_criterion(struct protstream *pin,
+         do {
+             c = get_search_criterion(pin, pout, e, base);
+         } while (c == ' ');
+-        if (c == EOF) return EOF;
++        if (c <= EOF) return c;
+         if (c != ')') {
+             prot_printf(pout, "%s BAD Missing required close paren in Search command\r\n",
+                    base->tag);
+@@ -878,7 +887,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "annotation")) {   /* RFC 5257 */
+             struct searchannot *annot = NULL;
+             c = get_search_annotation(pin, pout, base, c, &annot);
+-            if (c == EOF)
++            if (c <= EOF)
+                 goto badcri;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("annotation");
+@@ -899,23 +908,15 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "bcc")) {      /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "body")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+-        else if (!strcmp(criteria.s, "fuzzy")) {
+-            if (c != ' ') goto missingarg;
+-            base->fuzzy_depth++;
+-            c = get_search_criterion(pin, pout, parent, base);
+-            base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
+-            break;
+-        }
+         else goto badcri;
+         break;
+ 
+@@ -923,7 +924,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "cc")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (hasconv && !strcmp(criteria.s, "convflag")) {  /* nonstandard */
+@@ -986,7 +987,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "deliveredto")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -996,7 +997,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "emailid")) {   /* draft-gondwana-imap-uniqueid */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1009,7 +1010,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "folder")) {       /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("folder");
+             e->value.s = mboxname_from_external(arg.s, base->namespace, base->userid);
+@@ -1017,7 +1018,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "from")) {         /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "fuzzy")) {        /* RFC 6203 */
+@@ -1025,7 +1026,7 @@ static int get_search_criterion(struct protstream *pin,
+             base->fuzzy_depth++;
+             c = get_search_criterion(pin, pout, parent, base);
+             base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else goto badcri;
+         break;
+@@ -1036,7 +1037,7 @@ static int get_search_criterion(struct protstream *pin,
+             c = getastring(pin, pout, &arg);
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg2);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+ 
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find_field(arg.s);
+@@ -1098,7 +1099,7 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_NOT);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "new")) {  /* RFC 3501 */
+             e = search_expr_new(parent, SEOP_AND);
+@@ -1113,10 +1114,10 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_OR);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+             if (c != ' ') goto missingarg;
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "old")) {  /* RFC 3501 */
+             indexflag_match(parent, MESSAGE_RECENT, /*not*/1);
+@@ -1235,6 +1236,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spamabove")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_GE);
+             e->attr = search_attr_find("spamscore");
+@@ -1243,6 +1245,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spambelow")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_LT);
+             e->attr = search_attr_find("spamscore");
+@@ -1251,7 +1254,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "subject")) {  /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1261,19 +1264,19 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "to")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "text")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "threadid")) {   /* draft-gondwana-imap-uniqueid */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1323,25 +1326,25 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "xattachmentname")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentname", base);
+         }
+         else if (!strcmp(criteria.s, "xattachmentbody")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentbody", base);
+         }
+         else if (!strcmp(criteria.s, "xlistid")) {           /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "listid", base);
+         }
+         else if (!strcmp(criteria.s, "xcontenttype")) { /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "contenttype", base);
+         }
+         else goto badcri;
+@@ -1372,6 +1375,8 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     default:
+     badcri:
++        if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+         prot_printf(pout, "%s BAD Invalid Search criteria\r\n", base->tag);
+         if (c != EOF) prot_ungetc(c, pin);
+         return EOF;
+@@ -1384,6 +1389,8 @@ static int get_search_criterion(struct protstream *pin,
+     return c;
+ 
+  missingarg:
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+     prot_printf(pout, "%s BAD Missing required argument to Search %s\r\n",
+                 base->tag, criteria.s);
+     if (c != EOF) prot_ungetc(c, pin);
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 5cb8ef7b8..833245069 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1571,11 +1571,21 @@ Blank lines and lines beginning with ``#'' are ignored.
+    messages larger than \fImaxmessagesize\fR bytes.  If set to 0, this
+    will allow messages of any size (the default). */
+ 
++{ "maxliteral", 131072, INT, "UNRELEASED" }
++/* Maximum size in bytes of a single literal allowed by the IMAP parser.
++.PP
++   Literals used for message [part] data in APPEND are only limited by
++   the 'maxmessagesize' option.
++.PP
++   If the 'literalminus' option is enabled, non-synchonizing literals
++   will be limited to the lesser of 4K and either 'maxliteral' or
++   'maxmessagesize', depending on the use-case. */
++
+ { "maxquoted", 131072, INT, "2.3.17" }
+ /* Maximum size of a single quoted string for the parser.  Default 128k */
+ 
+ { "maxword", 131072, INT, "2.3.17" }
+-/* Maximum size of a single word for the parser.  Default 128k */
++/* Maximum size of a single word allowed by the IMAP parser.  Default 128k */
+ 
+ { "mboxkey_db", "twoskip", STRINGLIST("skiplist", "twoskip", "zeroskip"), "3.1.6" }
+ /* The cyrusdb backend to use for mailbox keys. */
+diff --git a/lib/libconfig.c b/lib/libconfig.c
+index 860c34863..de9591b7d 100644
+--- a/lib/libconfig.c
++++ b/lib/libconfig.c
+@@ -84,6 +84,7 @@ EXPORTED int config_auditlog;
+ EXPORTED int config_iolog;
+ EXPORTED unsigned config_maxword;
+ EXPORTED unsigned config_maxquoted;
++EXPORTED unsigned config_maxliteral;
+ EXPORTED int config_qosmarking;
+ EXPORTED int config_debug;
+ 
+@@ -473,6 +474,7 @@ EXPORTED void config_reset(void)
+     config_defdomain = NULL;
+     config_auditlog = 0;
+     config_serverinfo = 0;
++    config_maxliteral = 0;
+     config_maxquoted = 0;
+     config_maxword = 0;
+     config_qosmarking = 0;
+@@ -659,6 +661,7 @@ EXPORTED void config_read(const char *alt_config, const int config_need_data)
+     config_serverinfo = config_getenum(IMAPOPT_SERVERINFO);
+ 
+     /* set some limits */
++    config_maxliteral = config_getint(IMAPOPT_MAXLITERAL);
+     config_maxquoted = config_getint(IMAPOPT_MAXQUOTED);
+     config_maxword = config_getint(IMAPOPT_MAXWORD);
+ 
+diff --git a/lib/libconfig.h b/lib/libconfig.h
+index dd9eee2e3..8c8fed54a 100644
+--- a/lib/libconfig.h
++++ b/lib/libconfig.h
+@@ -89,6 +89,7 @@ extern enum enum_value config_virtdomains;
+ extern enum enum_value config_mupdate_config;
+ extern int config_auditlog;
+ extern int config_iolog;
++extern unsigned config_maxliteral;
+ extern unsigned config_maxquoted;
+ extern unsigned config_maxword;
+ extern int config_qosmarking;
+-- 
+2.39.2
+
+
+From e32406ce63ce69161a37d59507e978b3ae6710fb Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:18:52 -0500
+Subject: [PATCH 17/22] prot.h: change bytes_in/out to uint64_t (for
+ long-running imapd)
+
+---
+ backup/lcb.c         |  4 ++--
+ backup/lcb_compact.c |  4 ++--
+ backup/lcb_verify.c  |  8 ++++----
+ imap/httpd.c         | 14 ++++++++------
+ imap/imapd.c         | 18 ++++++++++--------
+ imap/pop3d.c         | 18 ++++++++++--------
+ lib/prot.h           |  8 ++++----
+ 7 files changed, 40 insertions(+), 34 deletions(-)
+
+diff --git a/backup/lcb.c b/backup/lcb.c
+index 8f0de3b8f..cb3c4a595 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -609,11 +609,11 @@ EXPORTED int backup_reindex(const char *name,
+                 const char *error = prot_error(member);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                            name, member_offset, prot_bytes_in(member), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 member_offset, prot_bytes_in(member), error);
+ 
+                     r = IMAP_IOERROR;
+diff --git a/backup/lcb_compact.c b/backup/lcb_compact.c
+index 6a6cb5282..3f8693ef2 100644
+--- a/backup/lcb_compact.c
++++ b/backup/lcb_compact.c
+@@ -521,11 +521,11 @@ EXPORTED int backup_compact(const char *name,
+                 const char *error = prot_error(in);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                            name, chunk->offset, prot_bytes_in(in), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 chunk->offset, prot_bytes_in(in), error);
+ 
+                     /* chunk is corrupt, discard the rest of it and get on with
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index a59984471..1fbd7bca5 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -234,10 +234,10 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, message->id, message->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             message->id, message->offset, prot_bytes_in(ps), error);
+             }
+             prot_free(ps);
+@@ -539,10 +539,10 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 r = EOF;
+             }
+diff --git a/imap/httpd.c b/imap/httpd.c
+index 069038a95..851bcc643 100644
+--- a/imap/httpd.c
++++ b/imap/httpd.c
+@@ -584,8 +584,8 @@ struct namespace_t *http_namespaces[] = {
+ static void httpd_reset(struct http_connection *conn)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     /* Do any namespace specific cleanup */
+     for (i = 0; http_namespaces[i]; i++) {
+@@ -627,7 +627,8 @@ static void httpd_reset(struct http_connection *conn)
+ 
+     if (config_auditlog) {
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+     }
+ 
+@@ -998,8 +999,8 @@ void usage(void)
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1058,7 +1059,8 @@ void shut_down(int code)
+ 
+     if (config_auditlog)
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+ 
+ #ifdef HAVE_SSL
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 28d0f299d..0a6574c19 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -729,8 +729,8 @@ static int mlookup(const char *tag, const char *ext_name,
+ static void imapd_reset(void)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     proc_cleanup();
+ 
+@@ -777,8 +777,9 @@ static void imapd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     imapd_in = imapd_out = NULL;
+ 
+@@ -1072,8 +1073,8 @@ void shut_down(int code) __attribute__((noreturn));
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1138,8 +1139,9 @@ void shut_down(int code)
+                               : CYRUS_IMAP_SHUTDOWN_TOTAL_STATUS_OK);
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     if (protin) protgroup_free(protin);
+ 
+diff --git a/imap/pop3d.c b/imap/pop3d.c
+index 167e5c75e..349f4bf92 100644
+--- a/imap/pop3d.c
++++ b/imap/pop3d.c
+@@ -325,8 +325,8 @@ static struct sasl_callback mysasl_cb[] = {
+ 
+ static void popd_reset(void)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     proc_cleanup();
+ 
+@@ -361,8 +361,9 @@ static void popd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     popd_in = popd_out = NULL;
+ 
+@@ -598,8 +599,8 @@ static void usage(void)
+  */
+ void shut_down(int code)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -644,8 +645,9 @@ void shut_down(int code)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+ #ifdef HAVE_SSL
+     tls_shutdown_serverengine();
+diff --git a/lib/prot.h b/lib/prot.h
+index 89b0b0a2a..94b22fad8 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -131,8 +131,8 @@ struct protstream {
+     struct buf *writetobuf;
+ 
+     int can_unget;
+-    int bytes_in;
+-    int bytes_out;
++    uint64_t bytes_in;
++    uint64_t bytes_out;
+     int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+@@ -224,8 +224,8 @@ extern int prot_free(struct protstream *s);
+ extern int prot_setlog(struct protstream *s, int fd);
+ 
+ /* Get traffic counts */
+-extern int prot_bytes_in(struct protstream *s);
+-extern int prot_bytes_out(struct protstream *s);
++extern uint64_t prot_bytes_in(struct protstream *s);
++extern uint64_t prot_bytes_out(struct protstream *s);
+ #define prot_bytes_in(s) ((s)->bytes_in)
+ #define prot_bytes_out(s) ((s)->bytes_out)
+ 
+-- 
+2.39.2
+
+
+From 0c8af18b9ad12bd59556f033e25ba8f2828bc969 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:35:44 -0500
+Subject: [PATCH 18/22] imapd.c: rename 'maxsize' to 'maxmsgsize'
+
+---
+ imap/imapd.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 0a6574c19..5ef0ce778 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -135,7 +135,7 @@ static int imaps = 0;
+ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+-static size_t maxsize = 0;
++static size_t maxmsgsize = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -898,8 +898,8 @@ int service_init(int argc, char **argv, char **envp)
+ 
+     prometheus_increment(CYRUS_IMAP_READY_LISTENERS);
+ 
+-    maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+-    if (!maxsize) maxsize = UINT32_MAX;
++    maxmsgsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
++    if (!maxmsgsize) maxmsgsize = UINT32_MAX;
+ 
+     return 0;
+ }
+@@ -3985,13 +3985,13 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxsize, &size,
++            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From 046bf9a6ec7516cb728d9ef003029fc853c2c02f Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 15:08:42 -0500
+Subject: [PATCH 19/22] imapd.c: limit the total size of IMAP command arguments
+
+Only concerned with commands that can have an unlimited
+number of arguments.
+---
+ changes/next/imap_literal_limits |  7 ++-
+ imap/imap_err.et                 |  3 +
+ imap/imapd.c                     | 97 +++++++++++++++++++++++++++++---
+ imap/imapd.h                     |  1 +
+ imap/imapparse.c                 | 10 ++++
+ lib/imapoptions                  |  5 ++
+ 6 files changed, 112 insertions(+), 11 deletions(-)
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+index c7fc35bbc..f1ea34a0b 100644
+--- a/changes/next/imap_literal_limits
++++ b/changes/next/imap_literal_limits
+@@ -1,12 +1,13 @@
+ Description:
+ 
+-Adds a config option to limit the size of a single literal allowed
+-by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++Adds config options to limit the size of a single literal allowed
++by the IMAP parser and to limit the total size of IMAP command arguments.
++Also properly applies LITERAL- to IMAP APPEND.
+ 
+ 
+ Config changes:
+ 
+-New 'maxliteral' option.
++New 'maxliteral' and 'maxargssize' options.
+ 
+ 
+ Upgrade instructions:
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index e309c1203..29ba44953 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_ARGS_TOO_LARGE,
++   "[TOOBIG] Command arguments total size exceeds fixed limit"
++
+ ec IMAP_LITERAL_TOO_LARGE,
+    "[TOOBIG] Literal size exceeds fixed limit"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 5ef0ce778..e9451d35e 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -136,6 +136,8 @@ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+ static size_t maxmsgsize = 0;
++static int64_t maxargssize = 0;
++static uint64_t maxargssize_mark = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -901,6 +903,9 @@ int service_init(int argc, char **argv, char **envp)
+     maxmsgsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+     if (!maxmsgsize) maxmsgsize = UINT32_MAX;
+ 
++    maxargssize = config_getint(IMAPOPT_MAXARGSSIZE);
++    if (maxargssize <= 0) maxargssize = UINT32_MAX;
++
+     return 0;
+ }
+ 
+@@ -1345,6 +1350,9 @@ static void cmdloop(void)
+            allowed when not logged in */
+         if (!imapd_userid && !strchr("AELNCIS", cmd.s[0])) goto nologin;
+ 
++        /* Set limit on the total number of bytes allowed for arguments */
++        maxargssize_mark = prot_bytes_in(imapd_in) + maxargssize;
++
+         /* Start command timer */
+         cmdtime_starttimer();
+ 
+@@ -3902,6 +3910,9 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+         curstage = xzmalloc(sizeof(*curstage));
+         ptrarray_push(&stages, curstage);
+ 
++        /* Set limit on the total number of bytes allowed for mailbox+append-opts */
++        maxargssize_mark = prot_bytes_in(imapd_in) + (maxargssize - strlen(name));
++
+         /* now parsing "append-opts" in the ABNF */
+ 
+         /* Parse flags */
+@@ -3910,6 +3921,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             strarray_init(&curstage->flags);
+             do {
+                 c = getword(imapd_in, &arg);
++                if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4017,15 +4030,23 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     }
+ 
+  done:
+-    if (r) {
+-        eatline(imapd_in, c);
+-    } else {
++    switch (r) {
++    case IMAP_ZERO_LENGTH_LITERAL:
++    case IMAP_MESSAGE_TOO_LARGE:
++        break;
++
++    case 0:
+         /* we should be looking at the end of the line */
+-        if (!IS_EOL(c, imapd_in)) {
+-            parseerr = "junk after literal";
+-            r = IMAP_PROTOCOL_ERROR;
+-            eatline(imapd_in, c);
+-        }
++        if (IS_EOL(c, imapd_in)) break;
++
++        parseerr = "junk after literal";
++        r = IMAP_PROTOCOL_ERROR;
++
++        GCC_FALLTHROUGH
++
++    default:
++        eatline(imapd_in, c);
++        break;
+     }
+ 
+     /* Append from the stage(s) */
+@@ -4235,6 +4256,9 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         c = getword(imapd_in, &arg);
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+                 client_capa |= CAPA_CONDSTORE;
+@@ -4609,6 +4633,9 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+         c = getword(imapd_in, &fetchatt);
+     }
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+         case 'A':
+@@ -4739,6 +4766,8 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5073,6 +5102,9 @@ badannotation:
+         }
+         do {
+             c = getword(imapd_in, &fetchatt);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5419,6 +5451,9 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         do {
+             c = getword(imapd_in, &storemod);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5511,6 +5546,8 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+     for (;;) {
+         c = getword(imapd_in, &flagname);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -5639,6 +5676,8 @@ static void cmd_search(char *tag, int usinguid)
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
+ 
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     /* Set FUZZY search according to config and quirks */
+     static const char *annot = IMAP_ANNOT_NS "search-fuzzy-always";
+     char *inbox = mboxname_user_mbox(imapd_userid, NULL);
+@@ -5730,6 +5769,9 @@ static void cmd_sort(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     if (imapd_id.quirks & QUIRK_SEARCHFUZZY)
+         searchargs->fuzzy_depth++;
+ 
+@@ -5846,6 +5888,9 @@ static void cmd_thread(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+@@ -7409,6 +7454,8 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8252,6 +8299,9 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         newquotas[res] = limit;
+         if (c == ')') break;
+         else if (c != ' ') goto badlist;
++
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8404,6 +8454,9 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     c = getword(imapd_in, &arg);
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+             statusitems |= STATUS_MESSAGES;
+@@ -8786,6 +8839,9 @@ static int parsecreateargs(struct dlist **extargs)
+         /* new style RFC 4466 arguments */
+         do {
+             c = getword(imapd_in, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+             c = prot_getc(imapd_in);
+@@ -8794,6 +8850,9 @@ static int parsecreateargs(struct dlist **extargs)
+                 sub = dlist_newlist(res, name);
+                 do {
+                     c = getword(imapd_in, &val);
++                    if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+                 if (c != ')') goto fail;
+@@ -8862,6 +8921,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -8913,6 +8974,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -8991,6 +9054,8 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9095,6 +9160,8 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9137,6 +9204,9 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+ 
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+ 
+@@ -9212,6 +9282,8 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9225,6 +9297,8 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11466,6 +11540,9 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     nsort = 0;
+     n = 0;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+             nsort += SORTGROWSIZE;
+@@ -11615,6 +11692,8 @@ static int getlistselopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -11719,6 +11798,8 @@ static int getlistretopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapd.h b/imap/imapd.h
+index a6724af89..e6537dd95 100644
+--- a/imap/imapd.h
++++ b/imap/imapd.h
+@@ -222,6 +222,7 @@ struct searchargs {
+     int state;
+     /* used only during parsing */
+     int fuzzy_depth;
++    uint64_t maxargssize_mark;
+ 
+     /* For ESEARCH & XCONVMULTISORT */
+     const char *tag;
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index ddf5c2756..1fdb8b312 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -634,6 +634,11 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+             goto bad;
+         }
+ 
++        if (searchargs->maxargssize_mark &&
++            prot_bytes_in(pin) > searchargs->maxargssize_mark) {
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        }
++
+     } while (c == ' ');
+ 
+     /* RFC 4731:
+@@ -1382,6 +1387,11 @@ static int get_search_criterion(struct protstream *pin,
+         return EOF;
+     }
+ 
++    if (base->maxargssize_mark &&
++        prot_bytes_in(pin) > base->maxargssize_mark) {
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++    }
++
+     if (!keep_charset)
+         base->state &= ~GETSEARCH_CHARSET_KEYWORD;
+     base->state &= ~GETSEARCH_RETURN;
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 833245069..75950e5c4 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1566,6 +1566,11 @@ Blank lines and lines beginning with ``#'' are ignored.
+ /* Maximum number of logged in sessions allowed per user,
+    zero means no limit */
+ 
++{ "maxargssize", 0, INT, "UNRELEASED" }
++/* Maximum total size of arguments to an IMAP command that will be
++   accepted by Cyrus.
++   Commands with arguments that exceed this limit will be rejected. 
++
+ { "maxmessagesize", 0, INT, "2.3.17" }
+ /* Maximum incoming LMTP message size.  If non-zero, lmtpd will reject
+    messages larger than \fImaxmessagesize\fR bytes.  If set to 0, this
+-- 
+2.39.2
+
+
+From 8d72de770eb354e52a659a1264809f773ff8fcf1 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Tue, 12 Mar 2024 23:16:30 -0400
+Subject: [PATCH 20/22] Add IMAPLimits.pm
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 518 ++++++++++++++++++++++
+ cassandane/Cassandane/IMAPMessageStore.pm |   8 +-
+ 2 files changed, 523 insertions(+), 3 deletions(-)
+ create mode 100644 cassandane/Cassandane/Cyrus/IMAPLimits.pm
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+new file mode 100644
+index 000000000..2275c5cf7
+--- /dev/null
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -0,0 +1,518 @@
++#!/usr/bin/perl
++#
++#  Copyright (c) 2011-2023 FastMail Pty Ltd. All rights reserved.
++#
++#  Redistribution and use in source and binary forms, with or without
++#  modification, are permitted provided that the following conditions
++#  are met:
++#
++#  1. Redistributions of source code must retain the above copyright
++#     notice, this list of conditions and the following disclaimer.
++#
++#  2. Redistributions in binary form must reproduce the above copyright
++#     notice, this list of conditions and the following disclaimer in
++#     the documentation and/or other materials provided with the
++#     distribution.
++#
++#  3. The name "Fastmail Pty Ltd" must not be used to
++#     endorse or promote products derived from this software without
++#     prior written permission. For permission or any legal
++#     details, please contact
++#      FastMail Pty Ltd
++#      PO Box 234
++#      Collins St West 8007
++#      Victoria
++#      Australia
++#
++#  4. Redistributions of any form whatsoever must retain the following
++#     acknowledgment:
++#     "This product includes software developed by Fastmail Pty. Ltd."
++#
++#  FASTMAIL PTY LTD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY  AND FITNESS, IN NO
++#  EVENT SHALL OPERA SOFTWARE AUSTRALIA BE LIABLE FOR ANY SPECIAL, INDIRECT
++#  OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++#  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++#  OF THIS SOFTWARE.
++#
++
++package Cassandane::Cyrus::IMAPLimits;
++use strict;
++use warnings;
++use Mail::JMAPTalk 0.13;
++use Data::Dumper;
++
++use lib '.';
++use base qw(Cassandane::Cyrus::TestCase);
++use Cassandane::Util::Log;
++
++my $email = <<EOF;
++Subject: foo
++Date: bar
++From: <foobar\@example.com>
++
++Body
++EOF
++
++$email =~ s/\r?\n/\r\n/gs;
++
++my $toobig_email = $email . "X" x 100;
++
++sub assert_bye_toobig
++{
++    my ($self, $store) = @_;
++
++    $store = $self->{store} if (!defined $store);
++
++    # We want to override Mail::IMAPTalk's builtin handling of the BYE
++    # untagged response, as it will 'die' immediately without parsing
++    # the remainder of the line and especially without picking out the
++    # [TOOBIG] response code that we want to see.
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        bye => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    # Check that we got a BYE [TOOBIG] response
++    $store->idle_response($handlers, 1);
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub assert_cmd_bye_toobig
++{
++    my $self = shift;
++    my $cmd = shift;
++
++    my $talk = $self->{store}->get_client();
++    $talk->enable('qresync'); # IMAPTalk requires lower-case
++    $talk->select('INBOX');
++
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_bye_toobig();
++}
++
++sub assert_cmd_no_toobig
++{
++    my $self = shift;
++    my $talk = shift;
++    my $cmd = shift;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            # Pick out the [TOOBIG] response code
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    $talk->_imap_cmd($cmd, 0, $handlers, @_);
++
++    # Check that we got a NO [TOOBIG] response
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub new
++{
++    my $class = shift;
++
++    my $config = Cassandane::Config->default()->clone();
++    $config->set(maxword => 25);
++    $config->set(maxquoted => 25);
++    $config->set(maxliteral => 25);
++    $config->set(literalminus => 1);
++    $config->set(maxargssize => 45);
++    $config->set(maxmessagesize => 100);
++    $config->set(event_groups => "message mailbox applepushservice");
++    $config->set(aps_topic => "mail");
++
++    return $class->SUPER::new({
++        adminstore => 1,
++        config => $config,
++        services => ['imap'],
++    }, @_);
++}
++
++sub set_up
++{
++    my ($self) = @_;
++    $self->SUPER::set_up();
++}
++
++sub tear_down
++{
++    my ($self) = @_;
++    $self->SUPER::tear_down();
++}
++
++sub test_maxword
++{
++    my ($self) = @_;
++
++    # Oversized command name
++    $self->assert_cmd_bye_toobig("X" x 26);
++}
++
++sub test_maxword_astring
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', "X" x 26);
++}
++
++sub test_maxquoted
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', { Quote => "X" x 26 });
++}
++
++sub test_maxliteral_nosync
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " SELECT {26+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_maxliteral_sync
++{
++    my ($self) = @_;
++
++    # Unlike oversized non-sync literals which fatal() in one central location,
++    # oversized sync literals fail with a NO response in multiple places,
++    # so we test as many of those places as possible.
++    # Having said that, arguments parsed in cmdloop() or in get_search_criterion()
++    # are mostly handled centrally.
++
++    # Authenticated State
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'SELECT',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Literal => "X" x 26 } ]);
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Quote => 'foo' }, { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Quote => '' }, { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LISTRIGHTS',
++                                'INBOX', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'SETACL',
++                                'INBOX', 'anyone', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ '/comment', { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                'FOO', { Literal => "X" x 26 });
++
++    # Selected State
++    $talk->select('INBOX');
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'ANNOTATION',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'BODY[HEADER.FIELDS',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'RFC822.HEADER.LINES',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Quote => 'value' },
++                                    { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', 'SUBJECT', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment',
++                                'value', { Literal => "X" x 26 } );
++}
++
++sub test_maxargssize_append_flags
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 [ "X" x 25, "X" x 25 ], { Literal => $email } );
++}
++
++sub test_maxargssize_append_annot
++{
++    my ($self) = @_;
++
++    # Use MULTIAPPEND, fail the second
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 { Literal => $email },
++                                 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ],
++                                 { Literal => $email } );
++}
++
++sub test_maxargssize_create
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE', "X" x 25, [ "X" x 25 ] );
++}
++
++sub test_maxargssize_create_ext
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE',
++                                 "X" x 5, [ "X" x 5, [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_fetch
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY', 'ENVELOPE', 'FLAGS',
++                                   'INTERNALDATE', 'RFC822.SIZE' ]);
++}
++
++sub test_maxargssize_fetch_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ [ "X" x 25, "X" x 25 ] ], "X" x 5 ] );
++}
++
++sub test_maxargssize_fetch_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ "X" x 5, [ "X" x 25, "X" x 25 ] ] ] );
++}
++
++sub test_maxargssize_fetch_headers
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY[HEADER.FIELDS', [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_getmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('GETMETADATA', 'INBOX', [ "X" x 25, "X" x 25 ] );
++}
++
++sub test_maxargssize_list_multi
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST', { Quote => '' }, [ "X" x 25, "X" x 25 ]);
++}
++
++sub test_maxargssize_list_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 [ 'SUBSCRIBED', 'REMOTE',
++                                   'RECURSIVEMATCH', 'SPECIAL-USE' ],
++                                 { Quote => '' }, '*');
++}
++
++sub test_maxargssize_list_return
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 { Quote => '' }, '*', 'RETURN',
++                                 [ 'SUBSCRIBED', 'CHILDREN',
++                                   'MYRIGHTS', 'SPECIAL-USE' ] );
++}
++
++sub test_maxargssize_search
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SEARCH',
++                                 'TEXT', "X" x 25, 'TEXT', { Quote => "X" x 25 } );
++}
++
++sub test_maxargssize_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SELECT', 'INBOX',
++                                 [ 'QRESYNC', [ '1234567890', '1234567890' ],
++                                   'ANNOTATE' ] );
++}
++
++sub test_maxargssize_setmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ "X" x 25, { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setmetadata2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ '/shared', { Quote => "X" x 25 },
++                                   '/shared', { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setquota
++{
++    my ($self) = @_;
++
++    my $store = $self->{adminstore};
++    my $talk = $store->get_client();
++
++    $talk->_send_cmd('SETQUOTA', 'user.cassandane',
++                     [ 'STORAGE', '1234567890',
++                       'MESSAGE', '1234567890',
++                       'MAILBOX', '1234567890' ] );
++    $self->assert_bye_toobig($store);
++}
++
++sub test_maxargssize_sort
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SORT',
++                                 [ 'ARRIVAL', 'CC', 'DATE',
++                                   'FROM', 'REVERSE', 'SIZE', 'TO' ],
++                                 'UTF-8', 'ALL');
++}
++
++sub test_maxargssize_status
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STATUS', 'INBOX',
++                                 [ 'MESSAGES', 'UIDNEXT',
++                                   'UIDVALIDITY', 'UNSEEN', 'SIZE' ] );
++}
++
++sub test_maxargssize_store_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_maxargssize_store_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ],
++                                   "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_append_zero
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_cmd('APPEND', 0, '', 'INBOX', { Literal => '' } );
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++}
++
++sub test_maxmessagesize_sync_literal
++{
++    my ($self) = @_;
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'APPEND',
++                                'INBOX', { Literal => $toobig_email } );
++}
++
++sub test_maxmessagesize_nosync_literal
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_literal_minus
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++1;
+diff --git a/cassandane/Cassandane/IMAPMessageStore.pm b/cassandane/Cassandane/IMAPMessageStore.pm
+index 338d1c5f3..959a9fabc 100644
+--- a/cassandane/Cassandane/IMAPMessageStore.pm
++++ b/cassandane/Cassandane/IMAPMessageStore.pm
+@@ -83,7 +83,7 @@ sub new
+ 
+ sub connect
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+     # if already successfully connected, do nothing
+     return
+@@ -115,6 +115,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to '$self->{host}:$self->{port}': $@";
+     }
+@@ -129,6 +130,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to server: $@";
+     }
+@@ -323,9 +325,9 @@ sub remove
+ 
+ sub get_client
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+-    $self->connect();
++    $self->connect(%params);
+     return $self->{client};
+ }
+ 
+-- 
+2.39.2
+
+
+From 280151cceff96ce5eddd4e71255ce73f80fb1565 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:49:46 -0400
+Subject: [PATCH 21/22] imapd.c: also emit a NO [TOOBIG] response for oversized
+ no-sync APPEND
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 46 ++++++++++++++---------
+ imap/imapd.c                              | 23 ++++++++----
+ 2 files changed, 44 insertions(+), 25 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+index 2275c5cf7..52c1c8117 100644
+--- a/cassandane/Cassandane/Cyrus/IMAPLimits.pm
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -59,6 +59,7 @@ $email =~ s/\r?\n/\r\n/gs;
+ 
+ my $toobig_email = $email . "X" x 100;
+ 
++# Check that we got an untagged BYE [TOOBIG] response
+ sub assert_bye_toobig
+ {
+     my ($self, $store) = @_;
+@@ -79,11 +80,11 @@ sub assert_bye_toobig
+         }
+     };
+ 
+-    # Check that we got a BYE [TOOBIG] response
+     $store->idle_response($handlers, 1);
+     $self->assert_num_equals(1, $got_toobig);
+ }
+ 
++# Send a command and expect an untagged BYE [TOOBIG] response
+ sub assert_cmd_bye_toobig
+ {
+     my $self = shift;
+@@ -97,28 +98,37 @@ sub assert_cmd_bye_toobig
+     $self->assert_bye_toobig();
+ }
+ 
++# Check that we got a tagged NO [TOOBIG] response
++sub assert_no_toobig
++{
++    my ($self, $talk) = @_;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    eval {
++        $talk->_parse_response($handlers);
++    };
++
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++# Send a command and expect a tagged NO [TOOBIG] response
+ sub assert_cmd_no_toobig
+ {
+     my $self = shift;
+     my $talk = shift;
+     my $cmd = shift;
+ 
+-    my $got_toobig = 0;
+-    my $handlers =
+-    {
+-        'no' => sub
+-        {
+-            # Pick out the [TOOBIG] response code
+-            my (undef, $resp) = @_;
+-            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
+-        }
+-    };
+-
+-    $talk->_imap_cmd($cmd, 0, $handlers, @_);
+-
+-    # Check that we got a NO [TOOBIG] response
+-    $self->assert_str_equals('no', $talk->get_last_completion_response());
+-    $self->assert_num_equals(1, $got_toobig);
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_no_toobig($talk);
+ }
+ 
+ sub new
+@@ -503,6 +513,7 @@ sub test_maxmessagesize_nosync_literal
+     my $talk = $self->{store}->get_client();
+     # Do this by brute force until we have IMAPTalk v4.06+
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+@@ -512,6 +523,7 @@ sub test_literal_minus
+ 
+     my $talk = $self->{store}->get_client();
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index e9451d35e..000fedb22 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3517,7 +3517,7 @@ static int isokflag(char *s, int *isseen)
+     }
+ }
+ 
+-static int getliteralsize(const char *p, int c, size_t maxsize,
++static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+                           unsigned *size, int *binary, const char **parseerr)
+ 
+ {
+@@ -3549,10 +3549,14 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+         /* LITERAL- says maximum size is 4096! */
+         if (lminus && num > 4096) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+             fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_MESSAGE_TOOBIG));
+             fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
+         }
+         isnowait++;
+@@ -3582,8 +3586,8 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     return 0;
+ }
+ 
+-static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *binary,
+-                         const char **parseerr)
++static int catenate_text(const char *tag, FILE *f, size_t maxsize,
++                         unsigned *totalsize, int *binary, const char **parseerr)
+ {
+     int c;
+     static struct buf arg;
+@@ -3595,7 +3599,8 @@ static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *bina
+     c = getword(imapd_in, &arg);
+ 
+     /* Read size from literal */
+-    r = getliteralsize(arg.s, c, maxsize - *totalsize, &size, binary, parseerr);
++    r = getliteralsize(tag, arg.s, c, maxsize - *totalsize,
++                       &size, binary, parseerr);
+     if (r) return r;
+ 
+     /* Catenate message part to stage */
+@@ -3742,7 +3747,8 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+     return r;
+ }
+ 
+-static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsigned *totalsize,
++static int append_catenate(const char *tag, FILE *f, const char *cur_name,
++                           size_t maxsize, unsigned *totalsize,
+                            int *binary, const char **parseerr, const char **url)
+ {
+     int c, r = 0;
+@@ -3756,7 +3762,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+ 
+         if (!strcasecmp(arg.s, "TEXT")) {
+-            int r1 = catenate_text(f, maxsize, totalsize, binary, parseerr);
++            int r1 = catenate_text(tag, f, maxsize, totalsize, binary, parseerr);
+             if (r1) return r1;
+ 
+             /* if we see a SP, we're trying to catenate more than one part */
+@@ -3998,13 +4004,14 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
++            r = append_catenate(tag, curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(tag, arg.s, c, maxmsgsize,
++                               &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From b21941fc79f81208cac4f8a2b32aa4ff80e4cc88 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:55:13 -0400
+Subject: [PATCH 22/22] imapd.c, imapparse.c: call fatal(EX_PROTOCOL) when
+ client exceeds a limit
+
+---
+ cunit/parse.testc | 12 ++++++------
+ imap/imapd.c      | 48 +++++++++++++++++++++++------------------------
+ imap/imapparse.c  | 22 +++++++++++-----------
+ 3 files changed, 41 insertions(+), 41 deletions(-)
+
+diff --git a/cunit/parse.testc b/cunit/parse.testc
+index 5a97f9b73..1786706cb 100644
+--- a/cunit/parse.testc
++++ b/cunit/parse.testc
+@@ -119,7 +119,7 @@ static void test_getint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -188,7 +188,7 @@ static void test_getsint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -255,7 +255,7 @@ static void test_getuint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint32, uint32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint32, uint32_t, STR4, &c, &val, &bytes_in);
+@@ -322,7 +322,7 @@ static void test_getint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -391,7 +391,7 @@ static void test_getsint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -458,7 +458,7 @@ static void test_getuint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint64, uint64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint64, uint64_t, STR4, &c, &val, &bytes_in);
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 000fedb22..ee6519033 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3551,13 +3551,13 @@ static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+-            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_MESSAGE_TOOBIG));
+-            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_PROTOCOL);
+         }
+         isnowait++;
+         p++;
+@@ -3928,7 +3928,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             do {
+                 c = getword(imapd_in, &arg);
+                 if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4264,7 +4264,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+@@ -4641,7 +4641,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+     }
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+@@ -4774,7 +4774,7 @@ badannotation:
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
+                         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5110,7 +5110,7 @@ badannotation:
+         do {
+             c = getword(imapd_in, &fetchatt);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+@@ -5459,7 +5459,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+         do {
+             c = getword(imapd_in, &storemod);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+@@ -5554,7 +5554,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+     for (;;) {
+         c = getword(imapd_in, &flagname);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -7462,7 +7462,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8308,7 +8308,7 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         else if (c != ' ') goto badlist;
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8462,7 +8462,7 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+@@ -8847,7 +8847,7 @@ static int parsecreateargs(struct dlist **extargs)
+         do {
+             c = getword(imapd_in, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+@@ -8858,7 +8858,7 @@ static int parsecreateargs(struct dlist **extargs)
+                 do {
+                     c = getword(imapd_in, &val);
+                     if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+@@ -8929,7 +8929,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -8982,7 +8982,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9062,7 +9062,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9168,7 +9168,7 @@ static int parse_annotate_store_data(const char *tag,
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9212,7 +9212,7 @@ static int parse_annotate_store_data(const char *tag,
+             }
+ 
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+@@ -9290,7 +9290,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9305,7 +9305,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11548,7 +11548,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     n = 0;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+@@ -11700,7 +11700,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -11806,7 +11806,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 1fdb8b312..5646f8812 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("[TOOBIG] Word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_PROTOCOL);
+             }
+         }
+ 
+@@ -157,11 +157,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+             }
+             if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_PROTOCOL);
+             }
+             isnowait++;
+             c = prot_getc(pin);
+@@ -225,7 +225,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 }
+                 buf_putc(buf, c);
+                 if (config_maxword && buf_len(buf) > config_maxword) {
+-                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                    fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+                 }
+                 c = prot_getc(pin);
+             }
+@@ -284,7 +284,7 @@ EXPORTED int getint32(struct protstream *pin, int32_t *num)
+     /* INT_MAX == 2147483647 */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 214748364 || (result == 214748364 && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -337,7 +337,7 @@ EXPORTED int getuint32(struct protstream *pin, uint32_t *num)
+     /* UINT_MAX == 4294967295U */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 429496729 || (result == 429496729 && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -361,7 +361,7 @@ EXPORTED int getint64(struct protstream *pin, int64_t *num)
+     /* LLONG_MAX == 9223372036854775807LL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 922337203685477580LL || (result == 922337203685477580LL && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -414,7 +414,7 @@ EXPORTED int getuint64(struct protstream *pin, uint64_t *num)
+     /* ULLONG_MAX == 18446744073709551615ULL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 1844674407370955161ULL || (result == 1844674407370955161ULL && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -636,7 +636,7 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+ 
+         if (searchargs->maxargssize_mark &&
+             prot_bytes_in(pin) > searchargs->maxargssize_mark) {
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         }
+ 
+     } while (c == ' ');
+@@ -1389,7 +1389,7 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     if (base->maxargssize_mark &&
+         prot_bytes_in(pin) > base->maxargssize_mark) {
+-        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+ 
+     if (!keep_charset)
+-- 
+2.39.2
+
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 92d28cfd1823..a26c310015b0 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.6.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -20,6 +20,8 @@ http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	36
 
+EXTRA_PATCHES=		${FILESDIR}/v36-CVE-2024-34055.patch:-p1
+
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
diff --git a/mail/cyrus-imapd36/files/v36-CVE-2024-34055.patch b/mail/cyrus-imapd36/files/v36-CVE-2024-34055.patch
new file mode 100644
index 000000000000..8761b618599e
--- /dev/null
+++ b/mail/cyrus-imapd36/files/v36-CVE-2024-34055.patch
@@ -0,0 +1,5348 @@
+From d95b0b211e8179b62fb3a814c827db5175968d01 Mon Sep 17 00:00:00 2001
+From: Robert Stepanek <rsto@fastmailteam.com>
+Date: Wed, 3 Jan 2024 09:51:36 +0100
+Subject: [PATCH 01/16] SearchFuzzy.pm: do not use non-standard XSNIPPETS
+ command
+
+The XSNIPPETS and XCONVMULTISTANDARD commands in Cyrus got
+deprecated, so don't keep our test using it.
+
+Signed-off-by: Robert Stepanek <rsto@fastmailteam.com>
+---
+ cassandane/Cassandane/Cyrus/SearchFuzzy.pm | 344 +++++++++------------
+ 1 file changed, 146 insertions(+), 198 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+index af0adaf64..5b3aad0e0 100644
+--- a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
++++ b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+@@ -43,6 +43,8 @@ use warnings;
+ use Cwd qw(abs_path);
+ use DateTime;
+ use Data::Dumper;
++use MIME::Base64 qw(encode_base64);
++use Encode qw(decode encode);
+ 
+ use lib '.';
+ use base qw(Cassandane::Cyrus::TestCase);
+@@ -50,10 +52,19 @@ use Cassandane::Util::Log;
+ 
+ sub new
+ {
++
+     my ($class, @args) = @_;
+     my $config = Cassandane::Config->default()->clone();
+-    $config->set(conversations => 'on');
+-    return $class->SUPER::new({ config => $config }, @args);
++    $config->set(
++        conversations => 'on',
++        httpallowcompress => 'no',
++        httpmodules => 'jmap',
++    );
++    return $class->SUPER::new({
++        config => $config,
++        jmap => 1,
++        services => [ 'imap', 'http' ]
++    }, @args);
+ }
+ 
+ sub set_up
+@@ -134,6 +145,55 @@ sub create_testmessages
+     $self->{instance}->run_command({cyrus => 1}, 'squatter');
+ }
+ 
++sub get_snippets
++{
++    # Previous versions of this test module used XSNIPPETS to
++    # assert snippets but this command got removed from Cyrus.
++    # Use JMAP instead.
++
++    my ($self, $folder, $uids, $filter) = @_;
++
++    my $imap = $self->{store}->get_client();
++    my $jmap = $self->{jmap};
++
++    $self->assert_not_null($jmap);
++
++    $imap->select($folder);
++    my $res = $imap->fetch($uids, ['emailid']);
++    my %emailIdToImapUid = map { $res->{$_}{emailid}[0] => $_ } keys %$res;
++
++    $res = $jmap->CallMethods([
++        ['SearchSnippet/get', {
++            filter => $filter,
++            emailIds => [ keys %emailIdToImapUid ],
++        }, 'R1'],
++    ]);
++
++    my @snippets;
++    foreach (@{$res->[0][1]{list}}) {
++        if ($_->{subject}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'SUBJECT',
++                $_->{subject},
++            ]);
++        }
++        if ($_->{preview}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'BODY',
++                $_->{preview},
++            ]);
++        }
++    }
++
++    return {
++        snippets => [ sort { $a->[1] <=> $b->[1] } @snippets ],
++    };
++}
++
+ sub test_copy_messages
+     :needs_search_xapian
+ {
+@@ -151,12 +211,13 @@ sub test_copy_messages
+ }
+ 
+ sub test_stem_verbs
+-    :min_version_3_0 :needs_search_xapian
++    :min_version_3_0 :needs_search_xapian :JMAPExtensions
+ {
+     my ($self) = @_;
+     $self->create_testmessages();
+ 
+     my $talk = $self->{store}->get_client();
++    $self->assert_not_null($self->{jmap});
+ 
+     xlog $self, "Select INBOX";
+     my $r = $talk->select("INBOX") || die;
+@@ -175,11 +236,8 @@ sub test_stem_verbs
+     $r = $talk->search('fuzzy', ['subject', { Quote => "runs" }]) || die;
+     $self->assert_num_equals(3, scalar @$r);
+ 
+-    xlog $self, 'XSNIPPETS for FUZZY subject "runs"';
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'subject', { Quote => 'runs' }]
+-    ) || die;
++    xlog $self, 'Get snippets for FUZZY subject "runs"';
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'runs' });
+     $self->assert_num_equals(3, scalar @{$r->{snippets}});
+ }
+ 
+@@ -250,12 +308,8 @@ sub test_snippet_wildcard
+     $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+ 
+-    xlog $self, "XSNIPPETS for $term";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => "$term*" }]
+-    ) || die;
+-    xlog $self, Dumper($r);
++    xlog $self, "Get snippets for $term";
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => "$term*" });
+     $self->assert_num_equals(2, scalar @{$r->{snippets}});
+ }
+ 
+@@ -358,13 +412,17 @@ sub test_normalize_snippets
+     my ($self) = @_;
+ 
+     # Set up test message with funny characters
+-    my $body = "foo gären советской diĝir naïve léger";
+-    my @terms = split / /, $body;
++use utf8;
++    my @terms = ( "gären", "советской", "diĝir", "naïve", "léger" );
++no utf8;
++    my $body = encode_base64(encode('UTF-8', join(' ', @terms)));
++    $body =~ s/\r?\n/\r\n/gs;
+ 
+     xlog $self, "Generate and index test messages.";
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+@@ -380,24 +438,20 @@ sub test_normalize_snippets
+ 
+     # Assert that diacritics are matched and returned
+     foreach my $term (@terms) {
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++        $r = $self->get_snippets('INBOX', $uids, { text => $term });
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+     }
+ 
+     # Assert that search without diacritics matches
+     if ($self->{skipdiacrit}) {
+         my $term = "naive";
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>naïve</b>"), -1);
++        xlog $self, "Get snippets for FUZZY text \"$term\"";
++        $r = $self->get_snippets('INBOX', $uids, { 'text' => $term });
++use utf8;
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>naïve</mark>"), -1);
++no utf8;
+     }
++
+ }
+ 
+ sub test_skipdiacrit
+@@ -499,38 +553,23 @@ sub test_snippets_termcover
+     my $r = $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-    my $want = "<b>favourite</b> <b>cereal</b>";
++    my $want = "<mark>favourite</mark> <mark>cereal</mark>";
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite',
+-           'fuzzy', 'text', 'cereal',
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        operator => 'AND',
++        conditions => [{
++            text => 'favourite',
++        }, {
++           text => 'cereal',
++        }, {
++           text => '"bogus gnarly"'
++        }],
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite cereal'
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    # Regression - a phrase is treated as a loose term
+-    $r = $talk->xsnippets( [ [ 'INBOX', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite nope cereal' },
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite cereal' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        text => 'favourite cereal',
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ }
+ 
+@@ -542,18 +581,28 @@ sub test_cjk_words
+ 
+     xlog $self, "Generate and index test messages.";
+ 
++use utf8;
+     my $body = "明末時已經有香港地方的概念";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+     # Splits into the words: "み, 円, 月額, 申込
++use utf8;
+     $body = "申込み！月額円";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("2", %params) || die;
+ 
+@@ -569,50 +618,45 @@ sub test_cjk_words
+ 
+     my $term;
+     # Search for a two-character CJK word
++use utf8;
+     $term = "已經";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
+-    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
++    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+ 
+     # Search for the CJK words 明末 and 時, note that the
+     # word order is reversed to the original message
++use utf8;
+     $term = "時明末";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ 
+     # Search for the partial CJK word 月
++use utf8;
+     $term = "月";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for the interleaved, partial CJK word 額申
++use utf8;
+     $term = "額申";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for three of four words: "み, 月額, 申込",
+     # in different order than the original.
++use utf8;
+     $term = "月額み申込";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ }
+ 
+@@ -805,86 +849,6 @@ sub test_xattachmentname
+ }
+ 
+ 
+-sub test_xapianv2
+-    :min_version_3_0 :needs_search_xapian
+-{
+-    my ($self) = @_;
+-
+-    my $talk = $self->{store}->get_client();
+-
+-    # This is a smallish regression test to check if we break something
+-    # obvious by moving Xapian indexing from folder:uid to message guids.
+-    #
+-    # Apart from the tests in this module, at least also the following
+-    # imodules are relevant: Metadata for SORT, Thread for THREAD.
+-
+-    xlog $self, "Generate message";
+-    my $r = $self->make_message("I run", body => "Run, Forrest! Run!" ) || die;
+-    my $uid = $r->{attrs}->{uid};
+-
+-    xlog $self, "Copy message into INBOX";
+-    $talk->copy($uid, "INBOX");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Create target mailbox";
+-    $talk->create("INBOX.target");
+-
+-    xlog $self, "Copy message into INBOX.target";
+-    $talk->copy($uid, "INBOX.target");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(3, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Generate message";
+-    $self->make_message("You run", body => "A running joke" ) || die;
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}});
+-
+-    xlog $self, "SEARCH FUZZY";
+-    $r = $talk->search(
+-        "charset", "utf-8", "fuzzy", "text", "run",
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @$r);
+-
+-    xlog $self, "Select INBOX";
+-    $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-
+-    xlog $self, "XSNIPPETS";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'body', 'run'],
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @{$r->{snippets}});
+-}
+-
+ sub test_snippets_escapehtml
+     :min_version_3_0 :needs_search_xapian
+ {
+@@ -914,21 +878,15 @@ sub test_snippets_escapehtml
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+     my %m;
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test1' ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test1' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test1</b> body with the same tag as snippets", $m{body});
+-    $self->assert_str_equals("<b>Test1</b> subject with an unescaped &amp; in it", $m{subject});
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test2' ]
+-    ) || die;
++    $self->assert_str_equals("<mark>Test1</mark> body with the same tag as snippets", $m{body});
++    $self->assert_str_equals("<mark>Test1</mark> subject with an unescaped &amp; in it", $m{subject});
+ 
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test2' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test2</b> body with a &lt;tag/&gt;, although it's plain text", $m{body});
+-    $self->assert_str_equals("<b>Test2</b> subject with a &lt;tag&gt; in it", $m{subject});
++    $self->assert_str_equals("<mark>Test2</mark> body with a &lt;tag/&gt;, although it's plain text", $m{body});
++    $self->assert_str_equals("<mark>Test2</mark> subject with a &lt;tag&gt; in it", $m{subject});
+ }
+ 
+ sub test_search_exactmatch
+@@ -963,13 +921,10 @@ sub test_search_exactmatch
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { body => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert(index($m{body}, "<b>some text</b>") != -1);
+-    $self->assert(index($m{body}, "<b>some</b> long <b>text</b>") == -1);
++    $self->assert(index($m{body}, "<mark>some text</mark>") != -1);
++    $self->assert(index($m{body}, "<mark>some</mark> long <mark>text</mark>") == -1);
+ }
+ 
+ sub test_search_subjectsnippet
+@@ -1004,10 +959,7 @@ sub test_search_subjectsnippet
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { text => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+     $self->assert_matches(qr/^\[plumbing\]/, $m{subject});
+ }
+@@ -1317,11 +1269,10 @@ sub test_detect_language
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', 'atmet' ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <b>atmeten</b>.'));
++    $r = $self->get_snippets('INBOX', $uids, { body => 'atmet' });
++use utf8;
++    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <mark>atmeten</mark>.'));
++no utf8;
+ }
+ 
+ sub test_detect_language_subject
+@@ -1377,12 +1328,9 @@ sub test_detect_language_subject
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'subject', 'Landschaft' ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'Landschaft' });
+     $self->assert_str_equals(
+-        'A subject with the German word <b>Landschaften</b>',
++        'A subject with the German word <mark>Landschaften</mark>',
+         $r->{snippets}[0][3]
+     );
+ }
+-- 
+2.39.2
+
+
+From cce755f3a49f3768058c4f52b2c32763e890a6b8 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:00:00 -0500
+Subject: [PATCH 02/16] imapd.c: UIDVALIDITY should be uint32_t and parse it as
+ such
+
+---
+ imap/imapd.c | 10 +++-------
+ imap/index.h |  2 +-
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 6f70820ca..8e087b731 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -4279,15 +4279,11 @@ static void cmd_select(char *tag, char *cmd, char *name)
+             }
+             else if ((client_capa & CAPA_QRESYNC) &&
+                      !strcmp(arg.s, "QRESYNC")) {
+-                char *p;
+-
+                 if (c != ' ') goto badqresync;
+                 c = prot_getc(imapd_in);
+                 if (c != '(') goto badqresync;
+-                c = getastring(imapd_in, imapd_out, &arg);
+-                v->uidvalidity = strtoul(arg.s, &p, 10);
+-                if (*p || !v->uidvalidity || v->uidvalidity == ULONG_MAX) goto badqresync;
+-                if (c != ' ') goto badqresync;
++                c = getuint32(imapd_in, &v->uidvalidity);
++                if (c != ' ' || !v->uidvalidity) goto badqresync;
+                 c = getmodseq(imapd_in, &v->modseq);
+                 if (c == EOF) goto badqresync;
+                 if (c == ' ') {
+@@ -4427,7 +4423,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         prot_printf(backend_current->out, "%s %s {" SIZE_T_FMT "+}\r\n%s",
+                     tag, cmd, strlen(name), name);
+         if (v->uidvalidity) {
+-            prot_printf(backend_current->out, " (QRESYNC (%lu " MODSEQ_FMT,
++            prot_printf(backend_current->out, " (QRESYNC (%u " MODSEQ_FMT,
+                         v->uidvalidity, v->modseq);
+             if (v->sequence) {
+                 prot_printf(backend_current->out, " %s", v->sequence);
+diff --git a/imap/index.h b/imap/index.h
+index ce8fe36c2..df12e609a 100644
+--- a/imap/index.h
++++ b/imap/index.h
+@@ -72,7 +72,7 @@ extern unsigned client_capa;
+ struct message;
+ 
+ struct vanished_params {
+-    unsigned long uidvalidity;
++    uint32_t uidvalidity;
+     modseq_t modseq;
+     const char *match_seq;
+     const char *match_uid;
+-- 
+2.39.2
+
+
+From f37421f2687b811c4e4bd8c0fc5c66d368cc3ffe Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 08:13:05 -0500
+Subject: [PATCH 03/16] imapd.c: consolidate ID field-value parse error
+ response
+
+---
+ imap/imapd.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 8e087b731..8773621e0 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3104,19 +3104,12 @@ static void cmd_id(char *tag)
+ 
+             /* get field name */
+             c = getstring(imapd_in, imapd_out, &field);
+-            if (c != ' ') {
++            if (c != ' ' ||
++                /* get field value */
++                (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
++                (c != ' ' && c != ')')) {
+                 prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing field name in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
+-                return;
+-            }
+-
+-            /* get field value */
+-            c = getnstring(imapd_in, imapd_out, &arg);
+-            if (c != ' ' && c != ')') {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing value in Id\r\n",
++                            "%s BAD Invalid field-value pair in Id\r\n",
+                             tag);
+                 eatline(imapd_in, c);
+                 return;
+-- 
+2.39.2
+
+
+From 0ed0466636f43ea32cb765c33fa6a8109d9ea69e Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:12:41 -0500
+Subject: [PATCH 04/16] imapd.c: response code in fatal() string MUST
+ immediately follow "* BYE"
+
+---
+ imap/imapd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 8773621e0..464d9d7ad 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1186,7 +1186,8 @@ EXPORTED void fatal(const char *s, int code)
+     }
+     recurse_code = code;
+     if (imapd_out) {
+-        prot_printf(imapd_out, "* BYE Fatal error: %s\r\n", s);
++        prot_printf(imapd_out, "* BYE %s%s\r\n",
++                    *s == '[' /* resp-text-code */ ? "" : "Fatal error: ", s);
+         prot_flush(imapd_out);
+     }
+     if (stages.count) {
+-- 
+2.39.2
+
+
+From fb0eee5f3c4d67c0ee84d8e33bd835d9f0044e4a Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 11:00:19 -0500
+Subject: [PATCH 05/16] imapparse.c: include [TOOBIG] response code for
+ oversized word/qstring
+
+---
+ imap/imapparse.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 02cc1ed92..d096584e3 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_IOERR);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
+             }
+         }
+ 
+@@ -212,6 +212,9 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                     return c;
+                 }
+                 buf_putc(buf, c);
++                if (config_maxword && buf_len(buf) > config_maxword) {
++                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                }
+                 c = prot_getc(pin);
+             }
+             /* never gets here */
+-- 
+2.39.2
+
+
+From dc9846028db0022372b4cfe4d5ea92ab22eb2ed0 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 13:31:11 -0500
+Subject: [PATCH 06/16] imapparse.c: fatal() when a client violates LITERAL-
+ limit
+
+---
+ imap/imap_err.et | 3 +++
+ imap/imapparse.c | 7 +++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index a98ec0e1b..072078f94 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,9 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_MINUS_TOO_LARGE,
++   "[TOOBIG] Non-synchronizing literal size exceeds 4K"
++
+ ec IMAP_USERFLAG_EXHAUSTED,
+    "Too many user flags in mailbox"
+ 
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index d096584e3..7a4794600 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -153,8 +153,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         buf_reset(buf);
+         c = getint32(pin, &len);
+         if (c == '+') {
+-            // LITERAL- says maximum size is 4096!
+-            if (lminus && len > 4096) return EOF;
++            /* LITERAL- says maximum size is 4096! */
++            if (lminus && len > 4096) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+-- 
+2.39.2
+
+
+From 8414e71a9d1fbc56d03d6fddb096484364e3406c Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 12 Feb 2024 10:54:03 -0500
+Subject: [PATCH 07/16] Cleanup and document the use of prot_setisclient()
+
+Only IMAP(-like) clients send LITERAL+ syntax
+---
+ backup/backupd.c       | 3 +--
+ backup/lcb.c           | 1 -
+ backup/lcb_read.c      | 2 --
+ backup/lcb_verify.c    | 2 --
+ cunit/getxstring.testc | 4 ----
+ imap/append.c          | 1 -
+ imap/backend.c         | 2 --
+ imap/cyr_dbtool.c      | 1 -
+ imap/dlist.c           | 5 ++++-
+ imap/imapd.c           | 4 ++++
+ imap/imapparse.c       | 5 +++--
+ imap/message.c         | 3 ---
+ imap/mupdate.c         | 3 +++
+ imap/sync_server.c     | 3 +--
+ imap/sync_support.c    | 4 ----
+ lib/prot.h             | 2 +-
+ 16 files changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/backup/backupd.c b/backup/backupd.c
+index 9f8fa7b15..d42ddbb70 100644
+--- a/backup/backupd.c
++++ b/backup/backupd.c
+@@ -229,9 +229,8 @@ EXPORTED int service_main(int argc __attribute__((unused)),
+     backupd_in = prot_new(0, 0);
+     backupd_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow use of LITERAL+ */
+     prot_setisclient(backupd_in, 1);
+-    prot_setisclient(backupd_out, 1);
+ 
+     /* Find out name of client host */
+     backupd_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/backup/lcb.c b/backup/lcb.c
+index dbba85ca7..3f68b1aaa 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -606,7 +606,6 @@ EXPORTED int backup_reindex(const char *name,
+             fprintf(out, "\nfound chunk at offset " OFF_T_FMT "\n\n", member_offset);
+ 
+         struct protstream *member = prot_readcb(_prot_fill_cb, gzuc);
+-        prot_setisclient(member, 1); /* don't sync literals */
+ 
+         // FIXME stricter timestamp sequence checks
+         time_t member_start_ts = -1;
+diff --git a/backup/lcb_read.c b/backup/lcb_read.c
+index f597c97c5..f2342d69d 100644
+--- a/backup/lcb_read.c
++++ b/backup/lcb_read.c
+@@ -113,7 +113,6 @@ EXPORTED int backup_read_message_data(struct backup *backup,
+     if (r) return r;
+ 
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+     r = parse_backup_line(ps, NULL, NULL, &dl);
+     prot_free(ps);
+ 
+@@ -203,7 +202,6 @@ EXPORTED int backup_prepare_message_upload(struct backup *backup,
+         if (!r) {
+             struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+             int c;
+-            prot_setisclient(ps, 1); /* don't sync literals */
+             c = parse_backup_line(ps, NULL, NULL, &dl);
+             prot_free(ps);
+             ps = NULL;
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index fb0477a8b..88e748c51 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -228,7 +228,6 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+         if (r) return r;
+ 
+         struct protstream *ps = prot_readcb(_prot_fill_cb, vmrock->gzuc);
+-        prot_setisclient(ps, 1); /* don't sync literals */
+         r = parse_backup_line(ps, NULL, NULL, &dl);
+ 
+         if (r == EOF) {
+@@ -528,7 +527,6 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+         goto done;
+     }
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+ 
+     struct buf cmd = BUF_INITIALIZER;
+     while (1) {
+diff --git a/cunit/getxstring.testc b/cunit/getxstring.testc
+index f5a5989a3..12efe86aa 100644
+--- a/cunit/getxstring.testc
++++ b/cunit/getxstring.testc
+@@ -72,9 +72,6 @@ static int tear_down(void)
+ 
+ /*
+  * Run a single testcase.
+- *
+- * Note: prot_setisclient() turns off off literal synchronising so
+- * we don't have to futz around with testing that.
+  */
+ #define _TESTCASE_PRE(fut, input, retval, consumed)                 \
+     do {                                                            \
+@@ -84,7 +81,6 @@ static int tear_down(void)
+         long long _consumed = (consumed);                           \
+         p = prot_readmap(input, sizeof(input)-1);                   \
+         CU_ASSERT_PTR_NOT_NULL_FATAL(p);                            \
+-        prot_setisclient(p, 1);                                     \
+         c = fut(p, NULL, &b);                                       \
+         CU_ASSERT_EQUAL(c, retval);                                 \
+         if (_consumed >= 0) {                                       \
+diff --git a/imap/append.c b/imap/append.c
+index f7cf7e770..b8bc7963a 100644
+--- a/imap/append.c
++++ b/imap/append.c
+@@ -436,7 +436,6 @@ static int callout_receive_reply(const char *callout,
+     }
+ 
+     p = prot_new(fd, /*write*/0);
+-    prot_setisclient(p, 1);
+ 
+     /* read and parse the reply as a dlist */
+     c = dlist_parse(results, /*parsekeys*/0, /*isbackup*/0, p);
+diff --git a/imap/backend.c b/imap/backend.c
+index 36b83b4d9..546f41d25 100644
+--- a/imap/backend.c
++++ b/imap/backend.c
+@@ -955,7 +955,6 @@ EXPORTED struct backend *backend_connect_pipe(int infd, int outfd,
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+@@ -1153,7 +1152,6 @@ EXPORTED struct backend *backend_connect(struct backend *ret_backend, const char
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+diff --git a/imap/cyr_dbtool.c b/imap/cyr_dbtool.c
+index fec57cede..c6d56ec77 100644
+--- a/imap/cyr_dbtool.c
++++ b/imap/cyr_dbtool.c
+@@ -155,7 +155,6 @@ static void batch_commands(struct db *db)
+     int r = 0;
+ 
+     prot_setisclient(in, 1);
+-    prot_setisclient(out, 1);
+ 
+     while (1) {
+         buf_reset(&cmd);
+diff --git a/imap/dlist.c b/imap/dlist.c
+index a2f876cd4..2b73ad5d0 100644
+--- a/imap/dlist.c
++++ b/imap/dlist.c
+@@ -1225,7 +1225,10 @@ EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey, int isbackup,
+     struct dlist *dl = NULL;
+ 
+     stream = prot_readmap(base, len);
+-    prot_setisclient(stream, 1); /* don't sync literals */
++
++    /* Allow LITERAL+ - this is silly, but required to parse personal CALDATA */
++    prot_setisclient(stream, 1);
++
+     c = dlist_parse(&dl, parsekey, isbackup, stream);
+     prot_free(stream);
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 464d9d7ad..2610076d6 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -955,6 +955,10 @@ int service_main(int argc __attribute__((unused)),
+ 
+     imapd_in = prot_new(0, 0);
+     imapd_out = prot_new(1, 1);
++
++    /* Allow LITERAL+ */
++    prot_setisclient(imapd_in, 1);
++
+     protgroup_insert(protin, imapd_in);
+ 
+     /* Find out name of client host */
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 7a4794600..d195630a5 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -149,10 +149,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         /* Literal */
+-        isnowait = pin->isclient;
++        isnowait = !pin->isclient;
+         buf_reset(buf);
+         c = getint32(pin, &len);
+-        if (c == '+') {
++
++        if (pin->isclient && c == '+') {
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+diff --git a/imap/message.c b/imap/message.c
+index 55a317da9..3e4980804 100644
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -3419,7 +3419,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read envelope response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_ENVELOPE),
+                         cacheitem_size(record, CACHE_ENVELOPE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_envelope(strm, *body);
+     prot_free(strm);
+@@ -3427,7 +3426,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read bodystructure response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_BODYSTRUCTURE),
+                         cacheitem_size(record, CACHE_BODYSTRUCTURE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_body(strm, *body, NULL);
+     prot_free(strm);
+@@ -4792,7 +4790,6 @@ static int message_parse_cbodystructure(message_t *m)
+                         cacheitem_size(&m->record, CACHE_BODYSTRUCTURE));
+     if (!prot)
+         return IMAP_MAILBOX_BADFORMAT;
+-    prot_setisclient(prot, 1);  /* don't crash parsing literals */
+ 
+     m->body = xzmalloc(sizeof(struct body));
+     r = parse_bodystructure_part(prot, m->body, NULL);
+diff --git a/imap/mupdate.c b/imap/mupdate.c
+index 2cc2571bc..82455adae 100644
+--- a/imap/mupdate.c
++++ b/imap/mupdate.c
+@@ -249,6 +249,9 @@ static struct conn *conn_new(int fd)
+     C->pin = prot_new(C->fd, 0);
+     C->pout = prot_new(C->fd, 1);
+ 
++    /* Allow LITERAL+ */
++    prot_setisclient(C->pin, 1);
++
+     prot_setflushonread(C->pin, C->pout);
+     prot_settimeout(C->pin, 180*60);
+ 
+diff --git a/imap/sync_server.c b/imap/sync_server.c
+index 3d6710f56..87a2cf346 100644
+--- a/imap/sync_server.c
++++ b/imap/sync_server.c
+@@ -323,9 +323,8 @@ int service_main(int argc __attribute__((unused)),
+     sync_in = prot_new(0, 0);
+     sync_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow LITERAL+ */
+     prot_setisclient(sync_in, 1);
+-    prot_setisclient(sync_out, 1);
+ 
+     /* Find out name of client host */
+     sync_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/imap/sync_support.c b/imap/sync_support.c
+index 885bc76a9..920c018f3 100644
+--- a/imap/sync_support.c
++++ b/imap/sync_support.c
+@@ -8058,10 +8058,6 @@ connected:
+     if (timeout < 3) timeout = 3;
+     prot_settimeout(backend->in, timeout);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
+-    prot_setisclient(backend->in, 1);
+-    prot_setisclient(backend->out, 1);
+-
+     return 0;
+ }
+ 
+diff --git a/lib/prot.h b/lib/prot.h
+index 98af5d160..89b0b0a2a 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -133,7 +133,7 @@ struct protstream {
+     int can_unget;
+     int bytes_in;
+     int bytes_out;
+-    int isclient;
++    int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+     prot_readcallback_t *readcallback_proc;
+-- 
+2.39.2
+
+
+From 4e65061e15245963008fde649b9f250c10f1b4d7 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 22:48:58 -0400
+Subject: [PATCH 08/16] imapd.c: LITERAL- also applies to APPEND
+
+imap_err.et: add IMAP_MESSAGE_TOOBIG error message
+---
+ imap/imap_err.et |  4 ++++
+ imap/imapd.c     | 12 ++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 072078f94..d90e30a4b 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,10 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++# Same as IMAP_MESSAGE_TOO_LARGE, but with TOOBIG response code
++ec IMAP_MESSAGE_TOOBIG,
++   "[TOOBIG] Message size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 2610076d6..c924be6e0 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3563,6 +3563,9 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+ {
+     int isnowait = 0;
+     uint32_t num;
++    static int lminus = -1;
++
++    if (lminus == -1) lminus = config_getswitch(IMAPOPT_LITERALMINUS);
+ 
+     /* Check for literal8 */
+     if (*p == '~') {
+@@ -3583,6 +3586,15 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     }
+ 
+     if (*p == '+') {
++        /* LITERAL- says maximum size is 4096! */
++        if (lminus && num > 4096) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++        }
++        if (num > maxsize) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++        }
+         isnowait++;
+         p++;
+     }
+-- 
+2.39.2
+
+
+From efa3a69a8ab7cff5dded76faa5c16099caf41e89 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 14:52:22 -0500
+Subject: [PATCH 09/16] imapd.c: remove XSNIPPETS and XCONV* commands
+
+---
+ cassandane/Cassandane/Cyrus/Conversations.pm |   71 --
+ imap/imapd.c                                 | 1006 ------------------
+ 2 files changed, 1077 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/Conversations.pm b/cassandane/Cassandane/Cyrus/Conversations.pm
+index 63645e458..f20cae7bd 100755
+--- a/cassandane/Cassandane/Cyrus/Conversations.pm
++++ b/cassandane/Cassandane/Cyrus/Conversations.pm
+@@ -708,77 +708,6 @@ sub bogus_test_replication_clash
+     $self->check_messages(\%exp, store => $replica_store);
+ }
+ 
+-sub test_xconvfetch
+-    :min_version_3_0
+-{
+-    my ($self) = @_;
+-    my $store = $self->{store};
+-
+-    # check IMAP server has the XCONVERSATIONS capability
+-    $self->assert($store->get_client()->capability()->{xconversations});
+-
+-    xlog $self, "generating messages";
+-    my $generator = Cassandane::ThreadedGenerator->new();
+-    $store->write_begin();
+-    while (my $msg = $generator->generate())
+-    {
+-        $store->write_message($msg);
+-    }
+-    $store->write_end();
+-
+-    xlog $self, "reading the whole folder again to discover CIDs etc";
+-    my %cids;
+-    my %uids;
+-    $store->read_begin();
+-    while (my $msg = $store->read_message())
+-    {
+-        my $uid = $msg->get_attribute('uid');
+-        my $cid = $msg->get_attribute('cid');
+-        my $threadid = $msg->get_header('X-Cassandane-Thread');
+-        if (defined $cids{$cid})
+-        {
+-            $self->assert_num_equals($threadid, $cids{$cid});
+-        }
+-        else
+-        {
+-            $cids{$cid} = $threadid;
+-            xlog $self, "Found CID $cid";
+-        }
+-        $self->assert_null($uids{$uid});
+-        $uids{$uid} = 1;
+-    }
+-    $store->read_end();
+-
+-    xlog $self, "Using XCONVFETCH on each conversation";
+-    foreach my $cid (keys %cids)
+-    {
+-        xlog $self, "XCONVFETCHing CID $cid";
+-
+-        my $result = $store->xconvfetch_begin($cid);
+-        $self->assert_not_null($result->{xconvmeta});
+-        $self->assert_num_equals(1, scalar keys %{$result->{xconvmeta}});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid}->{modseq});
+-        while (my $msg = $store->xconvfetch_message())
+-        {
+-            my $muid = $msg->get_attribute('uid');
+-            my $mcid = $msg->get_attribute('cid');
+-            my $threadid = $msg->get_header('X-Cassandane-Thread');
+-            $self->assert_str_equals($cid, $mcid);
+-            $self->assert_num_equals($cids{$cid}, $threadid);
+-            $self->assert_num_equals(1, $uids{$muid});
+-            $uids{$muid} |= 2;
+-        }
+-        $store->xconvfetch_end();
+-    }
+-
+-    xlog $self, "checking that all the UIDs in the folder were XCONVFETCHed";
+-    foreach my $uid (keys %uids)
+-    {
+-        $self->assert_num_equals(3, $uids{$uid});
+-    }
+-}
+-
+ #
+ # Test APPEND of a new composed draft message to the Drafts folder by
+ # the Fastmail webui, which sets the X-ME-Message-ID header to thread
+diff --git a/imap/imapd.c b/imap/imapd.c
+index c924be6e0..aec48912b 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -440,14 +440,6 @@ static void cmd_idle(char* tag);
+ 
+ static void cmd_starttls(char *tag, int imaps);
+ 
+-static void cmd_xconvsort(char *tag, int updates);
+-static void cmd_xconvmultisort(char *tag);
+-static void cmd_xconvmeta(const char *tag);
+-static void cmd_xconvfetch(const char *tag);
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs);
+-static void cmd_xsnippets(char *tag);
+ static void cmd_xstats(char *tag);
+ 
+ static void cmd_xapplepushservice(const char *tag,
+@@ -504,12 +496,8 @@ static int parse_metadata_store_data(const char *tag,
+ static int getlistselopts(char *tag, struct listargs *args);
+ static int getlistretopts(char *tag, struct listargs *args);
+ 
+-static int get_snippetargs(struct snippetargs **sap);
+-static void free_snippetargs(struct snippetargs **sap);
+ static int getsortcriteria(char *tag, struct sortcrit **sortcrit);
+ static int getdatetime(time_t *date);
+-static int parse_windowargs(const char *tag, struct windowargs **, int);
+-static void free_windowargs(struct windowargs *wa);
+ 
+ static void appendfieldlist(struct fieldlist **l, char *section,
+                      strarray_t *fields, char *trail,
+@@ -2280,32 +2268,6 @@ static void cmdloop(void)
+ 
+                 prometheus_increment(CYRUS_IMAP_XBACKUP_TOTAL);
+             }
+-            else if (!strcmp(cmd.s, "Xconvfetch")) {
+-                cmd_xconvfetch(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVFETCH_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvmultisort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvmultisort(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVMULTISORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvsort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 0);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVSORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvupdates")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 1);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVUPDATES_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xfer")) {
+                 if (readonly) goto noreadonly;
+                 int havepartition = 0;
+@@ -2331,9 +2293,6 @@ static void cmdloop(void)
+                          (havepartition ? arg3.s : NULL));
+                 /* XXX prometheus_increment(CYRUS_IMAP_XFER_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xconvmeta")) {
+-                cmd_xconvmeta(tag.s);
+-            }
+             else if (!strcmp(cmd.s, "Xlist")) {
+                 struct listargs listargs;
+ 
+@@ -2366,13 +2325,6 @@ static void cmdloop(void)
+                 cmd_xrunannotator(tag.s, arg1.s, usinguid);
+                 /* XXX prometheus_increment(CYRUS_IMAP_XRUNANNOTATOR_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xsnippets")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xsnippets(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XSNIPPETS_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xstats")) {
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xstats(tag.s);
+@@ -5186,8 +5138,6 @@ badannotation:
+     }
+     if (config_getswitch(IMAPOPT_CONVERSATIONS)
+         && (fa->fetchitems & (FETCH_MAILBOXIDS|FETCH_MAILBOXES))) {
+-        // annoyingly, this codepath COULD be called from xconv* commands, but it never is,
+-        // in reality, so it's safe leaving this as shared
+         int r = conversations_open_user(imapd_userid, 0/*shared*/, &fa->convstate);
+         if (r) {
+             syslog(LOG_WARNING, "error opening conversations for %s: %s",
+@@ -5275,136 +5225,6 @@ static void cmd_fetch(char *tag, char *sequence, int usinguid)
+     fetchargs_fini(&fetchargs);
+ }
+ 
+-static void do_one_xconvmeta(struct conversations_state *state,
+-                             conversation_id_t cid,
+-                             conversation_t *conv,
+-                             struct dlist *itemlist)
+-{
+-    struct dlist *item = dlist_newpklist(NULL, "");
+-    struct dlist *fl;
+-
+-    assert(conv);
+-    assert(itemlist);
+-
+-    for (fl = itemlist->head; fl; fl = fl->next) {
+-        const char *key = dlist_cstring(fl);
+-
+-        /* xxx - parse to a fetchitems? */
+-        if (!strcasecmp(key, "MODSEQ"))
+-            dlist_setnum64(item, "MODSEQ", conv->modseq);
+-        else if (!strcasecmp(key, "EXISTS"))
+-            dlist_setnum32(item, "EXISTS", conv->exists);
+-        else if (!strcasecmp(key, "UNSEEN"))
+-            dlist_setnum32(item, "UNSEEN", conv->unseen);
+-        else if (!strcasecmp(key, "SIZE"))
+-            dlist_setnum32(item, "SIZE", conv->size);
+-        else if (!strcasecmp(key, "COUNT")) {
+-            struct dlist *flist = dlist_newlist(item, "COUNT");
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *lookup = dlist_cstring(tmp);
+-                    int i = strarray_find_case(state->counted_flags, lookup, 0);
+-                    if (i >= 0) {
+-                        dlist_setflag(flist, "FLAG", lookup);
+-                        dlist_setnum32(flist, "COUNT", conv->counts[i]);
+-                    }
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "SENDERS")) {
+-            conv_sender_t *sender;
+-            struct dlist *slist = dlist_newlist(item, "SENDERS");
+-            for (sender = conv->senders; sender; sender = sender->next) {
+-                struct dlist *sli = dlist_newlist(slist, "");
+-                dlist_setatom(sli, "NAME", sender->name);
+-                dlist_setatom(sli, "ROUTE", sender->route);
+-                dlist_setatom(sli, "MAILBOX", sender->mailbox);
+-                dlist_setatom(sli, "DOMAIN", sender->domain);
+-            }
+-        }
+-        /* XXX - maybe rename FOLDERCOUNTS or something? */
+-        else if (!strcasecmp(key, "FOLDEREXISTS")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDEREXISTS");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "EXISTS", folder ? folder->exists : 0);
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "FOLDERUNSEEN")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDERUNSEEN");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "UNSEEN", folder ? folder->unseen : 0);
+-                }
+-            }
+-        }
+-        else {
+-            dlist_setatom(item, key, NULL); /* add a NIL response */
+-        }
+-    }
+-
+-    prot_printf(imapd_out, "* XCONVMETA %s ", conversation_id_encode(cid));
+-    dlist_print(item, 0, imapd_out);
+-    prot_printf(imapd_out, "\r\n");
+-
+-    dlist_free(&item);
+-}
+-
+-static void do_xconvmeta(const char *tag,
+-                         struct conversations_state *state,
+-                         struct dlist *cidlist,
+-                         struct dlist *itemlist)
+-{
+-    conversation_id_t cid;
+-    struct dlist *dl;
+-    int r;
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        const char *cidstr = dlist_cstring(dl);
+-        conversation_t *conv = NULL;
+-
+-        if (!conversation_id_decode(&cid, cidstr) || !cid) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID %s\r\n", tag, cidstr);
+-            return;
+-        }
+-
+-        r = conversation_load(state, cid, &conv);
+-        if (r) {
+-            prot_printf(imapd_out, "%s BAD Failed to read %s\r\n", tag, cidstr);
+-            conversation_free(conv);
+-            return;
+-        }
+-
+-        if (conv && conv->exists)
+-            do_one_xconvmeta(state, cid, conv, itemlist);
+-
+-        conversation_free(conv);
+-    }
+-
+-    prot_printf(imapd_out, "%s OK Completed\r\n", tag);
+-}
+-
+ static int do_xbackup(const char *channel,
+                       const ptrarray_t *list)
+ {
+@@ -5548,270 +5368,6 @@ done:
+     }
+ }
+ 
+-/*
+- * Parse and perform a XCONVMETA command.
+- */
+-void cmd_xconvmeta(const char *tag)
+-{
+-    int r;
+-    int c = ' ';
+-    struct conversations_state *state = NULL;
+-    struct dlist *cidlist = NULL;
+-    struct dlist *itemlist = NULL;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVMETA ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Failed to parse CID list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&itemlist, 0, imapd_in);
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out, "%s BAD Failed to parse item list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    // this one is OK, xconvmeta doesn't do an expunge
+-    r = conversations_open_user(imapd_userid, 1/*shared*/, &state);
+-    if (r) {
+-        prot_printf(imapd_out, "%s BAD failed to open db: %s\r\n",
+-                    tag, error_message(r));
+-        goto done;
+-    }
+-
+-    do_xconvmeta(tag, state, cidlist, itemlist);
+-
+- done:
+-
+-    dlist_free(&itemlist);
+-    dlist_free(&cidlist);
+-    conversations_commit(&state);
+-}
+-
+-/*
+- * Parse and perform a XCONVFETCH command.
+- */
+-void cmd_xconvfetch(const char *tag)
+-{
+-    int c = ' ';
+-    struct fetchargs fetchargs;
+-    int r;
+-    clock_t start = clock();
+-    modseq_t ifchangedsince = 0;
+-    char mytime[100];
+-    struct dlist *cidlist = NULL;
+-    struct dlist *item;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVFETCH ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        return;
+-    }
+-
+-    /* local mailbox */
+-    memset(&fetchargs, 0, sizeof(struct fetchargs));
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    /* check CIDs */
+-    for (item = cidlist->head; item; item = item->next) {
+-        if (!dlist_ishex64(item)) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID\r\n", tag);
+-            eatline(imapd_in, c);
+-            goto freeargs;
+-        }
+-    }
+-
+-    c = getmodseq(imapd_in, &ifchangedsince);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    r = parse_fetch_args(tag, "Xconvfetch", 0, &fetchargs);
+-    if (r)
+-        goto freeargs;
+-    fetchargs.fetchitems |= (FETCH_UIDVALIDITY|FETCH_FOLDER);
+-    fetchargs.namespace = &imapd_namespace;
+-    fetchargs.userid = imapd_userid;
+-
+-    r = do_xconvfetch(cidlist, ifchangedsince, &fetchargs);
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-
+-    if (r) {
+-        prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+-                    error_message(r), mytime);
+-    } else {
+-        prot_printf(imapd_out, "%s OK Completed (%s sec)\r\n",
+-                    tag, mytime);
+-    }
+-
+-freeargs:
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-    return;
+-
+-syntax_error:
+-    prot_printf(imapd_out, "%s BAD Syntax error\r\n", tag);
+-    eatline(imapd_in, c);
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-}
+-
+-static int xconvfetch_lookup(struct conversations_state *statep,
+-                             conversation_id_t cid,
+-                             modseq_t ifchangedsince,
+-                             hash_table *wanted_cids,
+-                             strarray_t *folder_list)
+-{
+-    const char *key = conversation_id_encode(cid);
+-    conversation_t *conv = NULL;
+-    conv_folder_t *folder;
+-    int r;
+-
+-    r = conversation_load(statep, cid, &conv);
+-    if (r) return r;
+-
+-    if (!conv)
+-        goto out;
+-
+-    if (!conv->exists)
+-        goto out;
+-
+-    /* output the metadata for this conversation */
+-    {
+-        struct dlist *dl = dlist_newlist(NULL, "");
+-        dlist_setatom(dl, "", "MODSEQ");
+-        do_one_xconvmeta(statep, cid, conv, dl);
+-        dlist_free(&dl);
+-    }
+-
+-    if (ifchangedsince >= conv->modseq)
+-        goto out;
+-
+-    hash_insert(key, (void *)1, wanted_cids);
+-
+-    for (folder = conv->folders; folder; folder = folder->next) {
+-        /* no contents */
+-        if (!folder->exists)
+-            continue;
+-
+-        /* finally, something worth looking at */
+-        strarray_add(folder_list, strarray_nth(statep->folders, folder->number));
+-    }
+-
+-out:
+-    conversation_free(conv);
+-    return 0;
+-}
+-
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs)
+-{
+-    struct conversations_state *state = NULL;
+-    int r = 0;
+-    struct index_state *index_state = NULL;
+-    struct dlist *dl;
+-    hash_table wanted_cids = HASH_TABLE_INITIALIZER;
+-    strarray_t folder_list = STRARRAY_INITIALIZER;
+-    struct index_init init;
+-    int i;
+-
+-    // this one expunges each mailbox it enters, so we need to lock exclusively
+-    r = conversations_open_user(imapd_userid, 0/*shared*/, &state);
+-    if (r) goto out;
+-
+-    construct_hash_table(&wanted_cids, 1024, 0);
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        r = xconvfetch_lookup(state, dlist_num(dl), ifchangedsince,
+-                              &wanted_cids, &folder_list);
+-        if (r) goto out;
+-    }
+-
+-    /* unchanged, woot */
+-    if (!folder_list.count)
+-        goto out;
+-
+-    fetchargs->cidhash = &wanted_cids;
+-
+-    memset(&init, 0, sizeof(struct index_init));
+-    init.userid = imapd_userid;
+-    init.authstate = imapd_authstate;
+-    init.out = imapd_out;
+-
+-    for (i = 0; i < folder_list.count; i++) {
+-        const char *mboxname;
+-        mbentry_t *mbentry = NULL;
+-
+-        if (state->folders_byname) mboxname = folder_list.data[i];
+-        else {
+-            mboxlist_lookup_by_uniqueid(folder_list.data[i], &mbentry, NULL);
+-            if (!mbentry) continue;
+-            mboxname = mbentry->name;
+-        }
+-
+-        r = index_open(mboxname, &init, &index_state);
+-        mboxlist_entry_free(&mbentry);
+-        if (r == IMAP_MAILBOX_NONEXISTENT)
+-            continue;
+-        if (r)
+-            goto out;
+-
+-        index_checkflags(index_state, 0, 0);
+-
+-        /* make sure \Deleted messages are expunged.  Will also lock the
+-         * mailbox state and read any new information */
+-        r = index_expunge(index_state, NULL, 1);
+-
+-        if (!r)
+-            index_fetchresponses(index_state, NULL, /*usinguid*/1,
+-                                 fetchargs, NULL);
+-
+-        index_close(&index_state);
+-
+-        if (r) goto out;
+-    }
+-
+-    r = 0;
+-
+-out:
+-    index_close(&index_state);
+-    conversations_commit(&state);
+-    free_hash_table(&wanted_cids, NULL);
+-    strarray_fini(&folder_list);
+-    return r;
+-}
+-
+ #undef PARSE_PARTIAL /* cleanup */
+ 
+ /*
+@@ -6209,314 +5765,6 @@ error:
+     freesearchargs(searchargs);
+ }
+ 
+-/*
+- * Perform a XCONVSORT or XCONVUPDATES command
+- */
+-void cmd_xconvsort(char *tag, int updates)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct index_init init;
+-    struct index_state *oldstate = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvsort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, updates);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    if (updates) {
+-        /* in XCONVUPDATES, need to force a re-read from scratch into
+-         * a new index, because we ask for deleted messages */
+-
+-        oldstate = imapd_index;
+-        imapd_index = NULL;
+-
+-        memset(&init, 0, sizeof(struct index_init));
+-        init.userid = imapd_userid;
+-        init.authstate = imapd_authstate;
+-        init.out = imapd_out;
+-        init.want_expunged = 1;
+-
+-        r = index_open(index_mboxname(oldstate), &init, &imapd_index);
+-        if (r) {
+-            prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                        error_message(r));
+-            goto error;
+-        }
+-
+-        index_checkflags(imapd_index, 0, 0);
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xconvsort\r\n", tag);
+-        goto error;
+-    }
+-
+-    if (updates)
+-        r = index_convupdates(imapd_index, sortcrit, searchargs, windowargs);
+-    else
+-        r = index_convsort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (oldstate) {
+-        index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVSORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    if (oldstate) {
+-        if (imapd_index) index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-/*
+- * Perform a XCONVMULTISORT command.  This is like XCONVSORT but returns
+- * search results from multiple folders.  It still requires a selected
+- * mailbox, for two reasons:
+- *
+- * a) it's a useful shorthand for choosing what the current
+- * conversations scope is, and
+- *
+- * b) the code to parse a search program currently relies on a selected
+- * mailbox.
+- *
+- * Unlike ESEARCH it doesn't take folder names for scope, instead the
+- * search scope is implicitly the current conversation scope.  This is
+- * implemented more or less by accident because both the Sphinx index
+- * and the conversations database are hardcoded to be per-user.
+- */
+-static void cmd_xconvmultisort(char *tag)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvmultisort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvMultiSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, /*updates*/0);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to XconvMultiSort\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_convmultisort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVMULTISORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-static void cmd_xsnippets(char *tag)
+-{
+-    int c;
+-    struct searchargs *searchargs = NULL;
+-    struct snippetargs *snippetargs = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xsnippets";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    c = get_snippetargs(&snippetargs);
+-    if (c == EOF) {
+-        prot_printf(imapd_out, "%s BAD Syntax error in snippet arguments\r\n", tag);
+-        goto error;
+-    }
+-    if (c != ' ') {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected arguments in Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_snippets(imapd_index, snippetargs, searchargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    freesearchargs(searchargs);
+-    free_snippetargs(&snippetargs);
+-    return;
+-
+-error:
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+ static void cmd_xstats(char *tag)
+ {
+     int metric;
+@@ -10897,81 +10145,6 @@ out_noprint:
+     seqset_free(&uids);
+ }
+ 
+-static void free_snippetargs(struct snippetargs **sap)
+-{
+-    while (*sap) {
+-        struct snippetargs *sa = *sap;
+-        *sap = sa->next;
+-        free(sa->mboxname);
+-        free(sa->uids.data);
+-        free(sa);
+-    }
+-}
+-
+-static int get_snippetargs(struct snippetargs **sap)
+-{
+-    int c;
+-    struct snippetargs **prevp = sap;
+-    struct snippetargs *sa = NULL;
+-    struct buf arg = BUF_INITIALIZER;
+-    uint32_t uid;
+-    char *intname = NULL;
+-
+-    c = prot_getc(imapd_in);
+-    if (c != '(') goto syntax_error;
+-
+-    for (;;) {
+-        c = prot_getc(imapd_in);
+-        if (c == ')') break;
+-        if (c != '(') goto syntax_error;
+-
+-        c = getastring(imapd_in, imapd_out, &arg);
+-        if (c != ' ') goto syntax_error;
+-
+-        intname = mboxname_from_external(buf_cstring(&arg), &imapd_namespace, imapd_userid);
+-
+-        /* allocate a new snippetargs */
+-        sa = xzmalloc(sizeof(struct snippetargs));
+-        sa->mboxname = xstrdup(intname);
+-        /* append to the list */
+-        *prevp = sa;
+-        prevp = &sa->next;
+-
+-        c = getuint32(imapd_in, &sa->uidvalidity);
+-        if (c != ' ') goto syntax_error;
+-
+-        c = prot_getc(imapd_in);
+-        if (c != '(') break;
+-        for (;;) {
+-            c = getuint32(imapd_in, &uid);
+-            if (c != ' ' && c != ')') goto syntax_error;
+-            if (sa->uids.count + 1 > sa->uids.alloc) {
+-                sa->uids.alloc += 64;
+-                sa->uids.data = xrealloc(sa->uids.data,
+-                                         sizeof(uint32_t) * sa->uids.alloc);
+-            }
+-            sa->uids.data[sa->uids.count++] = uid;
+-            if (c == ')') break;
+-        }
+-
+-        c = prot_getc(imapd_in);
+-        if (c != ')') goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ') goto syntax_error;
+-
+-out:
+-    free(intname);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free_snippetargs(sap);
+-    c = EOF;
+-    goto out;
+-}
+-
+ static void cmd_dump(char *tag, char *name, int uid_start)
+ {
+     int r = 0;
+@@ -12467,185 +11640,6 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     return EOF;
+ }
+ 
+-static int parse_windowargs(const char *tag,
+-                            struct windowargs **wa,
+-                            int updates)
+-{
+-    struct windowargs windowargs;
+-    struct buf arg = BUF_INITIALIZER;
+-    struct buf ext_folder = BUF_INITIALIZER;
+-    int c;
+-
+-    memset(&windowargs, 0, sizeof(windowargs));
+-
+-    c = prot_getc(imapd_in);
+-    if (c == EOF)
+-        goto out;
+-    if (c != '(') {
+-        /* no window args at all */
+-        prot_ungetc(c, imapd_in);
+-        goto out;
+-    }
+-
+-    for (;;)
+-    {
+-        c = prot_getc(imapd_in);
+-        if (c == EOF)
+-            goto out;
+-        if (c == ')')
+-            break;  /* end of window args */
+-
+-        prot_ungetc(c, imapd_in);
+-        c = getword(imapd_in, &arg);
+-        if (!arg.len)
+-            goto syntax_error;
+-
+-        if (!strcasecmp(arg.s, "CONVERSATIONS"))
+-            windowargs.conversations = 1;
+-        else if (!strcasecmp(arg.s, "POSITION")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.position);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.position == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "ANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "MULTIANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getastring(imapd_in, imapd_out, &ext_folder);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "CHANGEDSINCE")) {
+-            if (!updates)
+-                goto syntax_error;
+-            windowargs.changedsince = 1;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getmodseq(imapd_in, &windowargs.modseq);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.uidnext);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-        } else if (!strcasecmp(arg.s, "UPTO")) {
+-            if (!updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.upto);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-
+-            if (windowargs.upto == 0)
+-                goto syntax_error;
+-        }
+-        else
+-            goto syntax_error;
+-
+-        if (c == ')')
+-            break;
+-        if (c != ' ')
+-            goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-out:
+-    /* these two are mutually exclusive */
+-    if (windowargs.anchor && windowargs.position)
+-        goto syntax_error;
+-    /* changedsince is mandatory for XCONVUPDATES
+-     * and illegal for XCONVSORT */
+-    if (!!updates != windowargs.changedsince)
+-        goto syntax_error;
+-
+-    if (ext_folder.len) {
+-        windowargs.anchorfolder = mboxname_from_external(buf_cstring(&ext_folder),
+-                                                         &imapd_namespace,
+-                                                         imapd_userid);
+-    }
+-
+-    *wa = xmemdup(&windowargs, sizeof(windowargs));
+-    buf_free(&ext_folder);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free(windowargs.anchorfolder);
+-    buf_free(&ext_folder);
+-    prot_printf(imapd_out, "%s BAD Syntax error in window arguments\r\n", tag);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
+-    return EOF;
+-}
+-
+-static void free_windowargs(struct windowargs *wa)
+-{
+-    if (!wa)
+-        return;
+-    free(wa->anchorfolder);
+-    free(wa);
+-}
+-
+ /*
+  * Parse LIST selection options.
+  * The command has been parsed up to and including the opening '('.
+-- 
+2.39.2
+
+
+From 7638ac52a6d3a27f4ed4ece8f4dfe849d76b1007 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 26 Feb 2024 10:11:15 -0500
+Subject: [PATCH 10/16] imapd.c: add 'maxliteral' option
+
+---
+ changes/next/imap_literal_limits |  19 +++
+ imap/imap_err.et                 |   3 +
+ imap/imapd.c                     | 214 ++++++++++++++++++++++---------
+ imap/imapparse.c                 |  69 +++++-----
+ lib/imapoptions                  |  12 +-
+ lib/libconfig.c                  |   3 +
+ lib/libconfig.h                  |   1 +
+ 7 files changed, 229 insertions(+), 92 deletions(-)
+ create mode 100644 changes/next/imap_literal_limits
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+new file mode 100644
+index 000000000..c7fc35bbc
+--- /dev/null
++++ b/changes/next/imap_literal_limits
+@@ -0,0 +1,19 @@
++Description:
++
++Adds a config option to limit the size of a single literal allowed
++by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++
++
++Config changes:
++
++New 'maxliteral' option.
++
++
++Upgrade instructions:
++
++None.
++
++
++GitHub issue:
++
++None.
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index d90e30a4b..5768f49d1 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_TOO_LARGE,
++   "[TOOBIG] Literal size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index aec48912b..0bf8c199e 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1435,7 +1435,7 @@ static void cmdloop(void)
+                 if (c == '\r') goto missingargs;
+                 if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/0);
+@@ -1448,7 +1448,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1475,7 +1475,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 0, 0);
+ 
+@@ -1487,7 +1487,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, NULL);
+ 
+@@ -1532,7 +1532,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Examine")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -1563,7 +1563,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Getacl")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getacl(tag.s, arg1.s);
+ 
+@@ -1588,7 +1588,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquota")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquota(tag.s, arg1.s);
+ 
+@@ -1597,7 +1597,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquotaroot")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquotaroot(tag.s, arg1.s);
+ 
+@@ -1722,7 +1722,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1738,7 +1738,7 @@ static void cmdloop(void)
+                 /* delete a mailbox locally only */
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 1, 1);
+ 
+@@ -1751,7 +1751,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Myrights")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_myrights(tag.s, arg1.s);
+ 
+@@ -1761,7 +1761,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if(c == EOF) goto missingargs;
++                if(c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_mupdatepush(tag.s, arg1.s);
+ 
+@@ -1777,7 +1777,7 @@ static void cmdloop(void)
+                 if (c == '\r') goto missingargs;
+                 if (c != ' ' || !imparse_issequence(arg1.s)) goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/1);
+@@ -1812,7 +1812,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     havepartition = 1;
+                     c = getword(imapd_in, &arg3);
+@@ -1885,7 +1885,7 @@ static void cmdloop(void)
+                 if (c == ' ') {
+                     have_mbox = 1;
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto missingargs;
++                    if (c <= EOF) goto missingargs;
+                     if (c == ' ') {
+                         have_mech = 1;
+                         c = getword(imapd_in, &arg2);
+@@ -1957,7 +1957,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Select")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -1983,7 +1983,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 1);
+@@ -2001,7 +2001,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg2);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg3);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, arg3.s);
+ 
+@@ -2202,7 +2202,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 0);
+@@ -2349,7 +2349,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Xmeid")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xmeid(tag.s, arg1.s);
+             }
+@@ -2361,7 +2361,7 @@ static void cmdloop(void)
+ 
+                 do {
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto aps_missingargs;
++                    if (c <= EOF) goto aps_missingargs;
+ 
+                     if (!strcmp(arg1.s, "mailboxes")) {
+                         c = prot_getc(imapd_in);
+@@ -2373,7 +2373,7 @@ static void cmdloop(void)
+                             prot_ungetc(c, imapd_in);
+                             do {
+                                 c = getastring(imapd_in, imapd_out, &arg2);
+-                                if (c == EOF) break;
++                                if (c <= EOF) break;
+                                 strarray_push(&applepushserviceargs.mailboxes, arg2.s);
+                             } while (c == ' ');
+                         }
+@@ -2459,6 +2459,8 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     missingargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+@@ -2471,11 +2473,18 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     extraargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+         continue;
+ 
++    maxliteral:
++        prot_printf(imapd_out, "%s NO %s in %s\r\n",
++                    tag.s, error_message(IMAP_LITERAL_TOO_LARGE), cmd.s);
++        continue;
++
+     badsequence:
+         prot_printf(imapd_out,
+                     "%s BAD Invalid sequence in %s\r\n", tag.s, cmd.s);
+@@ -2648,10 +2657,14 @@ static void cmd_login(char *tag, char *user)
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         buf_free(&passwdbuf);
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to LOGIN\r\n",
+-                    tag);
+-        eatline(imapd_in, c);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in LOGIN\r\n", tag, error_message(c));
++        } else {
++            prot_printf(imapd_out,
++                        "%s BAD Unexpected extra arguments to LOGIN\r\n",
++                        tag);
++            eatline(imapd_in, c);
++        }
+         return;
+     }
+ 
+@@ -3065,10 +3078,16 @@ static void cmd_id(char *tag)
+                 /* get field value */
+                 (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
+                 (c != ' ' && c != ')')) {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid field-value pair in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
++                if (c == IMAP_LITERAL_TOO_LARGE) {
++                    prot_printf(imapd_out, "%s NO %s in Id\r\n",
++                                tag, error_message(c));
++                }
++                else {
++                    prot_printf(imapd_out,
++                                "%s BAD Invalid field-value pair in Id\r\n",
++                                tag);
++                    eatline(imapd_in, c);
++                }
+                 return;
+             }
+ 
+@@ -3758,6 +3777,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+         else if (!strcasecmp(arg.s, "URL")) {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ' && c != ')') {
+                 *parseerr = "Missing URL in Append command";
+                 return IMAP_PROTOCOL_ERROR;
+@@ -3956,8 +3976,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+                 c = parse_annotate_store_data(tag,
+                                               /*permessage_flag*/1,
+                                               &curstage->annotations);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto cleanup;
+                 }
+                 qdiffs[QUOTA_ANNOTSTORAGE] += sizeentryatts(curstage->annotations);
+@@ -4084,6 +4103,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+     if (r == IMAP_PROTOCOL_ERROR && parseerr) {
+         prot_printf(imapd_out, "%s BAD %s\r\n", tag, parseerr);
++    } else if (r == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+     } else if (r == IMAP_BADURL) {
+         prot_printf(imapd_out, "%s NO [BADURL \"%s\"] %s\r\n",
+                     tag, url, parseerr);
+@@ -4624,8 +4645,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+                                               /*permessage_flag*/1,
+                                               &fa->entries,
+                                               &fa->attribs);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto freeargs;
+                 }
+                 if (c != ')') {
+@@ -4738,6 +4758,11 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (c == IMAP_LITERAL_TOO_LARGE) {
++                            prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                        tag, error_message(c), cmd, fetchatt.s);
++                            goto freeargs;
++                        }
+                         for (p = fieldname.s; *p; p++) {
+                             if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                         }
+@@ -4968,6 +4993,11 @@ badannotation:
+                 }
+                 do {
+                     c = getastring(imapd_in, imapd_out, &fieldname);
++                    if (c == IMAP_LITERAL_TOO_LARGE) {
++                        prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                    tag, error_message(c), cmd, fetchatt.s);
++                        goto freeargs;
++                    }
+                     for (p = fieldname.s; *p; p++) {
+                         if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                     }
+@@ -5483,8 +5513,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         c = parse_annotate_store_data(tag, /*permessage_flag*/1,
+                                       &storeargs.entryatts);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeflags;
+         }
+         storeargs.namespace = &imapd_namespace;
+@@ -5658,6 +5687,12 @@ static void cmd_search(char *tag, int usinguid)
+         return;
+     }
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Search\r\n", tag, error_message(c));
++        freesearchargs(searchargs);
++        return;
++    }
++
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out, "%s BAD Unexpected extra arguments to Search\r\n", tag);
+         eatline(imapd_in, c);
+@@ -5836,16 +5871,19 @@ static void cmd_thread(char *tag, int usinguid)
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
++    }
++
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Thread\r\n", tag, error_message(c));
++        goto done;
+     }
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to Thread\r\n", tag);
+         eatline(imapd_in, c);
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
+     }
+ 
+     n = index_thread(imapd_index, alg, searchargs, usinguid);
+@@ -5854,6 +5892,7 @@ static void cmd_thread(char *tag, int usinguid)
+     prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
+                 error_message(IMAP_OK_COMPLETED), n, mytime);
+ 
++  done:
+     freesearchargs(searchargs);
+     return;
+ }
+@@ -7408,8 +7447,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == '(') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistselopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             return;
+         }
+     }
+@@ -7421,6 +7459,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     /* Read in reference name */
+     c = getastring(imapd_in, imapd_out, &reference);
++    if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+     if (c == EOF && !*reference.s) {
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to List: reference name\r\n",
+@@ -7443,6 +7482,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+             if (c != ' ') break;
+@@ -7458,6 +7498,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     else {
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &buf);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to List: mailbox pattern\r\n",
+@@ -7472,8 +7513,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == ' ') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistretopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeargs;
+         }
+     }
+@@ -7492,6 +7532,10 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     return;
+ 
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in List\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++
+   freeargs:
+     strarray_fini(&listargs->pat);
+     strarray_fini(&listargs->metaitems);
+@@ -8898,6 +8942,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation entry\r\n", tag);
+@@ -8925,6 +8970,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -8947,6 +8993,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute(s)\r\n", tag);
+@@ -8974,6 +9021,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation attribute\r\n", tag);
+@@ -8986,8 +9034,13 @@ static int parse_annotate_fetch_data(const char *tag,
+     return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9018,6 +9071,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing metadata entry\r\n", tag);
+@@ -9044,6 +9098,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* single entry -- add it to the list */
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE)  goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -9062,8 +9117,13 @@ static int parse_metadata_string_or_list(const char *tag,
+     if (c == ' ' || c == '\r' || c == ')') return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9115,6 +9175,7 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -9135,6 +9196,7 @@ static int parse_annotate_store_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &attrib);
+             else
+                 c = getqstring(imapd_in, imapd_out, &attrib);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute\r\n", tag);
+@@ -9148,6 +9210,7 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+             c = getbnstring(imapd_in, imapd_out, &value);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation value\r\n", tag);
+@@ -9189,8 +9252,14 @@ static int parse_annotate_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9223,6 +9292,7 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -9235,6 +9305,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata value\r\n", tag);
+@@ -9275,7 +9346,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+     if (c != ')') {
+         prot_printf(imapd_out,
+-                    "%s BAD Missing close paren in annotation entry list \r\n",
++                    "%s BAD Missing close paren in metadata entry list \r\n",
+                     tag);
+         goto baddata;
+     }
+@@ -9286,8 +9357,14 @@ static int parse_metadata_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ static void getannotation_response(const char *mboxname,
+@@ -9472,8 +9549,7 @@ static void cmd_getannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_fetch_data(tag, /*permessage_flag*/0, &entries, &attribs);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9707,8 +9783,10 @@ static void cmd_getmetadata(const char *tag)
+     while (nlists < 3)
+     {
+         c = parse_metadata_string_or_list(tag, &lists[nlists], &is_list[nlists]);
++        if (c <= EOF) goto freeargs;
++
+         nlists++;
+-        if (c == '\r' || c == EOF)
++        if (c == '\r')
+             break;
+     }
+ 
+@@ -9865,8 +9943,7 @@ static void cmd_setannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_store_data(tag, 0, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9933,8 +10010,7 @@ static void cmd_setmetadata(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_metadata_store_data(tag, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -10042,6 +10118,10 @@ static void cmd_xwarmup(const char *tag)
+     /* parse arguments: expect <mboxname> '('<warmup-items>')' */
+ 
+     c = getastring(imapd_in, imapd_out, &arg);
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Xwarmup\r\n", tag, error_message(c));
++        goto out_noprint;
++    }
+     if (c != ' ') {
+ syntax_error:
+         prot_printf(imapd_out, "%s BAD syntax error in %s\r\n", tag, cmd);
+@@ -11552,9 +11632,11 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_ANNOTATION;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ') goto missingarg;
+             (*sortcrit)[n].args.annot.entry = xstrdup(criteria.s);
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             if (!strcmp(criteria.s, "value.shared"))
+                 userid = "";
+@@ -11572,6 +11654,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11585,6 +11668,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASCONVFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11690,10 +11774,10 @@ static int getlistselopts(char *tag, struct listargs *args)
+ 
+             strarray_t options = STRARRAY_INITIALIZER;
+             c = parse_metadata_string_or_list(tag, &options, NULL);
++            if (c <= EOF) return c;
+             parse_getmetadata_options(&options, &opts);
+             args->metaopts = opts;
+             strarray_fini(&options);
+-            if (c == EOF) return EOF;
+         } else {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid List selection option \"%s\"\r\n",
+@@ -11721,7 +11805,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -11791,7 +11875,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+             args->ret |= LIST_RET_METADATA;
+             /* outputs the error for us */
+             c = parse_metadata_string_or_list(tag, &args->metaitems, NULL);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else {
+             prot_printf(imapd_out,
+@@ -11812,7 +11896,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -12971,6 +13055,11 @@ static void cmd_urlfetch(char *tag)
+         else prot_ungetc(c, imapd_in);
+ 
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Urlfetch\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         (void)prot_putc(' ', imapd_out);
+         prot_printstring(imapd_out, arg.s);
+ 
+@@ -13203,6 +13292,11 @@ static void cmd_genurlauth(char *tag)
+         char *intname = NULL;
+ 
+         c = getastring(imapd_in, imapd_out, &arg1);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Genurlauth\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to Genurlauth\r\n",
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index d195630a5..f04ad282a 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -159,6 +159,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+                 fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+             }
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+@@ -181,6 +185,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         if (!isnowait) {
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                return IMAP_LITERAL_TOO_LARGE;
++            }
++
+             prot_printf(pout, "+ go ahead\r\n");
+             prot_flush(pout);
+         }
+@@ -689,7 +697,7 @@ static int get_search_annotation(struct protstream *pin,
+ 
+     /* parse the value */
+     c = getbnstring(pin, pout, &value);
+-    if (c == EOF)
++    if (c <= EOF)
+         goto bad;
+ 
+     sa = xzmalloc(sizeof(*sa));
+@@ -710,6 +718,7 @@ bad:
+     buf_free(&attrib);
+     buf_free(&value);
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
+     if (c != EOF) prot_ungetc(c, pin);
+     return EOF;
+ }
+@@ -842,7 +851,7 @@ static int get_search_criterion(struct protstream *pin,
+         do {
+             c = get_search_criterion(pin, pout, e, base);
+         } while (c == ' ');
+-        if (c == EOF) return EOF;
++        if (c <= EOF) return c;
+         if (c != ')') {
+             prot_printf(pout, "%s BAD Missing required close paren in Search command\r\n",
+                    base->tag);
+@@ -878,7 +887,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "annotation")) {   /* RFC 5257 */
+             struct searchannot *annot = NULL;
+             c = get_search_annotation(pin, pout, base, c, &annot);
+-            if (c == EOF)
++            if (c <= EOF)
+                 goto badcri;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("annotation");
+@@ -899,23 +908,15 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "bcc")) {      /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "body")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+-        else if (!strcmp(criteria.s, "fuzzy")) {
+-            if (c != ' ') goto missingarg;
+-            base->fuzzy_depth++;
+-            c = get_search_criterion(pin, pout, parent, base);
+-            base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
+-            break;
+-        }
+         else goto badcri;
+         break;
+ 
+@@ -923,7 +924,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "cc")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (hasconv && !strcmp(criteria.s, "convflag")) {  /* nonstandard */
+@@ -986,7 +987,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "deliveredto")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -996,7 +997,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "emailid")) {   /* RFC 8474 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1009,7 +1010,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "folder")) {       /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("folder");
+             e->value.s = mboxname_from_external(arg.s, base->namespace, base->userid);
+@@ -1017,7 +1018,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "from")) {         /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "fuzzy")) {        /* RFC 6203 */
+@@ -1025,7 +1026,7 @@ static int get_search_criterion(struct protstream *pin,
+             base->fuzzy_depth++;
+             c = get_search_criterion(pin, pout, parent, base);
+             base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else goto badcri;
+         break;
+@@ -1036,7 +1037,7 @@ static int get_search_criterion(struct protstream *pin,
+             c = getastring(pin, pout, &arg);
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg2);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+ 
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find_field(arg.s);
+@@ -1098,7 +1099,7 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_NOT);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "new")) {  /* RFC 3501 */
+             e = search_expr_new(parent, SEOP_AND);
+@@ -1113,10 +1114,10 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_OR);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+             if (c != ' ') goto missingarg;
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "old")) {  /* RFC 3501 */
+             indexflag_match(parent, MESSAGE_RECENT, /*not*/1);
+@@ -1235,6 +1236,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spamabove")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_GE);
+             e->attr = search_attr_find("spamscore");
+@@ -1243,6 +1245,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spambelow")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_LT);
+             e->attr = search_attr_find("spamscore");
+@@ -1251,7 +1254,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "subject")) {  /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1261,19 +1264,19 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "to")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "text")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "threadid")) {   /* RFC 8474 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1323,25 +1326,25 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "xattachmentname")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentname", base);
+         }
+         else if (!strcmp(criteria.s, "xattachmentbody")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentbody", base);
+         }
+         else if (!strcmp(criteria.s, "xlistid")) {           /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "listid", base);
+         }
+         else if (!strcmp(criteria.s, "xcontenttype")) { /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "contenttype", base);
+         }
+         else goto badcri;
+@@ -1372,6 +1375,8 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     default:
+     badcri:
++        if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+         prot_printf(pout, "%s BAD Invalid Search criteria\r\n", base->tag);
+         if (c != EOF) prot_ungetc(c, pin);
+         return EOF;
+@@ -1384,6 +1389,8 @@ static int get_search_criterion(struct protstream *pin,
+     return c;
+ 
+  missingarg:
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+     prot_printf(pout, "%s BAD Missing required argument to Search %s\r\n",
+                 base->tag, criteria.s);
+     if (c != EOF) prot_ungetc(c, pin);
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 3d43d1c36..735b40897 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1660,11 +1660,21 @@ Blank lines and lines beginning with ``#'' are ignored.
+    messages larger than \fImaxmessagesize\fR bytes.  If set to 0, this
+    will allow messages of any size (the default). */
+ 
++{ "maxliteral", 131072, INT, "UNRELEASED" }
++/* Maximum size in bytes of a single literal allowed by the IMAP parser.
++.PP
++   Literals used for message [part] data in APPEND are only limited by
++   the 'maxmessagesize' option.
++.PP
++   If the 'literalminus' option is enabled, non-synchonizing literals
++   will be limited to the lesser of 4K and either 'maxliteral' or
++   'maxmessagesize', depending on the use-case. */
++
+ { "maxquoted", 131072, INT, "2.3.17" }
+ /* Maximum size of a single quoted string for the parser.  Default 128k */
+ 
+ { "maxword", 131072, INT, "2.3.17" }
+-/* Maximum size of a single word for the parser.  Default 128k */
++/* Maximum size of a single word allowed by the IMAP parser.  Default 128k */
+ 
+ { "mboxkey_db", "twoskip", STRINGLIST("skiplist", "twoskip", "zeroskip"), "3.1.6" }
+ /* The cyrusdb backend to use for mailbox keys. */
+diff --git a/lib/libconfig.c b/lib/libconfig.c
+index 0ec8b2526..a30b038d6 100644
+--- a/lib/libconfig.c
++++ b/lib/libconfig.c
+@@ -84,6 +84,7 @@ EXPORTED int config_auditlog;
+ EXPORTED int config_iolog;
+ EXPORTED unsigned config_maxword;
+ EXPORTED unsigned config_maxquoted;
++EXPORTED unsigned config_maxliteral;
+ EXPORTED int config_qosmarking;
+ EXPORTED int config_debug;
+ 
+@@ -473,6 +474,7 @@ EXPORTED void config_reset(void)
+     config_defdomain = NULL;
+     config_auditlog = 0;
+     config_serverinfo = 0;
++    config_maxliteral = 0;
+     config_maxquoted = 0;
+     config_maxword = 0;
+     config_qosmarking = 0;
+@@ -665,6 +667,7 @@ EXPORTED void config_read(const char *alt_config, const int config_need_data)
+     config_serverinfo = config_getenum(IMAPOPT_SERVERINFO);
+ 
+     /* set some limits */
++    config_maxliteral = config_getint(IMAPOPT_MAXLITERAL);
+     config_maxquoted = config_getint(IMAPOPT_MAXQUOTED);
+     config_maxword = config_getint(IMAPOPT_MAXWORD);
+ 
+diff --git a/lib/libconfig.h b/lib/libconfig.h
+index dd9eee2e3..8c8fed54a 100644
+--- a/lib/libconfig.h
++++ b/lib/libconfig.h
+@@ -89,6 +89,7 @@ extern enum enum_value config_virtdomains;
+ extern enum enum_value config_mupdate_config;
+ extern int config_auditlog;
+ extern int config_iolog;
++extern unsigned config_maxliteral;
+ extern unsigned config_maxquoted;
+ extern unsigned config_maxword;
+ extern int config_qosmarking;
+-- 
+2.39.2
+
+
+From d06d8d072e0a6517e2205929ad0cf2af83ba76d8 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:18:52 -0500
+Subject: [PATCH 11/16] prot.h: change bytes_in/out to uint64_t (for
+ long-running imapd)
+
+---
+ backup/lcb.c         |  4 ++--
+ backup/lcb_compact.c |  4 ++--
+ backup/lcb_verify.c  |  8 ++++----
+ imap/httpd.c         | 14 ++++++++------
+ imap/imapd.c         | 18 ++++++++++--------
+ imap/pop3d.c         | 18 ++++++++++--------
+ lib/prot.h           |  8 ++++----
+ 7 files changed, 40 insertions(+), 34 deletions(-)
+
+diff --git a/backup/lcb.c b/backup/lcb.c
+index 3f68b1aaa..e1eefab89 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -620,11 +620,11 @@ EXPORTED int backup_reindex(const char *name,
+                 const char *error = prot_error(member);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                            name, member_offset, prot_bytes_in(member), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 member_offset, prot_bytes_in(member), error);
+ 
+                     r = IMAP_IOERROR;
+diff --git a/backup/lcb_compact.c b/backup/lcb_compact.c
+index 5fec296fc..779f8604b 100644
+--- a/backup/lcb_compact.c
++++ b/backup/lcb_compact.c
+@@ -528,11 +528,11 @@ EXPORTED int backup_compact(const char *name,
+                 const char *error = prot_error(in);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                            name, chunk->offset, prot_bytes_in(in), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 chunk->offset, prot_bytes_in(in), error);
+ 
+                     /* chunk is corrupt, discard the rest of it and get on with
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index 88e748c51..cfda6c93b 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -234,10 +234,10 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, message->id, message->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             message->id, message->offset, prot_bytes_in(ps), error);
+             }
+             prot_free(ps);
+@@ -540,10 +540,10 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 r = EOF;
+             }
+diff --git a/imap/httpd.c b/imap/httpd.c
+index 32ea446e6..68784ae09 100644
+--- a/imap/httpd.c
++++ b/imap/httpd.c
+@@ -679,8 +679,8 @@ EXPORTED int http1_resp_body_chunk(struct transaction_t *txn,
+ static void httpd_reset(struct http_connection *conn)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     /* run any delayed actions */
+     libcyrus_run_delayed();
+@@ -722,7 +722,8 @@ static void httpd_reset(struct http_connection *conn)
+ 
+     if (config_auditlog) {
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+     }
+ 
+@@ -1104,8 +1105,8 @@ void usage(void)
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1174,7 +1175,8 @@ void shut_down(int code)
+ 
+     if (config_auditlog)
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+ 
+     saslprops_free(&saslprops);
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 0bf8c199e..9341f041c 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -730,8 +730,8 @@ static int mlookup(const char *tag, const char *ext_name,
+ static void imapd_reset(void)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     /* run delayed commands first before closing anything */
+     libcyrus_run_delayed();
+@@ -779,8 +779,9 @@ static void imapd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     imapd_in = imapd_out = NULL;
+ 
+@@ -1074,8 +1075,8 @@ void shut_down(int code) __attribute__((noreturn));
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1142,8 +1143,9 @@ void shut_down(int code)
+                               : CYRUS_IMAP_SHUTDOWN_TOTAL_STATUS_OK);
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     if (protin) protgroup_free(protin);
+ 
+diff --git a/imap/pop3d.c b/imap/pop3d.c
+index ee5a6fad8..3db7e2315 100644
+--- a/imap/pop3d.c
++++ b/imap/pop3d.c
+@@ -325,8 +325,8 @@ static struct sasl_callback mysasl_cb[] = {
+ 
+ static void popd_reset(void)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     proc_cleanup();
+ 
+@@ -361,8 +361,9 @@ static void popd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     popd_in = popd_out = NULL;
+ 
+@@ -598,8 +599,8 @@ static void usage(void)
+  */
+ void shut_down(int code)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -646,8 +647,9 @@ void shut_down(int code)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+ #ifdef HAVE_SSL
+     tls_shutdown_serverengine();
+diff --git a/lib/prot.h b/lib/prot.h
+index 89b0b0a2a..94b22fad8 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -131,8 +131,8 @@ struct protstream {
+     struct buf *writetobuf;
+ 
+     int can_unget;
+-    int bytes_in;
+-    int bytes_out;
++    uint64_t bytes_in;
++    uint64_t bytes_out;
+     int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+@@ -224,8 +224,8 @@ extern int prot_free(struct protstream *s);
+ extern int prot_setlog(struct protstream *s, int fd);
+ 
+ /* Get traffic counts */
+-extern int prot_bytes_in(struct protstream *s);
+-extern int prot_bytes_out(struct protstream *s);
++extern uint64_t prot_bytes_in(struct protstream *s);
++extern uint64_t prot_bytes_out(struct protstream *s);
+ #define prot_bytes_in(s) ((s)->bytes_in)
+ #define prot_bytes_out(s) ((s)->bytes_out)
+ 
+-- 
+2.39.2
+
+
+From 800100d1c062b307d88c6590554da5383e6e6239 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:35:44 -0500
+Subject: [PATCH 12/16] imapd.c: rename 'maxsize' to 'maxmsgsize'
+
+---
+ imap/imapd.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 9341f041c..06a32afef 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -135,7 +135,7 @@ static int imaps = 0;
+ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+-static size_t maxsize = 0;
++static size_t maxmsgsize = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -900,8 +900,8 @@ int service_init(int argc, char **argv, char **envp)
+ 
+     prometheus_increment(CYRUS_IMAP_READY_LISTENERS);
+ 
+-    maxsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+-    if (!maxsize) maxsize = UINT32_MAX;
++    maxmsgsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
++    if (!maxmsgsize) maxmsgsize = UINT32_MAX;
+ 
+     return 0;
+ }
+@@ -3486,7 +3486,7 @@ static void capa_response(int flags)
+         prot_printf(imapd_out, " IDLE");
+     }
+ 
+-    prot_printf(imapd_out, " APPENDLIMIT=%zu", maxsize);
++    prot_printf(imapd_out, " APPENDLIMIT=%zu", maxmsgsize);
+ }
+ 
+ /*
+@@ -4006,13 +4006,13 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxsize, &size,
++            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From 333de29fd6f1253000b364b402e2771e70c1200f Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 15:08:42 -0500
+Subject: [PATCH 13/16] imapd.c: limit the total size of IMAP command arguments
+
+Only concerned with commands that can have an unlimited
+number of arguments.
+---
+ changes/next/imap_literal_limits |  7 ++-
+ imap/imap_err.et                 |  3 +
+ imap/imapd.c                     | 97 +++++++++++++++++++++++++++++---
+ imap/imapd.h                     |  1 +
+ imap/imapparse.c                 | 10 ++++
+ lib/imapoptions                  |  5 ++
+ 6 files changed, 112 insertions(+), 11 deletions(-)
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+index c7fc35bbc..f1ea34a0b 100644
+--- a/changes/next/imap_literal_limits
++++ b/changes/next/imap_literal_limits
+@@ -1,12 +1,13 @@
+ Description:
+ 
+-Adds a config option to limit the size of a single literal allowed
+-by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++Adds config options to limit the size of a single literal allowed
++by the IMAP parser and to limit the total size of IMAP command arguments.
++Also properly applies LITERAL- to IMAP APPEND.
+ 
+ 
+ Config changes:
+ 
+-New 'maxliteral' option.
++New 'maxliteral' and 'maxargssize' options.
+ 
+ 
+ Upgrade instructions:
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 5768f49d1..d1391199d 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_ARGS_TOO_LARGE,
++   "[TOOBIG] Command arguments total size exceeds fixed limit"
++
+ ec IMAP_LITERAL_TOO_LARGE,
+    "[TOOBIG] Literal size exceeds fixed limit"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 06a32afef..f17e789f1 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -136,6 +136,8 @@ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+ static size_t maxmsgsize = 0;
++static int64_t maxargssize = 0;
++static uint64_t maxargssize_mark = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -903,6 +905,9 @@ int service_init(int argc, char **argv, char **envp)
+     maxmsgsize = config_getint(IMAPOPT_MAXMESSAGESIZE);
+     if (!maxmsgsize) maxmsgsize = UINT32_MAX;
+ 
++    maxargssize = config_getint(IMAPOPT_MAXARGSSIZE);
++    if (maxargssize <= 0) maxargssize = UINT32_MAX;
++
+     return 0;
+ }
+ 
+@@ -1352,6 +1357,9 @@ static void cmdloop(void)
+            allowed when not logged in */
+         if (!imapd_userid && !strchr("AELNCIS", cmd.s[0])) goto nologin;
+ 
++        /* Set limit on the total number of bytes allowed for arguments */
++        maxargssize_mark = prot_bytes_in(imapd_in) + maxargssize;
++
+         /* Start command timer */
+         cmdtime_starttimer();
+ 
+@@ -3923,6 +3931,9 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+         curstage = xzmalloc(sizeof(*curstage));
+         ptrarray_push(&stages, curstage);
+ 
++        /* Set limit on the total number of bytes allowed for mailbox+append-opts */
++        maxargssize_mark = prot_bytes_in(imapd_in) + (maxargssize - strlen(name));
++
+         /* now parsing "append-opts" in the ABNF */
+ 
+         /* Parse flags */
+@@ -3931,6 +3942,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             strarray_init(&curstage->flags);
+             do {
+                 c = getword(imapd_in, &arg);
++                if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4038,15 +4051,23 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     }
+ 
+  done:
+-    if (r) {
+-        eatline(imapd_in, c);
+-    } else {
++    switch (r) {
++    case IMAP_ZERO_LENGTH_LITERAL:
++    case IMAP_MESSAGE_TOO_LARGE:
++        break;
++
++    case 0:
+         /* we should be looking at the end of the line */
+-        if (!IS_EOL(c, imapd_in)) {
+-            parseerr = "junk after literal";
+-            r = IMAP_PROTOCOL_ERROR;
+-            eatline(imapd_in, c);
+-        }
++        if (IS_EOL(c, imapd_in)) break;
++
++        parseerr = "junk after literal";
++        r = IMAP_PROTOCOL_ERROR;
++
++        GCC_FALLTHROUGH
++
++    default:
++        eatline(imapd_in, c);
++        break;
+     }
+ 
+     /* Append from the stage(s) */
+@@ -4258,6 +4279,9 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         c = getword(imapd_in, &arg);
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+                 client_capa |= CAPA_CONDSTORE;
+@@ -4630,6 +4654,9 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+         c = getword(imapd_in, &fetchatt);
+     }
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+         case 'A':
+@@ -4760,6 +4787,8 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5094,6 +5123,9 @@ badannotation:
+         }
+         do {
+             c = getword(imapd_in, &fetchatt);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5440,6 +5472,9 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         do {
+             c = getword(imapd_in, &storemod);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5532,6 +5567,8 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+     for (;;) {
+         c = getword(imapd_in, &flagname);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -5660,6 +5697,8 @@ static void cmd_search(char *tag, int usinguid)
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
+ 
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     /* Set FUZZY search according to config and quirks */
+     static const char *annot = IMAP_ANNOT_NS "search-fuzzy-always";
+     char *inbox = mboxname_user_mbox(imapd_userid, NULL);
+@@ -5754,6 +5793,9 @@ static void cmd_sort(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     if (imapd_id.quirks & QUIRK_SEARCHFUZZY)
+         searchargs->fuzzy_depth++;
+ 
+@@ -5870,6 +5912,9 @@ static void cmd_thread(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+@@ -7484,6 +7529,8 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8333,6 +8380,9 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         newquotas[res] = limit;
+         if (c == ')') break;
+         else if (c != ' ') goto badlist;
++
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8485,6 +8535,9 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     c = getword(imapd_in, &arg);
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+             statusitems |= STATUS_MESSAGES;
+@@ -8868,6 +8921,9 @@ static int parsecreateargs(struct dlist **extargs)
+         /* new style RFC 4466 arguments */
+         do {
+             c = getword(imapd_in, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+             c = prot_getc(imapd_in);
+@@ -8876,6 +8932,9 @@ static int parsecreateargs(struct dlist **extargs)
+                 sub = dlist_newlist(res, name);
+                 do {
+                     c = getword(imapd_in, &val);
++                    if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+                 if (c != ')') goto fail;
+@@ -8944,6 +9003,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -8995,6 +9056,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9073,6 +9136,8 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9177,6 +9242,8 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9219,6 +9286,9 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+ 
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+ 
+@@ -9294,6 +9364,8 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9307,6 +9379,8 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11595,6 +11669,9 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     nsort = 0;
+     n = 0;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+             nsort += SORTGROWSIZE;
+@@ -11744,6 +11821,8 @@ static int getlistselopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -11848,6 +11927,8 @@ static int getlistretopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapd.h b/imap/imapd.h
+index 39dd6d0d9..2030b7466 100644
+--- a/imap/imapd.h
++++ b/imap/imapd.h
+@@ -222,6 +222,7 @@ struct searchargs {
+     int state;
+     /* used only during parsing */
+     int fuzzy_depth;
++    uint64_t maxargssize_mark;
+ 
+     /* For ESEARCH & XCONVMULTISORT */
+     const char *tag;
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index f04ad282a..0e8bdc5dd 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -634,6 +634,11 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+             goto bad;
+         }
+ 
++        if (searchargs->maxargssize_mark &&
++            prot_bytes_in(pin) > searchargs->maxargssize_mark) {
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        }
++
+     } while (c == ' ');
+ 
+     /* RFC 4731:
+@@ -1382,6 +1387,11 @@ static int get_search_criterion(struct protstream *pin,
+         return EOF;
+     }
+ 
++    if (base->maxargssize_mark &&
++        prot_bytes_in(pin) > base->maxargssize_mark) {
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++    }
++
+     if (!keep_charset)
+         base->state &= ~GETSEARCH_CHARSET_KEYWORD;
+     base->state &= ~GETSEARCH_RETURN;
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 735b40897..dac3ed0b8 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1655,6 +1655,11 @@ Blank lines and lines beginning with ``#'' are ignored.
+ /* Maximum number of logged in sessions allowed per user,
+    zero means no limit */
+ 
++{ "maxargssize", 0, INT, "UNRELEASED" }
++/* Maximum total size of arguments to an IMAP command that will be
++   accepted by Cyrus.
++   Commands with arguments that exceed this limit will be rejected. 
++
+ { "maxmessagesize", 0, INT, "2.3.17" }
+ /* Maximum incoming LMTP message size.  If non-zero, lmtpd will reject
+    messages larger than \fImaxmessagesize\fR bytes.  If set to 0, this
+-- 
+2.39.2
+
+
+From dcc88bb665836addd6ca9d641b2a0c0ee483c61c Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Tue, 12 Mar 2024 23:16:30 -0400
+Subject: [PATCH 14/16] Add IMAPLimits.pm
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 518 ++++++++++++++++++++++
+ cassandane/Cassandane/IMAPMessageStore.pm |   8 +-
+ 2 files changed, 523 insertions(+), 3 deletions(-)
+ create mode 100644 cassandane/Cassandane/Cyrus/IMAPLimits.pm
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+new file mode 100644
+index 000000000..2275c5cf7
+--- /dev/null
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -0,0 +1,518 @@
++#!/usr/bin/perl
++#
++#  Copyright (c) 2011-2023 FastMail Pty Ltd. All rights reserved.
++#
++#  Redistribution and use in source and binary forms, with or without
++#  modification, are permitted provided that the following conditions
++#  are met:
++#
++#  1. Redistributions of source code must retain the above copyright
++#     notice, this list of conditions and the following disclaimer.
++#
++#  2. Redistributions in binary form must reproduce the above copyright
++#     notice, this list of conditions and the following disclaimer in
++#     the documentation and/or other materials provided with the
++#     distribution.
++#
++#  3. The name "Fastmail Pty Ltd" must not be used to
++#     endorse or promote products derived from this software without
++#     prior written permission. For permission or any legal
++#     details, please contact
++#      FastMail Pty Ltd
++#      PO Box 234
++#      Collins St West 8007
++#      Victoria
++#      Australia
++#
++#  4. Redistributions of any form whatsoever must retain the following
++#     acknowledgment:
++#     "This product includes software developed by Fastmail Pty. Ltd."
++#
++#  FASTMAIL PTY LTD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY  AND FITNESS, IN NO
++#  EVENT SHALL OPERA SOFTWARE AUSTRALIA BE LIABLE FOR ANY SPECIAL, INDIRECT
++#  OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++#  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++#  OF THIS SOFTWARE.
++#
++
++package Cassandane::Cyrus::IMAPLimits;
++use strict;
++use warnings;
++use Mail::JMAPTalk 0.13;
++use Data::Dumper;
++
++use lib '.';
++use base qw(Cassandane::Cyrus::TestCase);
++use Cassandane::Util::Log;
++
++my $email = <<EOF;
++Subject: foo
++Date: bar
++From: <foobar\@example.com>
++
++Body
++EOF
++
++$email =~ s/\r?\n/\r\n/gs;
++
++my $toobig_email = $email . "X" x 100;
++
++sub assert_bye_toobig
++{
++    my ($self, $store) = @_;
++
++    $store = $self->{store} if (!defined $store);
++
++    # We want to override Mail::IMAPTalk's builtin handling of the BYE
++    # untagged response, as it will 'die' immediately without parsing
++    # the remainder of the line and especially without picking out the
++    # [TOOBIG] response code that we want to see.
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        bye => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    # Check that we got a BYE [TOOBIG] response
++    $store->idle_response($handlers, 1);
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub assert_cmd_bye_toobig
++{
++    my $self = shift;
++    my $cmd = shift;
++
++    my $talk = $self->{store}->get_client();
++    $talk->enable('qresync'); # IMAPTalk requires lower-case
++    $talk->select('INBOX');
++
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_bye_toobig();
++}
++
++sub assert_cmd_no_toobig
++{
++    my $self = shift;
++    my $talk = shift;
++    my $cmd = shift;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            # Pick out the [TOOBIG] response code
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    $talk->_imap_cmd($cmd, 0, $handlers, @_);
++
++    # Check that we got a NO [TOOBIG] response
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub new
++{
++    my $class = shift;
++
++    my $config = Cassandane::Config->default()->clone();
++    $config->set(maxword => 25);
++    $config->set(maxquoted => 25);
++    $config->set(maxliteral => 25);
++    $config->set(literalminus => 1);
++    $config->set(maxargssize => 45);
++    $config->set(maxmessagesize => 100);
++    $config->set(event_groups => "message mailbox applepushservice");
++    $config->set(aps_topic => "mail");
++
++    return $class->SUPER::new({
++        adminstore => 1,
++        config => $config,
++        services => ['imap'],
++    }, @_);
++}
++
++sub set_up
++{
++    my ($self) = @_;
++    $self->SUPER::set_up();
++}
++
++sub tear_down
++{
++    my ($self) = @_;
++    $self->SUPER::tear_down();
++}
++
++sub test_maxword
++{
++    my ($self) = @_;
++
++    # Oversized command name
++    $self->assert_cmd_bye_toobig("X" x 26);
++}
++
++sub test_maxword_astring
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', "X" x 26);
++}
++
++sub test_maxquoted
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', { Quote => "X" x 26 });
++}
++
++sub test_maxliteral_nosync
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " SELECT {26+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_maxliteral_sync
++{
++    my ($self) = @_;
++
++    # Unlike oversized non-sync literals which fatal() in one central location,
++    # oversized sync literals fail with a NO response in multiple places,
++    # so we test as many of those places as possible.
++    # Having said that, arguments parsed in cmdloop() or in get_search_criterion()
++    # are mostly handled centrally.
++
++    # Authenticated State
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'SELECT',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Literal => "X" x 26 } ]);
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Quote => 'foo' }, { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Quote => '' }, { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LISTRIGHTS',
++                                'INBOX', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'SETACL',
++                                'INBOX', 'anyone', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ '/comment', { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                'FOO', { Literal => "X" x 26 });
++
++    # Selected State
++    $talk->select('INBOX');
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'ANNOTATION',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'BODY[HEADER.FIELDS',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'RFC822.HEADER.LINES',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Quote => 'value' },
++                                    { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', 'SUBJECT', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment',
++                                'value', { Literal => "X" x 26 } );
++}
++
++sub test_maxargssize_append_flags
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 [ "X" x 25, "X" x 25 ], { Literal => $email } );
++}
++
++sub test_maxargssize_append_annot
++{
++    my ($self) = @_;
++
++    # Use MULTIAPPEND, fail the second
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 { Literal => $email },
++                                 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ],
++                                 { Literal => $email } );
++}
++
++sub test_maxargssize_create
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE', "X" x 25, [ "X" x 25 ] );
++}
++
++sub test_maxargssize_create_ext
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE',
++                                 "X" x 5, [ "X" x 5, [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_fetch
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY', 'ENVELOPE', 'FLAGS',
++                                   'INTERNALDATE', 'RFC822.SIZE' ]);
++}
++
++sub test_maxargssize_fetch_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ [ "X" x 25, "X" x 25 ] ], "X" x 5 ] );
++}
++
++sub test_maxargssize_fetch_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ "X" x 5, [ "X" x 25, "X" x 25 ] ] ] );
++}
++
++sub test_maxargssize_fetch_headers
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY[HEADER.FIELDS', [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_getmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('GETMETADATA', 'INBOX', [ "X" x 25, "X" x 25 ] );
++}
++
++sub test_maxargssize_list_multi
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST', { Quote => '' }, [ "X" x 25, "X" x 25 ]);
++}
++
++sub test_maxargssize_list_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 [ 'SUBSCRIBED', 'REMOTE',
++                                   'RECURSIVEMATCH', 'SPECIAL-USE' ],
++                                 { Quote => '' }, '*');
++}
++
++sub test_maxargssize_list_return
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 { Quote => '' }, '*', 'RETURN',
++                                 [ 'SUBSCRIBED', 'CHILDREN',
++                                   'MYRIGHTS', 'SPECIAL-USE' ] );
++}
++
++sub test_maxargssize_search
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SEARCH',
++                                 'TEXT', "X" x 25, 'TEXT', { Quote => "X" x 25 } );
++}
++
++sub test_maxargssize_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SELECT', 'INBOX',
++                                 [ 'QRESYNC', [ '1234567890', '1234567890' ],
++                                   'ANNOTATE' ] );
++}
++
++sub test_maxargssize_setmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ "X" x 25, { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setmetadata2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ '/shared', { Quote => "X" x 25 },
++                                   '/shared', { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setquota
++{
++    my ($self) = @_;
++
++    my $store = $self->{adminstore};
++    my $talk = $store->get_client();
++
++    $talk->_send_cmd('SETQUOTA', 'user.cassandane',
++                     [ 'STORAGE', '1234567890',
++                       'MESSAGE', '1234567890',
++                       'MAILBOX', '1234567890' ] );
++    $self->assert_bye_toobig($store);
++}
++
++sub test_maxargssize_sort
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SORT',
++                                 [ 'ARRIVAL', 'CC', 'DATE',
++                                   'FROM', 'REVERSE', 'SIZE', 'TO' ],
++                                 'UTF-8', 'ALL');
++}
++
++sub test_maxargssize_status
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STATUS', 'INBOX',
++                                 [ 'MESSAGES', 'UIDNEXT',
++                                   'UIDVALIDITY', 'UNSEEN', 'SIZE' ] );
++}
++
++sub test_maxargssize_store_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_maxargssize_store_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ],
++                                   "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_append_zero
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_cmd('APPEND', 0, '', 'INBOX', { Literal => '' } );
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++}
++
++sub test_maxmessagesize_sync_literal
++{
++    my ($self) = @_;
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'APPEND',
++                                'INBOX', { Literal => $toobig_email } );
++}
++
++sub test_maxmessagesize_nosync_literal
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_literal_minus
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++1;
+diff --git a/cassandane/Cassandane/IMAPMessageStore.pm b/cassandane/Cassandane/IMAPMessageStore.pm
+index 338d1c5f3..959a9fabc 100644
+--- a/cassandane/Cassandane/IMAPMessageStore.pm
++++ b/cassandane/Cassandane/IMAPMessageStore.pm
+@@ -83,7 +83,7 @@ sub new
+ 
+ sub connect
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+     # if already successfully connected, do nothing
+     return
+@@ -115,6 +115,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to '$self->{host}:$self->{port}': $@";
+     }
+@@ -129,6 +130,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to server: $@";
+     }
+@@ -323,9 +325,9 @@ sub remove
+ 
+ sub get_client
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+-    $self->connect();
++    $self->connect(%params);
+     return $self->{client};
+ }
+ 
+-- 
+2.39.2
+
+
+From daa4cb2108414d859b106158f1a799bdbca4d1a2 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:49:46 -0400
+Subject: [PATCH 15/16] imapd.c: also emit a NO [TOOBIG] response for oversized
+ no-sync APPEND
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 46 ++++++++++++++---------
+ imap/imapd.c                              | 23 ++++++++----
+ 2 files changed, 44 insertions(+), 25 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+index 2275c5cf7..52c1c8117 100644
+--- a/cassandane/Cassandane/Cyrus/IMAPLimits.pm
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -59,6 +59,7 @@ $email =~ s/\r?\n/\r\n/gs;
+ 
+ my $toobig_email = $email . "X" x 100;
+ 
++# Check that we got an untagged BYE [TOOBIG] response
+ sub assert_bye_toobig
+ {
+     my ($self, $store) = @_;
+@@ -79,11 +80,11 @@ sub assert_bye_toobig
+         }
+     };
+ 
+-    # Check that we got a BYE [TOOBIG] response
+     $store->idle_response($handlers, 1);
+     $self->assert_num_equals(1, $got_toobig);
+ }
+ 
++# Send a command and expect an untagged BYE [TOOBIG] response
+ sub assert_cmd_bye_toobig
+ {
+     my $self = shift;
+@@ -97,28 +98,37 @@ sub assert_cmd_bye_toobig
+     $self->assert_bye_toobig();
+ }
+ 
++# Check that we got a tagged NO [TOOBIG] response
++sub assert_no_toobig
++{
++    my ($self, $talk) = @_;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    eval {
++        $talk->_parse_response($handlers);
++    };
++
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++# Send a command and expect a tagged NO [TOOBIG] response
+ sub assert_cmd_no_toobig
+ {
+     my $self = shift;
+     my $talk = shift;
+     my $cmd = shift;
+ 
+-    my $got_toobig = 0;
+-    my $handlers =
+-    {
+-        'no' => sub
+-        {
+-            # Pick out the [TOOBIG] response code
+-            my (undef, $resp) = @_;
+-            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
+-        }
+-    };
+-
+-    $talk->_imap_cmd($cmd, 0, $handlers, @_);
+-
+-    # Check that we got a NO [TOOBIG] response
+-    $self->assert_str_equals('no', $talk->get_last_completion_response());
+-    $self->assert_num_equals(1, $got_toobig);
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_no_toobig($talk);
+ }
+ 
+ sub new
+@@ -503,6 +513,7 @@ sub test_maxmessagesize_nosync_literal
+     my $talk = $self->{store}->get_client();
+     # Do this by brute force until we have IMAPTalk v4.06+
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+@@ -512,6 +523,7 @@ sub test_literal_minus
+ 
+     my $talk = $self->{store}->get_client();
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index f17e789f1..8be99a6b2 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3538,7 +3538,7 @@ static int isokflag(char *s, int *isseen)
+     }
+ }
+ 
+-static int getliteralsize(const char *p, int c, size_t maxsize,
++static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+                           unsigned *size, int *binary, const char **parseerr)
+ 
+ {
+@@ -3570,10 +3570,14 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+         /* LITERAL- says maximum size is 4096! */
+         if (lminus && num > 4096) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+             fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_MESSAGE_TOOBIG));
+             fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
+         }
+         isnowait++;
+@@ -3603,8 +3607,8 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     return 0;
+ }
+ 
+-static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *binary,
+-                         const char **parseerr)
++static int catenate_text(const char *tag, FILE *f, size_t maxsize,
++                         unsigned *totalsize, int *binary, const char **parseerr)
+ {
+     int c;
+     static struct buf arg;
+@@ -3616,7 +3620,8 @@ static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *bina
+     c = getword(imapd_in, &arg);
+ 
+     /* Read size from literal */
+-    r = getliteralsize(arg.s, c, maxsize - *totalsize, &size, binary, parseerr);
++    r = getliteralsize(tag, arg.s, c, maxsize - *totalsize,
++                       &size, binary, parseerr);
+     if (r) return r;
+ 
+     /* Catenate message part to stage */
+@@ -3763,7 +3768,8 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+     return r;
+ }
+ 
+-static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsigned *totalsize,
++static int append_catenate(const char *tag, FILE *f, const char *cur_name,
++                           size_t maxsize, unsigned *totalsize,
+                            int *binary, const char **parseerr, const char **url)
+ {
+     int c, r = 0;
+@@ -3777,7 +3783,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+ 
+         if (!strcasecmp(arg.s, "TEXT")) {
+-            int r1 = catenate_text(f, maxsize, totalsize, binary, parseerr);
++            int r1 = catenate_text(tag, f, maxsize, totalsize, binary, parseerr);
+             if (r1) return r1;
+ 
+             /* if we see a SP, we're trying to catenate more than one part */
+@@ -4019,13 +4025,14 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
++            r = append_catenate(tag, curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(tag, arg.s, c, maxmsgsize,
++                               &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From 93161e7cd5e678a93bd6cfb9fa9d5f2f145db5da Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:55:13 -0400
+Subject: [PATCH 16/16] imapd.c, imapparse.c: call fatal(EX_PROTOCOL) when
+ client exceeds a limit
+
+---
+ cunit/parse.testc | 12 ++++++------
+ imap/imapd.c      | 48 +++++++++++++++++++++++------------------------
+ imap/imapparse.c  | 22 +++++++++++-----------
+ 3 files changed, 41 insertions(+), 41 deletions(-)
+
+diff --git a/cunit/parse.testc b/cunit/parse.testc
+index 5a97f9b73..1786706cb 100644
+--- a/cunit/parse.testc
++++ b/cunit/parse.testc
+@@ -119,7 +119,7 @@ static void test_getint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -188,7 +188,7 @@ static void test_getsint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -255,7 +255,7 @@ static void test_getuint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint32, uint32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint32, uint32_t, STR4, &c, &val, &bytes_in);
+@@ -322,7 +322,7 @@ static void test_getint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -391,7 +391,7 @@ static void test_getsint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -458,7 +458,7 @@ static void test_getuint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint64, uint64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint64, uint64_t, STR4, &c, &val, &bytes_in);
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 8be99a6b2..cb8bbcdee 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3572,13 +3572,13 @@ static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+-            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_MESSAGE_TOOBIG));
+-            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_PROTOCOL);
+         }
+         isnowait++;
+         p++;
+@@ -3949,7 +3949,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             do {
+                 c = getword(imapd_in, &arg);
+                 if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4287,7 +4287,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+@@ -4662,7 +4662,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+     }
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+@@ -4795,7 +4795,7 @@ badannotation:
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
+                         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5131,7 +5131,7 @@ badannotation:
+         do {
+             c = getword(imapd_in, &fetchatt);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+@@ -5480,7 +5480,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+         do {
+             c = getword(imapd_in, &storemod);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+@@ -5575,7 +5575,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+     for (;;) {
+         c = getword(imapd_in, &flagname);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -7537,7 +7537,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8389,7 +8389,7 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         else if (c != ' ') goto badlist;
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8543,7 +8543,7 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+@@ -8929,7 +8929,7 @@ static int parsecreateargs(struct dlist **extargs)
+         do {
+             c = getword(imapd_in, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+@@ -8940,7 +8940,7 @@ static int parsecreateargs(struct dlist **extargs)
+                 do {
+                     c = getword(imapd_in, &val);
+                     if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+@@ -9011,7 +9011,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9064,7 +9064,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9144,7 +9144,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9250,7 +9250,7 @@ static int parse_annotate_store_data(const char *tag,
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9294,7 +9294,7 @@ static int parse_annotate_store_data(const char *tag,
+             }
+ 
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+@@ -9372,7 +9372,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9387,7 +9387,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11677,7 +11677,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     n = 0;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+@@ -11829,7 +11829,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -11935,7 +11935,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 0e8bdc5dd..8b3b952c5 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("[TOOBIG] Word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_PROTOCOL);
+             }
+         }
+ 
+@@ -157,11 +157,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+             }
+             if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_PROTOCOL);
+             }
+             isnowait++;
+             c = prot_getc(pin);
+@@ -225,7 +225,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 }
+                 buf_putc(buf, c);
+                 if (config_maxword && buf_len(buf) > config_maxword) {
+-                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                    fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+                 }
+                 c = prot_getc(pin);
+             }
+@@ -284,7 +284,7 @@ EXPORTED int getint32(struct protstream *pin, int32_t *num)
+     /* INT_MAX == 2147483647 */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 214748364 || (result == 214748364 && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -337,7 +337,7 @@ EXPORTED int getuint32(struct protstream *pin, uint32_t *num)
+     /* UINT_MAX == 4294967295U */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 429496729 || (result == 429496729 && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -361,7 +361,7 @@ EXPORTED int getint64(struct protstream *pin, int64_t *num)
+     /* LLONG_MAX == 9223372036854775807LL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 922337203685477580LL || (result == 922337203685477580LL && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -414,7 +414,7 @@ EXPORTED int getuint64(struct protstream *pin, uint64_t *num)
+     /* ULLONG_MAX == 18446744073709551615ULL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 1844674407370955161ULL || (result == 1844674407370955161ULL && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -636,7 +636,7 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+ 
+         if (searchargs->maxargssize_mark &&
+             prot_bytes_in(pin) > searchargs->maxargssize_mark) {
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         }
+ 
+     } while (c == ' ');
+@@ -1389,7 +1389,7 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     if (base->maxargssize_mark &&
+         prot_bytes_in(pin) > base->maxargssize_mark) {
+-        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+ 
+     if (!keep_charset)
+-- 
+2.39.2
+
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index acb21d012e18..d482e4c0c011 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.8.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
@@ -20,6 +20,8 @@ http_PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}-http
 
 CYRUS_IMAPD_VER=	38
 
+EXTRA_PATCHES=		${FILESDIR}/v38-CVE-2024-34055.patch:-p1
+
 LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2 \
 		libicuuc.so:devel/icu \
 		libjansson.so:devel/jansson \
diff --git a/mail/cyrus-imapd38/files/v38-CVE-2024-34055.patch b/mail/cyrus-imapd38/files/v38-CVE-2024-34055.patch
new file mode 100644
index 000000000000..0b36c7510e06
--- /dev/null
+++ b/mail/cyrus-imapd38/files/v38-CVE-2024-34055.patch
@@ -0,0 +1,5402 @@
+From 6dc5cbcf9b72fa7e437e4bbcce1c7024f386d454 Mon Sep 17 00:00:00 2001
+From: Robert Stepanek <rsto@fastmailteam.com>
+Date: Wed, 3 Jan 2024 09:51:36 +0100
+Subject: [PATCH 01/16] SearchFuzzy.pm: do not use non-standard XSNIPPETS
+ command
+
+The XSNIPPETS and XCONVMULTISTANDARD commands in Cyrus got
+deprecated, so don't keep our test using it.
+
+Signed-off-by: Robert Stepanek <rsto@fastmailteam.com>
+---
+ cassandane/Cassandane/Cyrus/SearchFuzzy.pm | 344 +++++++++------------
+ 1 file changed, 146 insertions(+), 198 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+index e40564153..56d39ef25 100644
+--- a/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
++++ b/cassandane/Cassandane/Cyrus/SearchFuzzy.pm
+@@ -43,6 +43,8 @@ use warnings;
+ use Cwd qw(abs_path);
+ use DateTime;
+ use Data::Dumper;
++use MIME::Base64 qw(encode_base64);
++use Encode qw(decode encode);
+ 
+ use lib '.';
+ use base qw(Cassandane::Cyrus::TestCase);
+@@ -50,10 +52,19 @@ use Cassandane::Util::Log;
+ 
+ sub new
+ {
++
+     my ($class, @args) = @_;
+     my $config = Cassandane::Config->default()->clone();
+-    $config->set(conversations => 'on');
+-    return $class->SUPER::new({ config => $config }, @args);
++    $config->set(
++        conversations => 'on',
++        httpallowcompress => 'no',
++        httpmodules => 'jmap',
++    );
++    return $class->SUPER::new({
++        config => $config,
++        jmap => 1,
++        services => [ 'imap', 'http' ]
++    }, @args);
+ }
+ 
+ sub set_up
+@@ -134,6 +145,55 @@ sub create_testmessages
+     $self->{instance}->run_command({cyrus => 1}, 'squatter');
+ }
+ 
++sub get_snippets
++{
++    # Previous versions of this test module used XSNIPPETS to
++    # assert snippets but this command got removed from Cyrus.
++    # Use JMAP instead.
++
++    my ($self, $folder, $uids, $filter) = @_;
++
++    my $imap = $self->{store}->get_client();
++    my $jmap = $self->{jmap};
++
++    $self->assert_not_null($jmap);
++
++    $imap->select($folder);
++    my $res = $imap->fetch($uids, ['emailid']);
++    my %emailIdToImapUid = map { $res->{$_}{emailid}[0] => $_ } keys %$res;
++
++    $res = $jmap->CallMethods([
++        ['SearchSnippet/get', {
++            filter => $filter,
++            emailIds => [ keys %emailIdToImapUid ],
++        }, 'R1'],
++    ]);
++
++    my @snippets;
++    foreach (@{$res->[0][1]{list}}) {
++        if ($_->{subject}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'SUBJECT',
++                $_->{subject},
++            ]);
++        }
++        if ($_->{preview}) {
++            push(@snippets, [
++                0,
++                $emailIdToImapUid{$_->{emailId}},
++                'BODY',
++                $_->{preview},
++            ]);
++        }
++    }
++
++    return {
++        snippets => [ sort { $a->[1] <=> $b->[1] } @snippets ],
++    };
++}
++
+ sub test_copy_messages
+     :needs_search_xapian
+ {
+@@ -151,12 +211,13 @@ sub test_copy_messages
+ }
+ 
+ sub test_stem_verbs
+-    :min_version_3_0 :needs_search_xapian
++    :min_version_3_0 :needs_search_xapian :JMAPExtensions
+ {
+     my ($self) = @_;
+     $self->create_testmessages();
+ 
+     my $talk = $self->{store}->get_client();
++    $self->assert_not_null($self->{jmap});
+ 
+     xlog $self, "Select INBOX";
+     my $r = $talk->select("INBOX") || die;
+@@ -175,11 +236,8 @@ sub test_stem_verbs
+     $r = $talk->search('fuzzy', ['subject', { Quote => "runs" }]) || die;
+     $self->assert_num_equals(3, scalar @$r);
+ 
+-    xlog $self, 'XSNIPPETS for FUZZY subject "runs"';
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'subject', { Quote => 'runs' }]
+-    ) || die;
++    xlog $self, 'Get snippets for FUZZY subject "runs"';
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'runs' });
+     $self->assert_num_equals(3, scalar @{$r->{snippets}});
+ }
+ 
+@@ -250,12 +308,8 @@ sub test_snippet_wildcard
+     $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+ 
+-    xlog $self, "XSNIPPETS for $term";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => "$term*" }]
+-    ) || die;
+-    xlog $self, Dumper($r);
++    xlog $self, "Get snippets for $term";
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => "$term*" });
+     $self->assert_num_equals(2, scalar @{$r->{snippets}});
+ }
+ 
+@@ -358,13 +412,17 @@ sub test_normalize_snippets
+     my ($self) = @_;
+ 
+     # Set up test message with funny characters
+-    my $body = "foo gären советской diĝir naïve léger";
+-    my @terms = split / /, $body;
++use utf8;
++    my @terms = ( "gären", "советской", "diĝir", "naïve", "léger" );
++no utf8;
++    my $body = encode_base64(encode('UTF-8', join(' ', @terms)));
++    $body =~ s/\r?\n/\r\n/gs;
+ 
+     xlog $self, "Generate and index test messages.";
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+@@ -380,24 +438,20 @@ sub test_normalize_snippets
+ 
+     # Assert that diacritics are matched and returned
+     foreach my $term (@terms) {
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++        $r = $self->get_snippets('INBOX', $uids, { text => $term });
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+     }
+ 
+     # Assert that search without diacritics matches
+     if ($self->{skipdiacrit}) {
+         my $term = "naive";
+-        xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-        $r = $talk->xsnippets(
+-            [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-            ['fuzzy', 'text', { Quote => $term }]
+-        ) || die;
+-        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>naïve</b>"), -1);
++        xlog $self, "Get snippets for FUZZY text \"$term\"";
++        $r = $self->get_snippets('INBOX', $uids, { 'text' => $term });
++use utf8;
++        $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>naïve</mark>"), -1);
++no utf8;
+     }
++
+ }
+ 
+ sub test_skipdiacrit
+@@ -499,38 +553,23 @@ sub test_snippets_termcover
+     my $r = $talk->select("INBOX") || die;
+     my $uidvalidity = $talk->get_response_code('uidvalidity');
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-    my $want = "<b>favourite</b> <b>cereal</b>";
++    my $want = "<mark>favourite</mark> <mark>cereal</mark>";
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite',
+-           'fuzzy', 'text', 'cereal',
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        operator => 'AND',
++        conditions => [{
++            text => 'favourite',
++        }, {
++           text => 'cereal',
++        }, {
++           text => '"bogus gnarly"'
++        }],
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', 'favourite cereal'
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    # Regression - a phrase is treated as a loose term
+-    $r = $talk->xsnippets( [ [ 'INBOX', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite nope cereal' },
+-           'fuzzy', 'text', { Quote => 'bogus gnarly' }
+-        ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [
+-           'fuzzy', 'text', { Quote => 'favourite cereal' }
+-        ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, {
++        text => 'favourite cereal',
++    });
+     $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], $want));
+ }
+ 
+@@ -542,18 +581,28 @@ sub test_cjk_words
+ 
+     xlog $self, "Generate and index test messages.";
+ 
++use utf8;
+     my $body = "明末時已經有香港地方的概念";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     my %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("1", %params) || die;
+ 
+     # Splits into the words: "み, 円, 月額, 申込
++use utf8;
+     $body = "申込み！月額円";
++no utf8;
++    $body = encode_base64(encode('UTF-8', $body));
++    $body =~ s/\r?\n/\r\n/gs;
+     %params = (
+         mime_charset => "utf-8",
+-        body => $body
++        mime_encoding => 'base64',
++        body => $body,
+     );
+     $self->make_message("2", %params) || die;
+ 
+@@ -569,50 +618,45 @@ sub test_cjk_words
+ 
+     my $term;
+     # Search for a two-character CJK word
++use utf8;
+     $term = "已經";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
+-    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<b>$term</b>"), -1);
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
++    $self->assert_num_not_equals(index($r->{snippets}[0][3], "<mark>$term</mark>"), -1);
+ 
+     # Search for the CJK words 明末 and 時, note that the
+     # word order is reversed to the original message
++use utf8;
+     $term = "時明末";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ 
+     # Search for the partial CJK word 月
++use utf8;
+     $term = "月";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for the interleaved, partial CJK word 額申
++use utf8;
+     $term = "額申";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 0);
+ 
+     # Search for three of four words: "み, 月額, 申込",
+     # in different order than the original.
++use utf8;
+     $term = "月額み申込";
+-    xlog $self, "XSNIPPETS for FUZZY text \"$term\"";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'text', { Quote => $term }]
+-    ) || die;
++no utf8;
++    xlog $self, "Get snippets for FUZZY text \"$term\"";
++    $r = $self->get_snippets('INBOX', $uids, { text => $term });
+     $self->assert_num_equals(scalar @{$r->{snippets}}, 1);
+ }
+ 
+@@ -805,86 +849,6 @@ sub test_xattachmentname
+ }
+ 
+ 
+-sub test_xapianv2
+-    :min_version_3_0 :needs_search_xapian
+-{
+-    my ($self) = @_;
+-
+-    my $talk = $self->{store}->get_client();
+-
+-    # This is a smallish regression test to check if we break something
+-    # obvious by moving Xapian indexing from folder:uid to message guids.
+-    #
+-    # Apart from the tests in this module, at least also the following
+-    # imodules are relevant: Metadata for SORT, Thread for THREAD.
+-
+-    xlog $self, "Generate message";
+-    my $r = $self->make_message("I run", body => "Run, Forrest! Run!" ) || die;
+-    my $uid = $r->{attrs}->{uid};
+-
+-    xlog $self, "Copy message into INBOX";
+-    $talk->copy($uid, "INBOX");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Create target mailbox";
+-    $talk->create("INBOX.target");
+-
+-    xlog $self, "Copy message into INBOX.target";
+-    $talk->copy($uid, "INBOX.target");
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(3, scalar @{$r->{sort}[0]} - 1);
+-    $self->assert_num_equals(1, scalar @{$r->{sort}});
+-
+-    xlog $self, "Generate message";
+-    $self->make_message("You run", body => "A running joke" ) || die;
+-
+-    xlog $self, "Run squatter";
+-    $self->{instance}->run_command({cyrus => 1}, 'squatter');
+-
+-    $r = $talk->xconvmultisort(
+-        [ qw(reverse arrival) ],
+-        [ 'conversations', position => [1,10] ],
+-        'utf-8', 'fuzzy', 'text', "run",
+-    );
+-    $self->assert_num_equals(2, scalar @{$r->{sort}});
+-
+-    xlog $self, "SEARCH FUZZY";
+-    $r = $talk->search(
+-        "charset", "utf-8", "fuzzy", "text", "run",
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @$r);
+-
+-    xlog $self, "Select INBOX";
+-    $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+-
+-    xlog $self, "XSNIPPETS";
+-    $r = $talk->xsnippets(
+-        [['INBOX', $uidvalidity, $uids]], 'utf-8',
+-        ['fuzzy', 'body', 'run'],
+-    ) || die;
+-    $self->assert_num_equals(3, scalar @{$r->{snippets}});
+-}
+-
+ sub test_snippets_escapehtml
+     :min_version_3_0 :needs_search_xapian
+ {
+@@ -914,21 +878,15 @@ sub test_snippets_escapehtml
+     my $uids = $talk->search('1:*', 'NOT', 'DELETED');
+     my %m;
+ 
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test1' ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test1' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test1</b> body with the same tag as snippets", $m{body});
+-    $self->assert_str_equals("<b>Test1</b> subject with an unescaped &amp; in it", $m{subject});
+-
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', 'test2' ]
+-    ) || die;
++    $self->assert_str_equals("<mark>Test1</mark> body with the same tag as snippets", $m{body});
++    $self->assert_str_equals("<mark>Test1</mark> subject with an unescaped &amp; in it", $m{subject});
+ 
++    $r = $self->get_snippets('INBOX', $uids, { 'text' => 'test2' });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert_str_equals("<b>Test2</b> body with a &lt;tag/&gt;, although it's plain text", $m{body});
+-    $self->assert_str_equals("<b>Test2</b> subject with a &lt;tag&gt; in it", $m{subject});
++    $self->assert_str_equals("<mark>Test2</mark> body with a &lt;tag/&gt;, although it's plain text", $m{body});
++    $self->assert_str_equals("<mark>Test2</mark> subject with a &lt;tag&gt; in it", $m{subject});
+ }
+ 
+ sub test_search_exactmatch
+@@ -963,13 +921,10 @@ sub test_search_exactmatch
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { body => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+-    $self->assert(index($m{body}, "<b>some text</b>") != -1);
+-    $self->assert(index($m{body}, "<b>some</b> long <b>text</b>") == -1);
++    $self->assert(index($m{body}, "<mark>some text</mark>") != -1);
++    $self->assert(index($m{body}, "<mark>some</mark> long <mark>text</mark>") == -1);
+ }
+ 
+ sub test_search_subjectsnippet
+@@ -1004,10 +959,7 @@ sub test_search_subjectsnippet
+     $self->assert_num_equals(1, scalar @$uids);
+ 
+     my %m;
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'text', $query ]
+-    ) || die;
+-
++    $r = $self->get_snippets('INBOX', $uids, { text => $query });
+     %m = map { lc($_->[2]) => $_->[3] } @{ $r->{snippets} };
+     $self->assert_matches(qr/^\[plumbing\]/, $m{subject});
+ }
+@@ -1317,11 +1269,10 @@ sub test_detect_language
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'body', 'atmet' ]
+-    ) || die;
+-    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <b>atmeten</b>.'));
++    $r = $self->get_snippets('INBOX', $uids, { body => 'atmet' });
++use utf8;
++    $self->assert_num_not_equals(-1, index($r->{snippets}[0][3], ' Höhe <mark>atmeten</mark>.'));
++no utf8;
+ }
+ 
+ sub test_detect_language_subject
+@@ -1377,12 +1328,9 @@ sub test_detect_language_subject
+     $self->assert_deep_equals([1], $uids);
+ 
+     my $r = $talk->select("INBOX") || die;
+-    my $uidvalidity = $talk->get_response_code('uidvalidity');
+-    $r = $talk->xsnippets( [ [ 'inbox', $uidvalidity, $uids ] ],
+-       'utf-8', [ 'fuzzy', 'subject', 'Landschaft' ]
+-    ) || die;
++    $r = $self->get_snippets('INBOX', $uids, { subject => 'Landschaft' });
+     $self->assert_str_equals(
+-        'A subject with the German word <b>Landschaften</b>',
++        'A subject with the German word <mark>Landschaften</mark>',
+         $r->{snippets}[0][3]
+     );
+ }
+-- 
+2.39.2
+
+
+From d1b5eb32a3df564a2f79cc5e35230a344a632fc6 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:00:00 -0500
+Subject: [PATCH 02/16] imapd.c: UIDVALIDITY should be uint32_t and parse it as
+ such
+
+---
+ imap/imapd.c | 10 +++-------
+ imap/index.h |  2 +-
+ 2 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 991040241..46ac2df86 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -4302,15 +4302,11 @@ static void cmd_select(char *tag, char *cmd, char *name)
+             }
+             else if ((client_capa & CAPA_QRESYNC) &&
+                      !strcmp(arg.s, "QRESYNC")) {
+-                char *p;
+-
+                 if (c != ' ') goto badqresync;
+                 c = prot_getc(imapd_in);
+                 if (c != '(') goto badqresync;
+-                c = getastring(imapd_in, imapd_out, &arg);
+-                v->uidvalidity = strtoul(arg.s, &p, 10);
+-                if (*p || !v->uidvalidity || v->uidvalidity == ULONG_MAX) goto badqresync;
+-                if (c != ' ') goto badqresync;
++                c = getuint32(imapd_in, &v->uidvalidity);
++                if (c != ' ' || !v->uidvalidity) goto badqresync;
+                 c = getmodseq(imapd_in, &v->modseq);
+                 if (c == EOF) goto badqresync;
+                 if (c == ' ') {
+@@ -4450,7 +4446,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         prot_printf(backend_current->out, "%s %s {" SIZE_T_FMT "+}\r\n%s",
+                     tag, cmd, strlen(name), name);
+         if (v->uidvalidity) {
+-            prot_printf(backend_current->out, " (QRESYNC (%lu " MODSEQ_FMT,
++            prot_printf(backend_current->out, " (QRESYNC (%u " MODSEQ_FMT,
+                         v->uidvalidity, v->modseq);
+             if (v->sequence) {
+                 prot_printf(backend_current->out, " %s", v->sequence);
+diff --git a/imap/index.h b/imap/index.h
+index 54705d056..3178ebd04 100644
+--- a/imap/index.h
++++ b/imap/index.h
+@@ -72,7 +72,7 @@ extern unsigned client_capa;
+ struct message;
+ 
+ struct vanished_params {
+-    unsigned long uidvalidity;
++    uint32_t uidvalidity;
+     modseq_t modseq;
+     const char *match_seq;
+     const char *match_uid;
+-- 
+2.39.2
+
+
+From ece8be8fc41d8faf8540fe5cf066cd47a09226b6 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 08:13:05 -0500
+Subject: [PATCH 03/16] imapd.c: consolidate ID field-value parse error
+ response
+
+---
+ imap/imapd.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 46ac2df86..fc8bd935a 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3123,19 +3123,12 @@ static void cmd_id(char *tag)
+ 
+             /* get field name */
+             c = getstring(imapd_in, imapd_out, &field);
+-            if (c != ' ') {
++            if (c != ' ' ||
++                /* get field value */
++                (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
++                (c != ' ' && c != ')')) {
+                 prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing field name in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
+-                return;
+-            }
+-
+-            /* get field value */
+-            c = getnstring(imapd_in, imapd_out, &arg);
+-            if (c != ' ' && c != ')') {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid/missing value in Id\r\n",
++                            "%s BAD Invalid field-value pair in Id\r\n",
+                             tag);
+                 eatline(imapd_in, c);
+                 return;
+-- 
+2.39.2
+
+
+From 8cd3fb31a672ed45cacb260605ac111d40ac8e69 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 7 Feb 2024 14:12:41 -0500
+Subject: [PATCH 04/16] imapd.c: response code in fatal() string MUST
+ immediately follow "* BYE"
+
+---
+ imap/imapd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index fc8bd935a..9f1ca2fe1 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1190,7 +1190,8 @@ EXPORTED void fatal(const char *s, int code)
+     }
+     recurse_code = code;
+     if (imapd_out) {
+-        prot_printf(imapd_out, "* BYE Fatal error: %s\r\n", s);
++        prot_printf(imapd_out, "* BYE %s%s\r\n",
++                    *s == '[' /* resp-text-code */ ? "" : "Fatal error: ", s);
+         prot_flush(imapd_out);
+     }
+     if (stages.count) {
+-- 
+2.39.2
+
+
+From 6fc15e3b83cd0c2b71ed483330e2afa5497691ad Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 11:00:19 -0500
+Subject: [PATCH 05/16] imapparse.c: include [TOOBIG] response code for
+ oversized word/qstring
+
+---
+ imap/imapparse.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 5dc987a6e..edeb84215 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_IOERR);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
+             }
+         }
+ 
+@@ -212,6 +212,9 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                     return c;
+                 }
+                 buf_putc(buf, c);
++                if (config_maxword && buf_len(buf) > config_maxword) {
++                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                }
+                 c = prot_getc(pin);
+             }
+             /* never gets here */
+-- 
+2.39.2
+
+
+From 42154ac9984811198f7de21d785e344d6191dce1 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 13:31:11 -0500
+Subject: [PATCH 06/16] imapparse.c: fatal() when a client violates LITERAL-
+ limit
+
+---
+ imap/imap_err.et | 3 +++
+ imap/imapparse.c | 7 +++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index a98ec0e1b..072078f94 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,9 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_MINUS_TOO_LARGE,
++   "[TOOBIG] Non-synchronizing literal size exceeds 4K"
++
+ ec IMAP_USERFLAG_EXHAUSTED,
+    "Too many user flags in mailbox"
+ 
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index edeb84215..4499264ff 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -153,8 +153,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         buf_reset(buf);
+         c = getint32(pin, &len);
+         if (c == '+') {
+-            // LITERAL- says maximum size is 4096!
+-            if (lminus && len > 4096) return EOF;
++            /* LITERAL- says maximum size is 4096! */
++            if (lminus && len > 4096) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+-- 
+2.39.2
+
+
+From 13fa309e77264ffbea6a0fc5efa41bbb5f1b7be5 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 12 Feb 2024 10:54:03 -0500
+Subject: [PATCH 07/16] Cleanup and document the use of prot_setisclient()
+
+Only IMAP(-like) clients send LITERAL+ syntax
+---
+ backup/backupd.c       | 3 +--
+ backup/lcb.c           | 1 -
+ backup/lcb_read.c      | 2 --
+ backup/lcb_verify.c    | 2 --
+ cunit/getxstring.testc | 4 ----
+ imap/append.c          | 1 -
+ imap/backend.c         | 2 --
+ imap/cyr_dbtool.c      | 1 -
+ imap/dlist.c           | 5 ++++-
+ imap/imapd.c           | 4 ++++
+ imap/imapparse.c       | 5 +++--
+ imap/message.c         | 3 ---
+ imap/mupdate.c         | 3 +++
+ imap/sync_server.c     | 3 +--
+ imap/sync_support.c    | 4 ----
+ lib/prot.h             | 2 +-
+ 16 files changed, 17 insertions(+), 28 deletions(-)
+
+diff --git a/backup/backupd.c b/backup/backupd.c
+index 04715a561..d0ba24cf9 100644
+--- a/backup/backupd.c
++++ b/backup/backupd.c
+@@ -229,9 +229,8 @@ EXPORTED int service_main(int argc __attribute__((unused)),
+     backupd_in = prot_new(0, 0);
+     backupd_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow use of LITERAL+ */
+     prot_setisclient(backupd_in, 1);
+-    prot_setisclient(backupd_out, 1);
+ 
+     /* Find out name of client host */
+     backupd_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/backup/lcb.c b/backup/lcb.c
+index dbba85ca7..3f68b1aaa 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -606,7 +606,6 @@ EXPORTED int backup_reindex(const char *name,
+             fprintf(out, "\nfound chunk at offset " OFF_T_FMT "\n\n", member_offset);
+ 
+         struct protstream *member = prot_readcb(_prot_fill_cb, gzuc);
+-        prot_setisclient(member, 1); /* don't sync literals */
+ 
+         // FIXME stricter timestamp sequence checks
+         time_t member_start_ts = -1;
+diff --git a/backup/lcb_read.c b/backup/lcb_read.c
+index f597c97c5..f2342d69d 100644
+--- a/backup/lcb_read.c
++++ b/backup/lcb_read.c
+@@ -113,7 +113,6 @@ EXPORTED int backup_read_message_data(struct backup *backup,
+     if (r) return r;
+ 
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+     r = parse_backup_line(ps, NULL, NULL, &dl);
+     prot_free(ps);
+ 
+@@ -203,7 +202,6 @@ EXPORTED int backup_prepare_message_upload(struct backup *backup,
+         if (!r) {
+             struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+             int c;
+-            prot_setisclient(ps, 1); /* don't sync literals */
+             c = parse_backup_line(ps, NULL, NULL, &dl);
+             prot_free(ps);
+             ps = NULL;
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index a8dac204c..ff2758552 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -228,7 +228,6 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+         if (r) return r;
+ 
+         struct protstream *ps = prot_readcb(_prot_fill_cb, vmrock->gzuc);
+-        prot_setisclient(ps, 1); /* don't sync literals */
+         r = parse_backup_line(ps, NULL, NULL, &dl);
+ 
+         if (r == EOF) {
+@@ -528,7 +527,6 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+         goto done;
+     }
+     struct protstream *ps = prot_readcb(_prot_fill_cb, gzuc);
+-    prot_setisclient(ps, 1); /* don't sync literals */
+ 
+     struct buf cmd = BUF_INITIALIZER;
+     while (1) {
+diff --git a/cunit/getxstring.testc b/cunit/getxstring.testc
+index f5a5989a3..12efe86aa 100644
+--- a/cunit/getxstring.testc
++++ b/cunit/getxstring.testc
+@@ -72,9 +72,6 @@ static int tear_down(void)
+ 
+ /*
+  * Run a single testcase.
+- *
+- * Note: prot_setisclient() turns off off literal synchronising so
+- * we don't have to futz around with testing that.
+  */
+ #define _TESTCASE_PRE(fut, input, retval, consumed)                 \
+     do {                                                            \
+@@ -84,7 +81,6 @@ static int tear_down(void)
+         long long _consumed = (consumed);                           \
+         p = prot_readmap(input, sizeof(input)-1);                   \
+         CU_ASSERT_PTR_NOT_NULL_FATAL(p);                            \
+-        prot_setisclient(p, 1);                                     \
+         c = fut(p, NULL, &b);                                       \
+         CU_ASSERT_EQUAL(c, retval);                                 \
+         if (_consumed >= 0) {                                       \
+diff --git a/imap/append.c b/imap/append.c
+index bfd30003a..69f3daf99 100644
+--- a/imap/append.c
++++ b/imap/append.c
+@@ -438,7 +438,6 @@ static int callout_receive_reply(const char *callout,
+     }
+ 
+     p = prot_new(fd, /*write*/0);
+-    prot_setisclient(p, 1);
+ 
+     /* read and parse the reply as a dlist */
+     c = dlist_parse(results, /*parsekeys*/0, /*isarchive*/0, /*isbackup*/0, p);
+diff --git a/imap/backend.c b/imap/backend.c
+index 4cc7bc56b..0bbb65ed0 100644
+--- a/imap/backend.c
++++ b/imap/backend.c
+@@ -955,7 +955,6 @@ EXPORTED struct backend *backend_connect_pipe(int infd, int outfd,
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+@@ -1153,7 +1152,6 @@ EXPORTED struct backend *backend_connect(struct backend *ret_backend, const char
+     ret->prot = prot;
+ 
+     /* use literal+ to send literals */
+-    prot_setisclient(ret->in, 1);
+     prot_setisclient(ret->out, 1);
+ 
+     /* Start TLS if required */
+diff --git a/imap/cyr_dbtool.c b/imap/cyr_dbtool.c
+index 42e21e8a9..3534e9c92 100644
+--- a/imap/cyr_dbtool.c
++++ b/imap/cyr_dbtool.c
+@@ -156,7 +156,6 @@ static void batch_commands(struct db *db)
+     int r = 0;
+ 
+     prot_setisclient(in, 1);
+-    prot_setisclient(out, 1);
+ 
+     while (1) {
+         buf_reset(&cmd);
+diff --git a/imap/dlist.c b/imap/dlist.c
+index 1e38d1bfb..fd068f071 100644
+--- a/imap/dlist.c
++++ b/imap/dlist.c
+@@ -1235,7 +1235,10 @@ EXPORTED int dlist_parsemap(struct dlist **dlp, int parsekey, int isbackup,
+     struct dlist *dl = NULL;
+ 
+     stream = prot_readmap(base, len);
+-    prot_setisclient(stream, 1); /* don't sync literals */
++
++    /* Allow LITERAL+ - this is silly, but required to parse personal CALDATA */
++    prot_setisclient(stream, 1);
++
+     c = dlist_parse(&dl, parsekey, /*isarchive*/ 0, isbackup, stream);
+     prot_free(stream);
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 9f1ca2fe1..97b7732e5 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -959,6 +959,10 @@ int service_main(int argc __attribute__((unused)),
+ 
+     imapd_in = prot_new(0, 0);
+     imapd_out = prot_new(1, 1);
++
++    /* Allow LITERAL+ */
++    prot_setisclient(imapd_in, 1);
++
+     protgroup_insert(protin, imapd_in);
+ 
+     /* Find out name of client host */
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 4499264ff..5da6af1b8 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -149,10 +149,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         /* Literal */
+-        isnowait = pin->isclient;
++        isnowait = !pin->isclient;
+         buf_reset(buf);
+         c = getint32(pin, &len);
+-        if (c == '+') {
++
++        if (pin->isclient && c == '+') {
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+diff --git a/imap/message.c b/imap/message.c
+index 16985728a..0744cb1d0 100644
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -3419,7 +3419,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read envelope response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_ENVELOPE),
+                         cacheitem_size(record, CACHE_ENVELOPE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_envelope(strm, *body);
+     prot_free(strm);
+@@ -3427,7 +3426,6 @@ EXPORTED void message_read_bodystructure(const struct index_record *record, stru
+     /* Read bodystructure response from cache */
+     strm = prot_readmap(cacheitem_base(record, CACHE_BODYSTRUCTURE),
+                         cacheitem_size(record, CACHE_BODYSTRUCTURE));
+-    prot_setisclient(strm, 1);  /* no-sync literals */
+ 
+     message_read_body(strm, *body, NULL);
+     prot_free(strm);
+@@ -4792,7 +4790,6 @@ static int message_parse_cbodystructure(message_t *m)
+                         cacheitem_size(&m->record, CACHE_BODYSTRUCTURE));
+     if (!prot)
+         return IMAP_MAILBOX_BADFORMAT;
+-    prot_setisclient(prot, 1);  /* don't crash parsing literals */
+ 
+     m->body = xzmalloc(sizeof(struct body));
+     r = parse_bodystructure_part(prot, m->body, NULL);
+diff --git a/imap/mupdate.c b/imap/mupdate.c
+index 65b78d9a4..6466200a6 100644
+--- a/imap/mupdate.c
++++ b/imap/mupdate.c
+@@ -249,6 +249,9 @@ static struct conn *conn_new(int fd)
+     C->pin = prot_new(C->fd, 0);
+     C->pout = prot_new(C->fd, 1);
+ 
++    /* Allow LITERAL+ */
++    prot_setisclient(C->pin, 1);
++
+     prot_setflushonread(C->pin, C->pout);
+     prot_settimeout(C->pin, 180*60);
+ 
+diff --git a/imap/sync_server.c b/imap/sync_server.c
+index b9917e87b..0febff288 100644
+--- a/imap/sync_server.c
++++ b/imap/sync_server.c
+@@ -329,9 +329,8 @@ int service_main(int argc __attribute__((unused)),
+     sync_in = prot_new(0, 0);
+     sync_out = prot_new(1, 1);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
++    /* Allow LITERAL+ */
+     prot_setisclient(sync_in, 1);
+-    prot_setisclient(sync_out, 1);
+ 
+     /* Find out name of client host */
+     sync_clienthost = get_clienthost(0, &localip, &remoteip);
+diff --git a/imap/sync_support.c b/imap/sync_support.c
+index 99eb70dad..03ad16bee 100644
+--- a/imap/sync_support.c
++++ b/imap/sync_support.c
+@@ -8094,10 +8094,6 @@ connected:
+     if (timeout < 3) timeout = 3;
+     prot_settimeout(backend->in, timeout);
+ 
+-    /* Force use of LITERAL+ so we don't need two way communications */
+-    prot_setisclient(backend->in, 1);
+-    prot_setisclient(backend->out, 1);
+-
+     return 0;
+ }
+ 
+diff --git a/lib/prot.h b/lib/prot.h
+index 98af5d160..89b0b0a2a 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -133,7 +133,7 @@ struct protstream {
+     int can_unget;
+     int bytes_in;
+     int bytes_out;
+-    int isclient;
++    int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+     prot_readcallback_t *readcallback_proc;
+-- 
+2.39.2
+
+
+From 6663e8e534d0395c797cf74d051f7d0ca3d62621 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 22:48:58 -0400
+Subject: [PATCH 08/16] imapd.c: LITERAL- also applies to APPEND
+
+imap_err.et: add IMAP_MESSAGE_TOOBIG error message
+---
+ imap/imap_err.et |  4 ++++
+ imap/imapd.c     | 12 ++++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 072078f94..d90e30a4b 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -65,6 +65,10 @@ ec IMAP_QUOTA_EXCEEDED,
+ ec IMAP_MESSAGE_TOO_LARGE,
+    "Message size exceeds fixed limit"
+ 
++# Same as IMAP_MESSAGE_TOO_LARGE, but with TOOBIG response code
++ec IMAP_MESSAGE_TOOBIG,
++   "[TOOBIG] Message size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 97b7732e5..a301b554e 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3582,6 +3582,9 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+ {
+     int isnowait = 0;
+     uint32_t num;
++    static int lminus = -1;
++
++    if (lminus == -1) lminus = config_getswitch(IMAPOPT_LITERALMINUS);
+ 
+     /* Check for literal8 */
+     if (*p == '~') {
+@@ -3602,6 +3605,15 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     }
+ 
+     if (*p == '+') {
++        /* LITERAL- says maximum size is 4096! */
++        if (lminus && num > 4096) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++        }
++        if (num > maxsize) {
++            /* Fail per RFC 7888, Section 4, choice 2 */
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++        }
+         isnowait++;
+         p++;
+     }
+-- 
+2.39.2
+
+
+From 986079279f972842602694a02f7d19dbd5228645 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 9 Feb 2024 14:52:22 -0500
+Subject: [PATCH 09/16] imapd.c: remove XSNIPPETS and XCONV* commands
+
+---
+ cassandane/Cassandane/Cyrus/Conversations.pm |   71 --
+ imap/imapd.c                                 | 1006 ------------------
+ 2 files changed, 1077 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/Conversations.pm b/cassandane/Cassandane/Cyrus/Conversations.pm
+index 8bdf8aa72..98369cb5c 100755
+--- a/cassandane/Cassandane/Cyrus/Conversations.pm
++++ b/cassandane/Cassandane/Cyrus/Conversations.pm
+@@ -708,77 +708,6 @@ sub bogus_test_replication_clash
+     $self->check_messages(\%exp, store => $replica_store);
+ }
+ 
+-sub test_xconvfetch
+-    :min_version_3_0
+-{
+-    my ($self) = @_;
+-    my $store = $self->{store};
+-
+-    # check IMAP server has the XCONVERSATIONS capability
+-    $self->assert($store->get_client()->capability()->{xconversations});
+-
+-    xlog $self, "generating messages";
+-    my $generator = Cassandane::ThreadedGenerator->new();
+-    $store->write_begin();
+-    while (my $msg = $generator->generate())
+-    {
+-        $store->write_message($msg);
+-    }
+-    $store->write_end();
+-
+-    xlog $self, "reading the whole folder again to discover CIDs etc";
+-    my %cids;
+-    my %uids;
+-    $store->read_begin();
+-    while (my $msg = $store->read_message())
+-    {
+-        my $uid = $msg->get_attribute('uid');
+-        my $cid = $msg->get_attribute('cid');
+-        my $threadid = $msg->get_header('X-Cassandane-Thread');
+-        if (defined $cids{$cid})
+-        {
+-            $self->assert_num_equals($threadid, $cids{$cid});
+-        }
+-        else
+-        {
+-            $cids{$cid} = $threadid;
+-            xlog $self, "Found CID $cid";
+-        }
+-        $self->assert_null($uids{$uid});
+-        $uids{$uid} = 1;
+-    }
+-    $store->read_end();
+-
+-    xlog $self, "Using XCONVFETCH on each conversation";
+-    foreach my $cid (keys %cids)
+-    {
+-        xlog $self, "XCONVFETCHing CID $cid";
+-
+-        my $result = $store->xconvfetch_begin($cid);
+-        $self->assert_not_null($result->{xconvmeta});
+-        $self->assert_num_equals(1, scalar keys %{$result->{xconvmeta}});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid});
+-        $self->assert_not_null($result->{xconvmeta}->{$cid}->{modseq});
+-        while (my $msg = $store->xconvfetch_message())
+-        {
+-            my $muid = $msg->get_attribute('uid');
+-            my $mcid = $msg->get_attribute('cid');
+-            my $threadid = $msg->get_header('X-Cassandane-Thread');
+-            $self->assert_str_equals($cid, $mcid);
+-            $self->assert_num_equals($cids{$cid}, $threadid);
+-            $self->assert_num_equals(1, $uids{$muid});
+-            $uids{$muid} |= 2;
+-        }
+-        $store->xconvfetch_end();
+-    }
+-
+-    xlog $self, "checking that all the UIDs in the folder were XCONVFETCHed";
+-    foreach my $uid (keys %uids)
+-    {
+-        $self->assert_num_equals(3, $uids{$uid});
+-    }
+-}
+-
+ #
+ # Test APPEND of a new composed draft message to the Drafts folder by
+ # the Fastmail webui, which sets the X-ME-Message-ID header to thread
+diff --git a/imap/imapd.c b/imap/imapd.c
+index a301b554e..0ea16979a 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -443,14 +443,6 @@ static void cmd_idle(char* tag);
+ 
+ static void cmd_starttls(char *tag, int imaps);
+ 
+-static void cmd_xconvsort(char *tag, int updates);
+-static void cmd_xconvmultisort(char *tag);
+-static void cmd_xconvmeta(const char *tag);
+-static void cmd_xconvfetch(const char *tag);
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs);
+-static void cmd_xsnippets(char *tag);
+ static void cmd_xstats(char *tag);
+ 
+ static void cmd_xapplepushservice(const char *tag,
+@@ -507,12 +499,8 @@ static int parse_metadata_store_data(const char *tag,
+ static int getlistselopts(char *tag, struct listargs *args);
+ static int getlistretopts(char *tag, struct listargs *args);
+ 
+-static int get_snippetargs(struct snippetargs **sap);
+-static void free_snippetargs(struct snippetargs **sap);
+ static int getsortcriteria(char *tag, struct sortcrit **sortcrit);
+ static int getdatetime(time_t *date);
+-static int parse_windowargs(const char *tag, struct windowargs **, int);
+-static void free_windowargs(struct windowargs *wa);
+ 
+ static void appendfieldlist(struct fieldlist **l, char *section,
+                      strarray_t *fields, char *trail,
+@@ -2298,32 +2286,6 @@ static void cmdloop(void)
+ 
+                 prometheus_increment(CYRUS_IMAP_XBACKUP_TOTAL);
+             }
+-            else if (!strcmp(cmd.s, "Xconvfetch")) {
+-                cmd_xconvfetch(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVFETCH_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvmultisort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvmultisort(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVMULTISORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvsort")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 0);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVSORT_TOTAL); */
+-            }
+-            else if (!strcmp(cmd.s, "Xconvupdates")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xconvsort(tag.s, 1);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XCONVUPDATES_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xfer")) {
+                 if (readonly) goto noreadonly;
+                 int havepartition = 0;
+@@ -2349,9 +2311,6 @@ static void cmdloop(void)
+                          (havepartition ? arg3.s : NULL));
+                 /* XXX prometheus_increment(CYRUS_IMAP_XFER_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xconvmeta")) {
+-                cmd_xconvmeta(tag.s);
+-            }
+             else if (!strcmp(cmd.s, "Xlist")) {
+                 struct listargs listargs;
+ 
+@@ -2384,13 +2343,6 @@ static void cmdloop(void)
+                 cmd_xrunannotator(tag.s, arg1.s, usinguid);
+                 /* XXX prometheus_increment(CYRUS_IMAP_XRUNANNOTATOR_TOTAL); */
+             }
+-            else if (!strcmp(cmd.s, "Xsnippets")) {
+-                if (c != ' ') goto missingargs;
+-                if (!imapd_index && !backend_current) goto nomailbox;
+-                cmd_xsnippets(tag.s);
+-
+-                /* XXX prometheus_increment(CYRUS_IMAP_XSNIPPETS_TOTAL); */
+-            }
+             else if (!strcmp(cmd.s, "Xstats")) {
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xstats(tag.s);
+@@ -5209,8 +5161,6 @@ badannotation:
+     }
+     if (config_getswitch(IMAPOPT_CONVERSATIONS)
+         && (fa->fetchitems & (FETCH_MAILBOXIDS|FETCH_MAILBOXES))) {
+-        // annoyingly, this codepath COULD be called from xconv* commands, but it never is,
+-        // in reality, so it's safe leaving this as shared
+         int r = conversations_open_user(imapd_userid, 0/*shared*/, &fa->convstate);
+         if (r) {
+             syslog(LOG_WARNING, "error opening conversations for %s: %s",
+@@ -5298,136 +5248,6 @@ static void cmd_fetch(char *tag, char *sequence, int usinguid)
+     fetchargs_fini(&fetchargs);
+ }
+ 
+-static void do_one_xconvmeta(struct conversations_state *state,
+-                             conversation_id_t cid,
+-                             conversation_t *conv,
+-                             struct dlist *itemlist)
+-{
+-    struct dlist *item = dlist_newpklist(NULL, "");
+-    struct dlist *fl;
+-
+-    assert(conv);
+-    assert(itemlist);
+-
+-    for (fl = itemlist->head; fl; fl = fl->next) {
+-        const char *key = dlist_cstring(fl);
+-
+-        /* xxx - parse to a fetchitems? */
+-        if (!strcasecmp(key, "MODSEQ"))
+-            dlist_setnum64(item, "MODSEQ", conv->modseq);
+-        else if (!strcasecmp(key, "EXISTS"))
+-            dlist_setnum32(item, "EXISTS", conv->exists);
+-        else if (!strcasecmp(key, "UNSEEN"))
+-            dlist_setnum32(item, "UNSEEN", conv->unseen);
+-        else if (!strcasecmp(key, "SIZE"))
+-            dlist_setnum32(item, "SIZE", conv->size);
+-        else if (!strcasecmp(key, "COUNT")) {
+-            struct dlist *flist = dlist_newlist(item, "COUNT");
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *lookup = dlist_cstring(tmp);
+-                    int i = strarray_find_case(state->counted_flags, lookup, 0);
+-                    if (i >= 0) {
+-                        dlist_setflag(flist, "FLAG", lookup);
+-                        dlist_setnum32(flist, "COUNT", conv->counts[i]);
+-                    }
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "SENDERS")) {
+-            conv_sender_t *sender;
+-            struct dlist *slist = dlist_newlist(item, "SENDERS");
+-            for (sender = conv->senders; sender; sender = sender->next) {
+-                struct dlist *sli = dlist_newlist(slist, "");
+-                dlist_setatom(sli, "NAME", sender->name);
+-                dlist_setatom(sli, "ROUTE", sender->route);
+-                dlist_setatom(sli, "MAILBOX", sender->mailbox);
+-                dlist_setatom(sli, "DOMAIN", sender->domain);
+-            }
+-        }
+-        /* XXX - maybe rename FOLDERCOUNTS or something? */
+-        else if (!strcasecmp(key, "FOLDEREXISTS")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDEREXISTS");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "EXISTS", folder ? folder->exists : 0);
+-                }
+-            }
+-        }
+-        else if (!strcasecmp(key, "FOLDERUNSEEN")) {
+-            struct dlist *flist = dlist_newlist(item, "FOLDERUNSEEN");
+-            conv_folder_t *folder;
+-            fl = fl->next;
+-            if (dlist_isatomlist(fl)) {
+-                struct dlist *tmp;
+-                for (tmp = fl->head; tmp; tmp = tmp->next) {
+-                    const char *extname = dlist_cstring(tmp);
+-                    char *intname = mboxname_from_external(extname, &imapd_namespace, imapd_userid);
+-                    folder = conversation_find_folder(state, conv, intname);
+-                    free(intname);
+-                    dlist_setatom(flist, "MBOXNAME", extname);
+-                    /* ok if it's not there */
+-                    dlist_setnum32(flist, "UNSEEN", folder ? folder->unseen : 0);
+-                }
+-            }
+-        }
+-        else {
+-            dlist_setatom(item, key, NULL); /* add a NIL response */
+-        }
+-    }
+-
+-    prot_printf(imapd_out, "* XCONVMETA %s ", conversation_id_encode(cid));
+-    dlist_print(item, 0, imapd_out);
+-    prot_printf(imapd_out, "\r\n");
+-
+-    dlist_free(&item);
+-}
+-
+-static void do_xconvmeta(const char *tag,
+-                         struct conversations_state *state,
+-                         struct dlist *cidlist,
+-                         struct dlist *itemlist)
+-{
+-    conversation_id_t cid;
+-    struct dlist *dl;
+-    int r;
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        const char *cidstr = dlist_cstring(dl);
+-        conversation_t *conv = NULL;
+-
+-        if (!conversation_id_decode(&cid, cidstr) || !cid) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID %s\r\n", tag, cidstr);
+-            return;
+-        }
+-
+-        r = conversation_load(state, cid, &conv);
+-        if (r) {
+-            prot_printf(imapd_out, "%s BAD Failed to read %s\r\n", tag, cidstr);
+-            conversation_free(conv);
+-            return;
+-        }
+-
+-        if (conv && conv->exists)
+-            do_one_xconvmeta(state, cid, conv, itemlist);
+-
+-        conversation_free(conv);
+-    }
+-
+-    prot_printf(imapd_out, "%s OK Completed\r\n", tag);
+-}
+-
+ static int do_xbackup(const char *channel,
+                       const ptrarray_t *list)
+ {
+@@ -5571,270 +5391,6 @@ done:
+     }
+ }
+ 
+-/*
+- * Parse and perform a XCONVMETA command.
+- */
+-void cmd_xconvmeta(const char *tag)
+-{
+-    int r;
+-    int c = ' ';
+-    struct conversations_state *state = NULL;
+-    struct dlist *cidlist = NULL;
+-    struct dlist *itemlist = NULL;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVMETA ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Failed to parse CID list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    c = dlist_parse_asatomlist(&itemlist, 0, imapd_in);
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out, "%s BAD Failed to parse item list\r\n", tag);
+-        eatline(imapd_in, c);
+-        goto done;
+-    }
+-
+-    // this one is OK, xconvmeta doesn't do an expunge
+-    r = conversations_open_user(imapd_userid, 1/*shared*/, &state);
+-    if (r) {
+-        prot_printf(imapd_out, "%s BAD failed to open db: %s\r\n",
+-                    tag, error_message(r));
+-        goto done;
+-    }
+-
+-    do_xconvmeta(tag, state, cidlist, itemlist);
+-
+- done:
+-
+-    dlist_free(&itemlist);
+-    dlist_free(&cidlist);
+-    conversations_commit(&state);
+-}
+-
+-/*
+- * Parse and perform a XCONVFETCH command.
+- */
+-void cmd_xconvfetch(const char *tag)
+-{
+-    int c = ' ';
+-    struct fetchargs fetchargs;
+-    int r;
+-    clock_t start = clock();
+-    modseq_t ifchangedsince = 0;
+-    char mytime[100];
+-    struct dlist *cidlist = NULL;
+-    struct dlist *item;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        prot_printf(backend_current->out, "%s XCONVFETCH ", tag);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, c);
+-        return;
+-    }
+-
+-    /* local mailbox */
+-    memset(&fetchargs, 0, sizeof(struct fetchargs));
+-
+-    c = dlist_parse_asatomlist(&cidlist, 0, imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    /* check CIDs */
+-    for (item = cidlist->head; item; item = item->next) {
+-        if (!dlist_ishex64(item)) {
+-            prot_printf(imapd_out, "%s BAD Invalid CID\r\n", tag);
+-            eatline(imapd_in, c);
+-            goto freeargs;
+-        }
+-    }
+-
+-    c = getmodseq(imapd_in, &ifchangedsince);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-    r = parse_fetch_args(tag, "Xconvfetch", 0, &fetchargs);
+-    if (r)
+-        goto freeargs;
+-    fetchargs.fetchitems |= (FETCH_UIDVALIDITY|FETCH_FOLDER);
+-    fetchargs.namespace = &imapd_namespace;
+-    fetchargs.userid = imapd_userid;
+-
+-    r = do_xconvfetch(cidlist, ifchangedsince, &fetchargs);
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-
+-    if (r) {
+-        prot_printf(imapd_out, "%s NO %s (%s sec)\r\n", tag,
+-                    error_message(r), mytime);
+-    } else {
+-        prot_printf(imapd_out, "%s OK Completed (%s sec)\r\n",
+-                    tag, mytime);
+-    }
+-
+-freeargs:
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-    return;
+-
+-syntax_error:
+-    prot_printf(imapd_out, "%s BAD Syntax error\r\n", tag);
+-    eatline(imapd_in, c);
+-    dlist_free(&cidlist);
+-    fetchargs_fini(&fetchargs);
+-}
+-
+-static int xconvfetch_lookup(struct conversations_state *statep,
+-                             conversation_id_t cid,
+-                             modseq_t ifchangedsince,
+-                             hash_table *wanted_cids,
+-                             strarray_t *folder_list)
+-{
+-    const char *key = conversation_id_encode(cid);
+-    conversation_t *conv = NULL;
+-    conv_folder_t *folder;
+-    int r;
+-
+-    r = conversation_load(statep, cid, &conv);
+-    if (r) return r;
+-
+-    if (!conv)
+-        goto out;
+-
+-    if (!conv->exists)
+-        goto out;
+-
+-    /* output the metadata for this conversation */
+-    {
+-        struct dlist *dl = dlist_newlist(NULL, "");
+-        dlist_setatom(dl, "", "MODSEQ");
+-        do_one_xconvmeta(statep, cid, conv, dl);
+-        dlist_free(&dl);
+-    }
+-
+-    if (ifchangedsince >= conv->modseq)
+-        goto out;
+-
+-    hash_insert(key, (void *)1, wanted_cids);
+-
+-    for (folder = conv->folders; folder; folder = folder->next) {
+-        /* no contents */
+-        if (!folder->exists)
+-            continue;
+-
+-        /* finally, something worth looking at */
+-        strarray_add(folder_list, strarray_nth(statep->folders, folder->number));
+-    }
+-
+-out:
+-    conversation_free(conv);
+-    return 0;
+-}
+-
+-static int do_xconvfetch(struct dlist *cidlist,
+-                         modseq_t ifchangedsince,
+-                         struct fetchargs *fetchargs)
+-{
+-    struct conversations_state *state = NULL;
+-    int r = 0;
+-    struct index_state *index_state = NULL;
+-    struct dlist *dl;
+-    hash_table wanted_cids = HASH_TABLE_INITIALIZER;
+-    strarray_t folder_list = STRARRAY_INITIALIZER;
+-    struct index_init init;
+-    int i;
+-
+-    // this one expunges each mailbox it enters, so we need to lock exclusively
+-    r = conversations_open_user(imapd_userid, 0/*shared*/, &state);
+-    if (r) goto out;
+-
+-    construct_hash_table(&wanted_cids, 1024, 0);
+-
+-    for (dl = cidlist->head; dl; dl = dl->next) {
+-        r = xconvfetch_lookup(state, dlist_num(dl), ifchangedsince,
+-                              &wanted_cids, &folder_list);
+-        if (r) goto out;
+-    }
+-
+-    /* unchanged, woot */
+-    if (!folder_list.count)
+-        goto out;
+-
+-    fetchargs->cidhash = &wanted_cids;
+-
+-    memset(&init, 0, sizeof(struct index_init));
+-    init.userid = imapd_userid;
+-    init.authstate = imapd_authstate;
+-    init.out = imapd_out;
+-
+-    for (i = 0; i < folder_list.count; i++) {
+-        const char *mboxname;
+-        mbentry_t *mbentry = NULL;
+-
+-        if (state->folders_byname) mboxname = folder_list.data[i];
+-        else {
+-            mboxlist_lookup_by_uniqueid(folder_list.data[i], &mbentry, NULL);
+-            if (!mbentry) continue;
+-            mboxname = mbentry->name;
+-        }
+-
+-        r = index_open(mboxname, &init, &index_state);
+-        mboxlist_entry_free(&mbentry);
+-        if (r == IMAP_MAILBOX_NONEXISTENT)
+-            continue;
+-        if (r)
+-            goto out;
+-
+-        index_checkflags(index_state, 0, 0);
+-
+-        /* make sure \Deleted messages are expunged.  Will also lock the
+-         * mailbox state and read any new information */
+-        r = index_expunge(index_state, NULL, 1);
+-
+-        if (!r)
+-            index_fetchresponses(index_state, NULL, /*usinguid*/1,
+-                                 fetchargs, NULL);
+-
+-        index_close(&index_state);
+-
+-        if (r) goto out;
+-    }
+-
+-    r = 0;
+-
+-out:
+-    index_close(&index_state);
+-    conversations_commit(&state);
+-    free_hash_table(&wanted_cids, NULL);
+-    strarray_fini(&folder_list);
+-    return r;
+-}
+-
+ #undef PARSE_PARTIAL /* cleanup */
+ 
+ /*
+@@ -6417,314 +5973,6 @@ error:
+     freesearchargs(searchargs);
+ }
+ 
+-/*
+- * Perform a XCONVSORT or XCONVUPDATES command
+- */
+-void cmd_xconvsort(char *tag, int updates)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct index_init init;
+-    struct index_state *oldstate = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvsort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, updates);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    if (updates) {
+-        /* in XCONVUPDATES, need to force a re-read from scratch into
+-         * a new index, because we ask for deleted messages */
+-
+-        oldstate = imapd_index;
+-        imapd_index = NULL;
+-
+-        memset(&init, 0, sizeof(struct index_init));
+-        init.userid = imapd_userid;
+-        init.authstate = imapd_authstate;
+-        init.out = imapd_out;
+-        init.want_expunged = 1;
+-
+-        r = index_open(index_mboxname(oldstate), &init, &imapd_index);
+-        if (r) {
+-            prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                        error_message(r));
+-            goto error;
+-        }
+-
+-        index_checkflags(imapd_index, 0, 0);
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xconvsort\r\n", tag);
+-        goto error;
+-    }
+-
+-    if (updates)
+-        r = index_convupdates(imapd_index, sortcrit, searchargs, windowargs);
+-    else
+-        r = index_convsort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (oldstate) {
+-        index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVSORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    if (oldstate) {
+-        if (imapd_index) index_close(&imapd_index);
+-        imapd_index = oldstate;
+-    }
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-/*
+- * Perform a XCONVMULTISORT command.  This is like XCONVSORT but returns
+- * search results from multiple folders.  It still requires a selected
+- * mailbox, for two reasons:
+- *
+- * a) it's a useful shorthand for choosing what the current
+- * conversations scope is, and
+- *
+- * b) the code to parse a search program currently relies on a selected
+- * mailbox.
+- *
+- * Unlike ESEARCH it doesn't take folder names for scope, instead the
+- * search scope is implicitly the current conversation scope.  This is
+- * implemented more or less by accident because both the Sphinx index
+- * and the conversations database are hardcoded to be per-user.
+- */
+-static void cmd_xconvmultisort(char *tag)
+-{
+-    int c;
+-    struct sortcrit *sortcrit = NULL;
+-    struct searchargs *searchargs = NULL;
+-    struct windowargs *windowargs = NULL;
+-    struct conversations_state *cstate = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xconvmultisort";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    if (!config_getswitch(IMAPOPT_CONVERSATIONS)) {
+-        prot_printf(imapd_out, "%s BAD Unrecognized command\r\n", tag);
+-        eatline(imapd_in, ' ');
+-        return;
+-    }
+-
+-    c = getsortcriteria(tag, &sortcrit);
+-    if (c == EOF) goto error;
+-
+-    if (c != ' ') {
+-        prot_printf(imapd_out, "%s BAD Missing window args in XConvMultiSort\r\n",
+-                    tag);
+-        goto error;
+-    }
+-
+-    c = parse_windowargs(tag, &windowargs, /*updates*/0);
+-    if (c != ' ')
+-        goto error;
+-
+-    /* open the conversations state first - we don't care if it fails,
+-     * because that probably just means it's already open */
+-    // this codepath might expunge, so we can't open shared
+-    conversations_open_mbox(index_mboxname(imapd_index), 0/*shared*/, &cstate);
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to XconvMultiSort\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_convmultisort(imapd_index, sortcrit, searchargs, windowargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    if (CONFIG_TIMING_VERBOSE) {
+-        char *s = sortcrit_as_string(sortcrit);
+-        syslog(LOG_DEBUG, "XCONVMULTISORT (%s) processing time %s sec",
+-               s, mytime);
+-        free(s);
+-    }
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    if (cstate) conversations_commit(&cstate);
+-    freesortcrit(sortcrit);
+-    freesearchargs(searchargs);
+-    free_windowargs(windowargs);
+-    return;
+-
+-error:
+-    if (cstate) conversations_commit(&cstate);
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+-static void cmd_xsnippets(char *tag)
+-{
+-    int c;
+-    struct searchargs *searchargs = NULL;
+-    struct snippetargs *snippetargs = NULL;
+-    clock_t start = clock();
+-    char mytime[100];
+-    int r;
+-
+-    if (backend_current) {
+-        /* remote mailbox */
+-        const char *cmd = "Xsnippets";
+-
+-        prot_printf(backend_current->out, "%s %s ", tag, cmd);
+-        if (!pipe_command(backend_current, 65536)) {
+-            pipe_including_tag(backend_current, tag, 0);
+-        }
+-        return;
+-    }
+-    assert(imapd_index);
+-
+-    c = get_snippetargs(&snippetargs);
+-    if (c == EOF) {
+-        prot_printf(imapd_out, "%s BAD Syntax error in snippet arguments\r\n", tag);
+-        goto error;
+-    }
+-    if (c != ' ') {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected arguments in Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    /* need index loaded to even parse searchargs! */
+-    searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+-                                &imapd_namespace, imapd_userid, imapd_authstate,
+-                                imapd_userisadmin || imapd_userisproxyadmin);
+-    c = get_search_program(imapd_in, imapd_out, searchargs);
+-    if (c == EOF) goto error;
+-
+-    if (!IS_EOL(c, imapd_in)) {
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to Xsnippets\r\n", tag);
+-        goto error;
+-    }
+-
+-    r = index_snippets(imapd_index, snippetargs, searchargs);
+-
+-    if (r < 0) {
+-        prot_printf(imapd_out, "%s NO %s\r\n", tag,
+-                    error_message(r));
+-        goto error;
+-    }
+-
+-    snprintf(mytime, sizeof(mytime), "%2.3f",
+-             (clock() - start) / (double) CLOCKS_PER_SEC);
+-    prot_printf(imapd_out, "%s OK %s (in %s secs)\r\n", tag,
+-                error_message(IMAP_OK_COMPLETED), mytime);
+-
+-out:
+-    freesearchargs(searchargs);
+-    free_snippetargs(&snippetargs);
+-    return;
+-
+-error:
+-    eatline(imapd_in, (c == EOF ? ' ' : c));
+-    goto out;
+-}
+-
+ static void cmd_xstats(char *tag)
+ {
+     int metric;
+@@ -11124,81 +10372,6 @@ out_noprint:
+     seqset_free(&uids);
+ }
+ 
+-static void free_snippetargs(struct snippetargs **sap)
+-{
+-    while (*sap) {
+-        struct snippetargs *sa = *sap;
+-        *sap = sa->next;
+-        free(sa->mboxname);
+-        free(sa->uids.data);
+-        free(sa);
+-    }
+-}
+-
+-static int get_snippetargs(struct snippetargs **sap)
+-{
+-    int c;
+-    struct snippetargs **prevp = sap;
+-    struct snippetargs *sa = NULL;
+-    struct buf arg = BUF_INITIALIZER;
+-    uint32_t uid;
+-    char *intname = NULL;
+-
+-    c = prot_getc(imapd_in);
+-    if (c != '(') goto syntax_error;
+-
+-    for (;;) {
+-        c = prot_getc(imapd_in);
+-        if (c == ')') break;
+-        if (c != '(') goto syntax_error;
+-
+-        c = getastring(imapd_in, imapd_out, &arg);
+-        if (c != ' ') goto syntax_error;
+-
+-        intname = mboxname_from_external(buf_cstring(&arg), &imapd_namespace, imapd_userid);
+-
+-        /* allocate a new snippetargs */
+-        sa = xzmalloc(sizeof(struct snippetargs));
+-        sa->mboxname = xstrdup(intname);
+-        /* append to the list */
+-        *prevp = sa;
+-        prevp = &sa->next;
+-
+-        c = getuint32(imapd_in, &sa->uidvalidity);
+-        if (c != ' ') goto syntax_error;
+-
+-        c = prot_getc(imapd_in);
+-        if (c != '(') break;
+-        for (;;) {
+-            c = getuint32(imapd_in, &uid);
+-            if (c != ' ' && c != ')') goto syntax_error;
+-            if (sa->uids.count + 1 > sa->uids.alloc) {
+-                sa->uids.alloc += 64;
+-                sa->uids.data = xrealloc(sa->uids.data,
+-                                         sizeof(uint32_t) * sa->uids.alloc);
+-            }
+-            sa->uids.data[sa->uids.count++] = uid;
+-            if (c == ')') break;
+-        }
+-
+-        c = prot_getc(imapd_in);
+-        if (c != ')') goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ') goto syntax_error;
+-
+-out:
+-    free(intname);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free_snippetargs(sap);
+-    c = EOF;
+-    goto out;
+-}
+-
+ static void cmd_dump(char *tag, char *name, int uid_start)
+ {
+     int r = 0;
+@@ -12694,185 +11867,6 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     return EOF;
+ }
+ 
+-static int parse_windowargs(const char *tag,
+-                            struct windowargs **wa,
+-                            int updates)
+-{
+-    struct windowargs windowargs;
+-    struct buf arg = BUF_INITIALIZER;
+-    struct buf ext_folder = BUF_INITIALIZER;
+-    int c;
+-
+-    memset(&windowargs, 0, sizeof(windowargs));
+-
+-    c = prot_getc(imapd_in);
+-    if (c == EOF)
+-        goto out;
+-    if (c != '(') {
+-        /* no window args at all */
+-        prot_ungetc(c, imapd_in);
+-        goto out;
+-    }
+-
+-    for (;;)
+-    {
+-        c = prot_getc(imapd_in);
+-        if (c == EOF)
+-            goto out;
+-        if (c == ')')
+-            break;  /* end of window args */
+-
+-        prot_ungetc(c, imapd_in);
+-        c = getword(imapd_in, &arg);
+-        if (!arg.len)
+-            goto syntax_error;
+-
+-        if (!strcasecmp(arg.s, "CONVERSATIONS"))
+-            windowargs.conversations = 1;
+-        else if (!strcasecmp(arg.s, "POSITION")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.position);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.position == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "ANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "MULTIANCHOR")) {
+-            if (updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.anchor);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getastring(imapd_in, imapd_out, &ext_folder);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.offset);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.limit);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (windowargs.anchor == 0)
+-                goto syntax_error;
+-        }
+-        else if (!strcasecmp(arg.s, "CHANGEDSINCE")) {
+-            if (!updates)
+-                goto syntax_error;
+-            windowargs.changedsince = 1;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getmodseq(imapd_in, &windowargs.modseq);
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.uidnext);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-        } else if (!strcasecmp(arg.s, "UPTO")) {
+-            if (!updates)
+-                goto syntax_error;
+-            if (c != ' ')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-            if (c != '(')
+-                goto syntax_error;
+-            c = getuint32(imapd_in, &windowargs.upto);
+-            if (c != ')')
+-                goto syntax_error;
+-            c = prot_getc(imapd_in);
+-
+-            if (windowargs.upto == 0)
+-                goto syntax_error;
+-        }
+-        else
+-            goto syntax_error;
+-
+-        if (c == ')')
+-            break;
+-        if (c != ' ')
+-            goto syntax_error;
+-    }
+-
+-    c = prot_getc(imapd_in);
+-    if (c != ' ')
+-        goto syntax_error;
+-
+-out:
+-    /* these two are mutually exclusive */
+-    if (windowargs.anchor && windowargs.position)
+-        goto syntax_error;
+-    /* changedsince is mandatory for XCONVUPDATES
+-     * and illegal for XCONVSORT */
+-    if (!!updates != windowargs.changedsince)
+-        goto syntax_error;
+-
+-    if (ext_folder.len) {
+-        windowargs.anchorfolder = mboxname_from_external(buf_cstring(&ext_folder),
+-                                                         &imapd_namespace,
+-                                                         imapd_userid);
+-    }
+-
+-    *wa = xmemdup(&windowargs, sizeof(windowargs));
+-    buf_free(&ext_folder);
+-    buf_free(&arg);
+-    return c;
+-
+-syntax_error:
+-    free(windowargs.anchorfolder);
+-    buf_free(&ext_folder);
+-    prot_printf(imapd_out, "%s BAD Syntax error in window arguments\r\n", tag);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
+-    return EOF;
+-}
+-
+-static void free_windowargs(struct windowargs *wa)
+-{
+-    if (!wa)
+-        return;
+-    free(wa->anchorfolder);
+-    free(wa);
+-}
+-
+ /*
+  * Parse LIST selection options.
+  * The command has been parsed up to and including the opening '('.
+-- 
+2.39.2
+
+
+From c34f94d56bc0c872b3ad2616fdf6cd346cf2d69e Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Mon, 26 Feb 2024 10:11:15 -0500
+Subject: [PATCH 10/16] imapd.c: add 'maxliteral' option
+
+---
+ changes/next/imap_literal_limits |  19 +++
+ imap/imap_err.et                 |   3 +
+ imap/imapd.c                     | 213 ++++++++++++++++++++++---------
+ imap/imapparse.c                 |  73 ++++++-----
+ lib/imapoptions                  |  22 +++-
+ lib/libconfig.c                  |   7 +
+ lib/libconfig.h                  |   1 +
+ 7 files changed, 244 insertions(+), 94 deletions(-)
+ create mode 100644 changes/next/imap_literal_limits
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+new file mode 100644
+index 000000000..c7fc35bbc
+--- /dev/null
++++ b/changes/next/imap_literal_limits
+@@ -0,0 +1,19 @@
++Description:
++
++Adds a config option to limit the size of a single literal allowed
++by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++
++
++Config changes:
++
++New 'maxliteral' option.
++
++
++Upgrade instructions:
++
++None.
++
++
++GitHub issue:
++
++None.
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index d90e30a4b..5768f49d1 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_LITERAL_TOO_LARGE,
++   "[TOOBIG] Literal size exceeds fixed limit"
++
+ ec IMAP_LITERAL_MINUS_TOO_LARGE,
+    "[TOOBIG] Non-synchronizing literal size exceeds 4K"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 0ea16979a..000b9416d 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -1441,7 +1441,7 @@ static void cmdloop(void)
+                 if (c != ' ' || (strcmp("$", arg1.s) && !imparse_issequence(arg1.s)))
+                     goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/0);
+@@ -1454,7 +1454,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1481,7 +1481,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 0, 0);
+ 
+@@ -1493,7 +1493,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, NULL);
+ 
+@@ -1545,7 +1545,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Examine")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -1578,7 +1578,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Getacl")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getacl(tag.s, arg1.s);
+ 
+@@ -1603,7 +1603,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquota")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquota(tag.s, arg1.s);
+ 
+@@ -1612,7 +1612,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Getquotaroot")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_getquotaroot(tag.s, arg1.s);
+ 
+@@ -1737,7 +1737,7 @@ static void cmdloop(void)
+ 
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     c = parsecreateargs(&extargs);
+                     if (c == EOF) goto badpartition;
+@@ -1753,7 +1753,7 @@ static void cmdloop(void)
+                 /* delete a mailbox locally only */
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_delete(tag.s, arg1.s, 1, 1);
+ 
+@@ -1766,7 +1766,7 @@ static void cmdloop(void)
+             if (!strcmp(cmd.s, "Myrights")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_myrights(tag.s, arg1.s);
+ 
+@@ -1776,7 +1776,7 @@ static void cmdloop(void)
+                 if (readonly) goto noreadonly;
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if(c == EOF) goto missingargs;
++                if(c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_mupdatepush(tag.s, arg1.s);
+ 
+@@ -1794,7 +1794,7 @@ static void cmdloop(void)
+                 if (c != ' ' || (strcmp("$", arg1.s) && !imparse_issequence(arg1.s)))
+                     goto badsequence;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+ 
+                 cmd_copy(tag.s, arg1.s, arg2.s, usinguid, /*ismove*/1);
+@@ -1829,7 +1829,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg1);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg2);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (c == ' ') {
+                     havepartition = 1;
+                     c = getword(imapd_in, &arg3);
+@@ -1902,7 +1902,7 @@ static void cmdloop(void)
+                 if (c == ' ') {
+                     have_mbox = 1;
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto missingargs;
++                    if (c <= EOF) goto missingargs;
+                     if (c == ' ') {
+                         have_mech = 1;
+                         c = getword(imapd_in, &arg2);
+@@ -1976,7 +1976,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Select")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 prot_ungetc(c, imapd_in);
+ 
+                 cmd_select(tag.s, cmd.s, arg1.s);
+@@ -2001,7 +2001,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 1);
+@@ -2019,7 +2019,7 @@ static void cmdloop(void)
+                 c = getastring(imapd_in, imapd_out, &arg2);
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg3);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_setacl(tag.s, arg1.s, arg2.s, arg3.s);
+ 
+@@ -2220,7 +2220,7 @@ static void cmdloop(void)
+                     havenamespace = 1;
+                     c = getastring(imapd_in, imapd_out, &arg2);
+                 }
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 if (havenamespace) {
+                     cmd_changesub(tag.s, arg1.s, arg2.s, 0);
+@@ -2367,7 +2367,7 @@ static void cmdloop(void)
+             else if (!strcmp(cmd.s, "Xmeid")) {
+                 if (c != ' ') goto missingargs;
+                 c = getastring(imapd_in, imapd_out, &arg1);
+-                if (c == EOF) goto missingargs;
++                if (c <= EOF) goto missingargs;
+                 if (!IS_EOL(c, imapd_in)) goto extraargs;
+                 cmd_xmeid(tag.s, arg1.s);
+             }
+@@ -2379,7 +2379,7 @@ static void cmdloop(void)
+ 
+                 do {
+                     c = getastring(imapd_in, imapd_out, &arg1);
+-                    if (c == EOF) goto aps_missingargs;
++                    if (c <= EOF) goto aps_missingargs;
+ 
+                     if (!strcmp(arg1.s, "mailboxes")) {
+                         c = prot_getc(imapd_in);
+@@ -2391,7 +2391,7 @@ static void cmdloop(void)
+                             prot_ungetc(c, imapd_in);
+                             do {
+                                 c = getastring(imapd_in, imapd_out, &arg2);
+-                                if (c == EOF) break;
++                                if (c <= EOF) break;
+                                 strarray_push(&applepushserviceargs.mailboxes, arg2.s);
+                             } while (c == ' ');
+                         }
+@@ -2477,6 +2477,8 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     missingargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+@@ -2489,11 +2491,18 @@ static void cmdloop(void)
+         strarray_fini(&applepushserviceargs.mailboxes);
+ 
+     extraargs:
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
++
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to %s\r\n", tag.s, cmd.s);
+         eatline(imapd_in, c);
+         continue;
+ 
++    maxliteral:
++        prot_printf(imapd_out, "%s NO %s in %s\r\n",
++                    tag.s, error_message(IMAP_LITERAL_TOO_LARGE), cmd.s);
++        continue;
++
+     badsequence:
+         prot_printf(imapd_out,
+                     "%s BAD Invalid sequence in %s\r\n", tag.s, cmd.s);
+@@ -2666,10 +2675,14 @@ static void cmd_login(char *tag, char *user)
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         buf_free(&passwdbuf);
+-        prot_printf(imapd_out,
+-                    "%s BAD Unexpected extra arguments to LOGIN\r\n",
+-                    tag);
+-        eatline(imapd_in, c);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in LOGIN\r\n", tag, error_message(c));
++        } else {
++            prot_printf(imapd_out,
++                        "%s BAD Unexpected extra arguments to LOGIN\r\n",
++                        tag);
++            eatline(imapd_in, c);
++        }
+         return;
+     }
+ 
+@@ -3084,10 +3097,16 @@ static void cmd_id(char *tag)
+                 /* get field value */
+                 (c = getnstring(imapd_in, imapd_out, &arg)) == EOF ||
+                 (c != ' ' && c != ')')) {
+-                prot_printf(imapd_out,
+-                            "%s BAD Invalid field-value pair in Id\r\n",
+-                            tag);
+-                eatline(imapd_in, c);
++                if (c == IMAP_LITERAL_TOO_LARGE) {
++                    prot_printf(imapd_out, "%s NO %s in Id\r\n",
++                                tag, error_message(c));
++                }
++                else {
++                    prot_printf(imapd_out,
++                                "%s BAD Invalid field-value pair in Id\r\n",
++                                tag);
++                    eatline(imapd_in, c);
++                }
+                 return;
+             }
+ 
+@@ -3777,6 +3796,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+         else if (!strcasecmp(arg.s, "URL")) {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ' && c != ')') {
+                 *parseerr = "Missing URL in Append command";
+                 return IMAP_PROTOCOL_ERROR;
+@@ -3975,8 +3995,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+                 c = parse_annotate_store_data(tag,
+                                               /*permessage_flag*/1,
+                                               &curstage->annotations);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto cleanup;
+                 }
+                 qdiffs[QUOTA_ANNOTSTORAGE] += sizeentryatts(curstage->annotations);
+@@ -4103,6 +4122,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+     if (r == IMAP_PROTOCOL_ERROR && parseerr) {
+         prot_printf(imapd_out, "%s BAD %s\r\n", tag, parseerr);
++    } else if (r == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
+     } else if (r == IMAP_BADURL) {
+         prot_printf(imapd_out, "%s NO [BADURL \"%s\"] %s\r\n",
+                     tag, url, parseerr);
+@@ -4647,8 +4668,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+                                               /*permessage_flag*/1,
+                                               &fa->entries,
+                                               &fa->attribs);
+-                if (c == EOF) {
+-                    eatline(imapd_in, c);
++                if (c <= EOF) {
+                     goto freeargs;
+                 }
+                 if (c != ')') {
+@@ -4761,6 +4781,11 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (c == IMAP_LITERAL_TOO_LARGE) {
++                            prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                        tag, error_message(c), cmd, fetchatt.s);
++                            goto freeargs;
++                        }
+                         for (p = fieldname.s; *p; p++) {
+                             if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                         }
+@@ -4991,6 +5016,11 @@ badannotation:
+                 }
+                 do {
+                     c = getastring(imapd_in, imapd_out, &fieldname);
++                    if (c == IMAP_LITERAL_TOO_LARGE) {
++                        prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
++                                    tag, error_message(c), cmd, fetchatt.s);
++                        goto freeargs;
++                    }
+                     for (p = fieldname.s; *p; p++) {
+                         if (*p <= ' ' || *p & 0x80 || *p == ':') break;
+                     }
+@@ -5506,8 +5536,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         c = parse_annotate_store_data(tag, /*permessage_flag*/1,
+                                       &storeargs.entryatts);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeflags;
+         }
+         storeargs.namespace = &imapd_namespace;
+@@ -5748,6 +5777,11 @@ static void cmd_search(char *tag, char *cmd)
+         return;
+     }
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Search\r\n", tag, error_message(c));
++        goto done;
++    }
++
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out, "%s BAD Unexpected extra arguments to Search\r\n", tag);
+         eatline(imapd_in, c);
+@@ -6044,16 +6078,19 @@ static void cmd_thread(char *tag, int usinguid)
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
++    }
++
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Thread\r\n", tag, error_message(c));
++        goto done;
+     }
+ 
+     if (!IS_EOL(c, imapd_in)) {
+         prot_printf(imapd_out,
+                     "%s BAD Unexpected extra arguments to Thread\r\n", tag);
+         eatline(imapd_in, c);
+-        freesearchargs(searchargs);
+-        return;
++        goto done;
+     }
+ 
+     n = index_thread(imapd_index, alg, searchargs, usinguid);
+@@ -6062,6 +6099,7 @@ static void cmd_thread(char *tag, int usinguid)
+     prot_printf(imapd_out, "%s OK %s (%d msgs in %s secs)\r\n", tag,
+                 error_message(IMAP_OK_COMPLETED), n, mytime);
+ 
++  done:
+     freesearchargs(searchargs);
+     return;
+ }
+@@ -7635,8 +7673,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == '(') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistselopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             return;
+         }
+     }
+@@ -7648,6 +7685,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     /* Read in reference name */
+     c = getastring(imapd_in, imapd_out, &reference);
++    if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+     if (c == EOF && !*reference.s) {
+         prot_printf(imapd_out,
+                     "%s BAD Missing required argument to List: reference name\r\n",
+@@ -7670,6 +7708,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+             if (c != ' ') break;
+@@ -7685,6 +7724,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     else {
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &buf);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to List: mailbox pattern\r\n",
+@@ -7699,8 +7739,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+     if (c == ' ') {
+         listargs->cmd = LIST_CMD_EXTENDED;
+         c = getlistretopts(tag, listargs);
+-        if (c == EOF) {
+-            eatline(imapd_in, c);
++        if (c <= EOF) {
+             goto freeargs;
+         }
+     }
+@@ -7719,6 +7758,10 @@ static void getlistargs(char *tag, struct listargs *listargs)
+ 
+     return;
+ 
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in List\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++
+   freeargs:
+     strarray_fini(&listargs->pat);
+     strarray_fini(&listargs->metaitems);
+@@ -9125,6 +9168,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation entry\r\n", tag);
+@@ -9152,6 +9196,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -9174,6 +9219,7 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute(s)\r\n", tag);
+@@ -9201,6 +9247,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &arg);
+         else
+             c = getqstring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation attribute\r\n", tag);
+@@ -9213,8 +9260,13 @@ static int parse_annotate_fetch_data(const char *tag,
+     return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9245,6 +9297,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing metadata entry\r\n", tag);
+@@ -9271,6 +9324,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* single entry -- add it to the list */
+         prot_ungetc(c, imapd_in);
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE)  goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -9289,8 +9343,13 @@ static int parse_metadata_string_or_list(const char *tag,
+     if (c == ' ' || c == '\r' || c == ')') return c;
+ 
+   baddata:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9342,6 +9401,7 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing annotation entry\r\n", tag);
+@@ -9362,6 +9422,7 @@ static int parse_annotate_store_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &attrib);
+             else
+                 c = getqstring(imapd_in, imapd_out, &attrib);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation attribute\r\n", tag);
+@@ -9375,6 +9436,7 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+             c = getbnstring(imapd_in, imapd_out, &value);
++            if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+                             "%s BAD Missing annotation value\r\n", tag);
+@@ -9416,8 +9478,14 @@ static int parse_annotate_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in annotation entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ /*
+@@ -9450,6 +9518,7 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata entry\r\n", tag);
+@@ -9462,6 +9531,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+                         "%s BAD Missing metadata value\r\n", tag);
+@@ -9502,7 +9572,7 @@ static int parse_metadata_store_data(const char *tag,
+ 
+     if (c != ')') {
+         prot_printf(imapd_out,
+-                    "%s BAD Missing close paren in annotation entry list \r\n",
++                    "%s BAD Missing close paren in metadata entry list \r\n",
+                     tag);
+         goto baddata;
+     }
+@@ -9513,8 +9583,14 @@ static int parse_metadata_store_data(const char *tag,
+ 
+   baddata:
+     if (attvalues) freeattvalues(attvalues);
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
++
++  maxliteral:
++    if (attvalues) freeattvalues(attvalues);
++    prot_printf(imapd_out, "%s NO %s in metadata entry\r\n",
++                tag, error_message(IMAP_LITERAL_TOO_LARGE));
++    return IMAP_LITERAL_TOO_LARGE;
+ }
+ 
+ static void getannotation_response(const char *mboxname,
+@@ -9699,8 +9775,7 @@ static void cmd_getannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_fetch_data(tag, /*permessage_flag*/0, &entries, &attribs);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -9934,8 +10009,10 @@ static void cmd_getmetadata(const char *tag)
+     while (nlists < 3)
+     {
+         c = parse_metadata_string_or_list(tag, &lists[nlists], &is_list[nlists]);
++        if (c <= EOF) goto freeargs;
++
+         nlists++;
+-        if (c == '\r' || c == EOF)
++        if (c == '\r')
+             break;
+     }
+ 
+@@ -10092,8 +10169,7 @@ static void cmd_setannotation(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_annotate_store_data(tag, 0, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -10160,8 +10236,7 @@ static void cmd_setmetadata(const char *tag, char *mboxpat)
+     annotate_state_t *astate = NULL;
+ 
+     c = parse_metadata_store_data(tag, &entryatts);
+-    if (c == EOF) {
+-        eatline(imapd_in, c);
++    if (c <= EOF) {
+         goto freeargs;
+     }
+ 
+@@ -10269,6 +10344,10 @@ static void cmd_xwarmup(const char *tag)
+     /* parse arguments: expect <mboxname> '('<warmup-items>')' */
+ 
+     c = getastring(imapd_in, imapd_out, &arg);
++    if (c == IMAP_LITERAL_TOO_LARGE) {
++        prot_printf(imapd_out, "%s NO %s in Xwarmup\r\n", tag, error_message(c));
++        goto out_noprint;
++    }
+     if (c != ' ') {
+ syntax_error:
+         prot_printf(imapd_out, "%s BAD syntax error in %s\r\n", tag, cmd);
+@@ -11779,9 +11858,11 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_ANNOTATION;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c != ' ') goto missingarg;
+             (*sortcrit)[n].args.annot.entry = xstrdup(criteria.s);
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             if (!strcmp(criteria.s, "value.shared"))
+                 userid = "";
+@@ -11799,6 +11880,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11812,6 +11894,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+             (*sortcrit)[n].key = SORT_HASCONVFLAG;
+             if (c != ' ') goto missingarg;
+             c = getastring(imapd_in, imapd_out, &criteria);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto missingarg;
+             (*sortcrit)[n].args.flag.name = xstrdup(criteria.s);
+         }
+@@ -11917,10 +12000,10 @@ static int getlistselopts(char *tag, struct listargs *args)
+ 
+             strarray_t options = STRARRAY_INITIALIZER;
+             c = parse_metadata_string_or_list(tag, &options, NULL);
++            if (c <= EOF) return c;
+             parse_getmetadata_options(&options, &opts);
+             args->metaopts = opts;
+             strarray_fini(&options);
+-            if (c == EOF) return EOF;
+         } else {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid List selection option \"%s\"\r\n",
+@@ -11948,7 +12031,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -12018,7 +12101,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+             args->ret |= LIST_RET_METADATA;
+             /* outputs the error for us */
+             c = parse_metadata_string_or_list(tag, &args->metaitems, NULL);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else {
+             prot_printf(imapd_out,
+@@ -12039,7 +12122,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+     return prot_getc(imapd_in);
+ 
+ bad:
+-    if (c != EOF) prot_ungetc(c, imapd_in);
++    eatline(imapd_in, c);
+     return EOF;
+ }
+ 
+@@ -13232,6 +13315,11 @@ static void cmd_urlfetch(char *tag)
+         else prot_ungetc(c, imapd_in);
+ 
+         c = getastring(imapd_in, imapd_out, &arg);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Urlfetch\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         (void)prot_putc(' ', imapd_out);
+         prot_printstring(imapd_out, arg.s);
+ 
+@@ -13464,6 +13552,11 @@ static void cmd_genurlauth(char *tag)
+         char *intname = NULL;
+ 
+         c = getastring(imapd_in, imapd_out, &arg1);
++        if (c == IMAP_LITERAL_TOO_LARGE) {
++            prot_printf(imapd_out, "%s NO %s in Genurlauth\r\n",
++                        tag, error_message(c));
++            return;
++        }
+         if (c != ' ') {
+             prot_printf(imapd_out,
+                         "%s BAD Missing required argument to Genurlauth\r\n",
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 5da6af1b8..17e0804ca 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -159,6 +159,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+                 fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+             }
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                /* Fail per RFC 7888, Section 4, choice 2 */
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++            }
+             isnowait++;
+             c = prot_getc(pin);
+         }
+@@ -181,6 +185,10 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+         }
+ 
+         if (!isnowait) {
++            if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
++                return IMAP_LITERAL_TOO_LARGE;
++            }
++
+             prot_printf(pout, "+ go ahead\r\n");
+             prot_flush(pout);
+         }
+@@ -628,6 +636,7 @@ EXPORTED int get_search_source_mboxes(struct protstream *pin,
+ 
+   bad:
+     buf_free(&extname);
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
+     if (c != EOF) prot_ungetc(c, pin);
+     return EOF;
+ }
+@@ -691,6 +700,7 @@ EXPORTED int get_search_source_opts(struct protstream *pin,
+ 
+     } while (c == ' ');
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
+     if (c != ')') {
+         prot_printf(pout,
+                     "%s BAD Missing close parenthesis in Search\r\n",
+@@ -818,7 +828,7 @@ static int get_search_annotation(struct protstream *pin,
+ 
+     /* parse the value */
+     c = getbnstring(pin, pout, &value);
+-    if (c == EOF)
++    if (c <= EOF)
+         goto bad;
+ 
+     sa = xzmalloc(sizeof(*sa));
+@@ -839,6 +849,7 @@ bad:
+     buf_free(&attrib);
+     buf_free(&value);
+ 
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
+     if (c != EOF) prot_ungetc(c, pin);
+     return EOF;
+ }
+@@ -971,7 +982,7 @@ static int get_search_criterion(struct protstream *pin,
+         do {
+             c = get_search_criterion(pin, pout, e, base);
+         } while (c == ' ');
+-        if (c == EOF) return EOF;
++        if (c <= EOF) return c;
+         if (c != ')') {
+             prot_printf(pout, "%s BAD Missing required close paren in Search command\r\n",
+                    base->tag);
+@@ -1022,7 +1033,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "annotation")) {   /* RFC 5257 */
+             struct searchannot *annot = NULL;
+             c = get_search_annotation(pin, pout, base, c, &annot);
+-            if (c == EOF)
++            if (c <= EOF)
+                 goto badcri;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("annotation");
+@@ -1043,23 +1054,15 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "bcc")) {      /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "body")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+-        else if (!strcmp(criteria.s, "fuzzy")) {
+-            if (c != ' ') goto missingarg;
+-            base->fuzzy_depth++;
+-            c = get_search_criterion(pin, pout, parent, base);
+-            base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
+-            break;
+-        }
+         else goto badcri;
+         break;
+ 
+@@ -1067,7 +1070,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "cc")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (hasconv && !strcmp(criteria.s, "convflag")) {  /* nonstandard */
+@@ -1130,7 +1133,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "deliveredto")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1140,7 +1143,7 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "emailid")) {   /* RFC 8474 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1153,7 +1156,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "folder")) {       /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find("folder");
+             e->value.s = mboxname_from_external(arg.s, base->namespace, base->userid);
+@@ -1161,7 +1164,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "from")) {         /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "fuzzy")) {        /* RFC 6203 */
+@@ -1169,7 +1172,7 @@ static int get_search_criterion(struct protstream *pin,
+             base->fuzzy_depth++;
+             c = get_search_criterion(pin, pout, parent, base);
+             base->fuzzy_depth--;
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else goto badcri;
+         break;
+@@ -1180,7 +1183,7 @@ static int get_search_criterion(struct protstream *pin,
+             c = getastring(pin, pout, &arg);
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg2);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+ 
+             e = search_expr_new(parent, SEOP_MATCH);
+             e->attr = search_attr_find_field(arg.s);
+@@ -1197,7 +1200,7 @@ static int get_search_criterion(struct protstream *pin,
+         if ((base->state & GETSEARCH_SOURCE) &&
+                  !strcmp(criteria.s, "in")) {           /* RFC 7377 */
+             c = get_search_source_opts(pin, pout, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+             keep_charset = 1;
+         }
+         else goto badcri;
+@@ -1252,7 +1255,7 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_NOT);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "new")) {  /* RFC 3501 */
+             e = search_expr_new(parent, SEOP_AND);
+@@ -1267,10 +1270,10 @@ static int get_search_criterion(struct protstream *pin,
+             if (c != ' ') goto missingarg;
+             e = search_expr_new(parent, SEOP_OR);
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+             if (c != ' ') goto missingarg;
+             c = get_search_criterion(pin, pout, e, base);
+-            if (c == EOF) return EOF;
++            if (c <= EOF) return c;
+         }
+         else if (!strcmp(criteria.s, "old")) {  /* RFC 3501 */
+             indexflag_match(parent, MESSAGE_RECENT, /*not*/1);
+@@ -1389,6 +1392,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spamabove")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_GE);
+             e->attr = search_attr_find("spamscore");
+@@ -1397,6 +1401,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "spambelow")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
++            if (c == IMAP_LITERAL_TOO_LARGE) return c;
+             if (c == EOF) goto badnumber;
+             e = search_expr_new(parent, SEOP_LT);
+             e->attr = search_attr_find("spamscore");
+@@ -1405,7 +1410,7 @@ static int get_search_criterion(struct protstream *pin,
+         else if (!strcmp(criteria.s, "subject")) {  /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1415,19 +1420,19 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "to")) {            /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "text")) {     /* RFC 3501 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, criteria.s, base);
+         }
+         else if (!strcmp(criteria.s, "threadid")) {   /* RFC 8474 */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             bytestring_match(parent, arg.s, criteria.s, base);
+         }
+         else goto badcri;
+@@ -1478,25 +1483,25 @@ static int get_search_criterion(struct protstream *pin,
+         if (!strcmp(criteria.s, "xattachmentname")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentname", base);
+         }
+         else if (!strcmp(criteria.s, "xattachmentbody")) {  /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "attachmentbody", base);
+         }
+         else if (!strcmp(criteria.s, "xlistid")) {           /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "listid", base);
+         }
+         else if (!strcmp(criteria.s, "xcontenttype")) { /* nonstandard */
+             if (c != ' ') goto missingarg;
+             c = getastring(pin, pout, &arg);
+-            if (c == EOF) goto missingarg;
++            if (c <= EOF) goto missingarg;
+             string_match(parent, arg.s, "contenttype", base);
+         }
+         else goto badcri;
+@@ -1527,6 +1532,8 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     default:
+     badcri:
++        if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+         prot_printf(pout, "%s BAD Invalid Search criteria\r\n", base->tag);
+         if (c != EOF) prot_ungetc(c, pin);
+         return EOF;
+@@ -1542,6 +1549,8 @@ static int get_search_criterion(struct protstream *pin,
+     return c;
+ 
+  missingarg:
++    if (c == IMAP_LITERAL_TOO_LARGE) return c;
++
+     prot_printf(pout, "%s BAD Missing required argument to Search %s\r\n",
+                 base->tag, criteria.s);
+     if (c != EOF) prot_ungetc(c, pin);
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 175604340..8810639b5 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1717,13 +1717,31 @@ Blank lines and lines beginning with ``#'' are ignored.
+ .PP
+    If no unit is specified, bytes is assumed. */
+ 
++{ "maxliteral", "128K", BYTESIZE, "UNRELEASED" }
++/* Maximum size of a single literal allowed by the IMAP parser.
++.PP
++   If set to 0, a large internally-defined limit will be applied.
++.PP
++   If no unit is specified, bytes is assumed.
++.PP
++   Literals used for message [part] data in APPEND are only limited by
++   the 'maxmessagesize' option.
++.PP
++   If the 'literalminus' option is enabled, non-synchonizing literals
++   will be limited to the lesser of 4K and either 'maxliteral' or
++   'maxmessagesize', depending on the use-case. */
++
+ { "maxquoted", "128K", BYTESIZE, "3.8.0" }
+-/* Maximum size of a single quoted string for the parser.
++/* Maximum size of a single quoted string allowed by the IMAP parser.
++.PP
++   If set to 0, a large internally-defined limit will be applied.
+ .PP
+    If no unit is specified, bytes is assumed. */
+ 
+ { "maxword", "128K", BYTESIZE, "3.8.0" }
+-/* Maximum size of a single word for the parser.
++/* Maximum size of a single word allowed by the IMAP parser.
++.PP
++   If set to 0, a large internally-defined limit will be applied.
+ .PP
+    If no unit is specified, bytes is assumed. */
+ 
+diff --git a/lib/libconfig.c b/lib/libconfig.c
+index df75c1b99..4582988df 100644
+--- a/lib/libconfig.c
++++ b/lib/libconfig.c
+@@ -86,6 +86,7 @@ EXPORTED int config_auditlog;
+ EXPORTED int config_iolog;
+ EXPORTED unsigned config_maxword;
+ EXPORTED unsigned config_maxquoted;
++EXPORTED unsigned config_maxliteral;
+ EXPORTED int config_qosmarking;
+ EXPORTED int config_debug;
+ 
+@@ -599,6 +600,7 @@ EXPORTED void config_reset(void)
+     config_defdomain = NULL;
+     config_auditlog = 0;
+     config_serverinfo = 0;
++    config_maxliteral = 0;
+     config_maxquoted = 0;
+     config_maxword = 0;
+     config_qosmarking = 0;
+@@ -808,6 +810,11 @@ EXPORTED void config_read(const char *alt_config, const int config_need_data)
+     tok_fini(&tok);
+ 
+     /* set some limits */
++    i64val = config_getbytesize(IMAPOPT_MAXLITERAL, 'B');
++    if (i64val <= 0 || i64val > BYTESIZE_UNLIMITED) {
++        i64val = BYTESIZE_UNLIMITED;
++    }
++    config_maxliteral = i64val;
+     i64val = config_getbytesize(IMAPOPT_MAXQUOTED, 'B');
+     if (i64val <= 0 || i64val > BYTESIZE_UNLIMITED) {
+         i64val = BYTESIZE_UNLIMITED;
+diff --git a/lib/libconfig.h b/lib/libconfig.h
+index 08de0845b..7796ba511 100644
+--- a/lib/libconfig.h
++++ b/lib/libconfig.h
+@@ -97,6 +97,7 @@ extern enum enum_value config_virtdomains;
+ extern enum enum_value config_mupdate_config;
+ extern int config_auditlog;
+ extern int config_iolog;
++extern unsigned config_maxliteral;
+ extern unsigned config_maxquoted;
+ extern unsigned config_maxword;
+ extern int config_qosmarking;
+-- 
+2.39.2
+
+
+From 5feff906c92200734da7cd654240bf45ab30d0a1 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:18:52 -0500
+Subject: [PATCH 11/16] prot.h: change bytes_in/out to uint64_t (for
+ long-running imapd)
+
+---
+ backup/lcb.c         |  4 ++--
+ backup/lcb_compact.c |  4 ++--
+ backup/lcb_verify.c  |  8 ++++----
+ imap/httpd.c         | 14 ++++++++------
+ imap/imapd.c         | 18 ++++++++++--------
+ imap/pop3d.c         | 18 ++++++++++--------
+ lib/prot.h           |  8 ++++----
+ 7 files changed, 40 insertions(+), 34 deletions(-)
+
+diff --git a/backup/lcb.c b/backup/lcb.c
+index 3f68b1aaa..e1eefab89 100644
+--- a/backup/lcb.c
++++ b/backup/lcb.c
+@@ -620,11 +620,11 @@ EXPORTED int backup_reindex(const char *name,
+                 const char *error = prot_error(member);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                            name, member_offset, prot_bytes_in(member), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 member_offset, prot_bytes_in(member), error);
+ 
+                     r = IMAP_IOERROR;
+diff --git a/backup/lcb_compact.c b/backup/lcb_compact.c
+index d398a06c0..b1616bd8f 100644
+--- a/backup/lcb_compact.c
++++ b/backup/lcb_compact.c
+@@ -528,11 +528,11 @@ EXPORTED int backup_compact(const char *name,
+                 const char *error = prot_error(in);
+                 if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                     syslog(LOG_ERR,
+-                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %i: %s",
++                           "IOERROR: %s: error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                            name, chunk->offset, prot_bytes_in(in), error);
+ 
+                     if (out)
+-                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %i: %s\n",
++                        fprintf(out, "error reading chunk at offset " OFF_T_FMT ", byte %" PRIu64 ": %s\n",
+                                 chunk->offset, prot_bytes_in(in), error);
+ 
+                     /* chunk is corrupt, discard the rest of it and get on with
+diff --git a/backup/lcb_verify.c b/backup/lcb_verify.c
+index ff2758552..347b9d37d 100644
+--- a/backup/lcb_verify.c
++++ b/backup/lcb_verify.c
+@@ -234,10 +234,10 @@ static int _verify_message_cb(const struct backup_message *message, void *rock)
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, message->id, message->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading message %i at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             message->id, message->offset, prot_bytes_in(ps), error);
+             }
+             prot_free(ps);
+@@ -540,10 +540,10 @@ static int verify_chunk_mailbox_links(struct backup *backup, struct backup_chunk
+             const char *error = prot_error(ps);
+             if (error && 0 != strcmp(error, PROT_EOF_STRING)) {
+                 syslog(LOG_ERR,
+-                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                       "%s: error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                        __func__, chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 if (out)
+-                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %i: %s",
++                    fprintf(out, "error reading chunk %i data at offset " OFF_T_FMT ", byte %" PRIu64 ": %s",
+                             chunk->id, chunk->offset, prot_bytes_in(ps), error);
+                 r = EOF;
+             }
+diff --git a/imap/httpd.c b/imap/httpd.c
+index f5aae429f..ef9c314e9 100644
+--- a/imap/httpd.c
++++ b/imap/httpd.c
+@@ -680,8 +680,8 @@ EXPORTED int http1_resp_body_chunk(struct transaction_t *txn,
+ static void httpd_reset(struct http_connection *conn)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     /* run any delayed actions */
+     libcyrus_run_delayed();
+@@ -723,7 +723,8 @@ static void httpd_reset(struct http_connection *conn)
+ 
+     if (config_auditlog) {
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+     }
+ 
+@@ -1105,8 +1106,8 @@ void usage(void)
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1175,7 +1176,8 @@ void shut_down(int code)
+ 
+     if (config_auditlog)
+         syslog(LOG_NOTICE,
+-               "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
++               "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
+                session_id(), bytes_in, bytes_out);
+ 
+     saslprops_free(&saslprops);
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 000b9416d..5e28e17fc 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -734,8 +734,8 @@ static int mlookup(const char *tag, const char *ext_name,
+ static void imapd_reset(void)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     /* run delayed commands first before closing anything */
+     libcyrus_run_delayed();
+@@ -783,8 +783,9 @@ static void imapd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     imapd_in = imapd_out = NULL;
+ 
+@@ -1078,8 +1079,8 @@ void shut_down(int code) __attribute__((noreturn));
+ void shut_down(int code)
+ {
+     int i;
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -1146,8 +1147,9 @@ void shut_down(int code)
+                               : CYRUS_IMAP_SHUTDOWN_TOTAL_STATUS_OK);
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     if (protin) protgroup_free(protin);
+ 
+diff --git a/imap/pop3d.c b/imap/pop3d.c
+index ee5a6fad8..3db7e2315 100644
+--- a/imap/pop3d.c
++++ b/imap/pop3d.c
+@@ -325,8 +325,8 @@ static struct sasl_callback mysasl_cb[] = {
+ 
+ static void popd_reset(void)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     proc_cleanup();
+ 
+@@ -361,8 +361,9 @@ static void popd_reset(void)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+     popd_in = popd_out = NULL;
+ 
+@@ -598,8 +599,8 @@ static void usage(void)
+  */
+ void shut_down(int code)
+ {
+-    int bytes_in = 0;
+-    int bytes_out = 0;
++    uint64_t bytes_in = 0;
++    uint64_t bytes_out = 0;
+ 
+     in_shutdown = 1;
+ 
+@@ -646,8 +647,9 @@ void shut_down(int code)
+     }
+ 
+     if (config_auditlog)
+-        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s> bytes_in=<%d> bytes_out=<%d>",
+-                           session_id(), bytes_in, bytes_out);
++        syslog(LOG_NOTICE, "auditlog: traffic sessionid=<%s>"
++               " bytes_in=<%" PRIu64 "> bytes_out=<%" PRIu64 ">",
++               session_id(), bytes_in, bytes_out);
+ 
+ #ifdef HAVE_SSL
+     tls_shutdown_serverengine();
+diff --git a/lib/prot.h b/lib/prot.h
+index 89b0b0a2a..94b22fad8 100644
+--- a/lib/prot.h
++++ b/lib/prot.h
+@@ -131,8 +131,8 @@ struct protstream {
+     struct buf *writetobuf;
+ 
+     int can_unget;
+-    int bytes_in;
+-    int bytes_out;
++    uint64_t bytes_in;
++    uint64_t bytes_out;
+     int isclient; /* read/write IMAP LITERAL+ */
+ 
+     /* Events */
+@@ -224,8 +224,8 @@ extern int prot_free(struct protstream *s);
+ extern int prot_setlog(struct protstream *s, int fd);
+ 
+ /* Get traffic counts */
+-extern int prot_bytes_in(struct protstream *s);
+-extern int prot_bytes_out(struct protstream *s);
++extern uint64_t prot_bytes_in(struct protstream *s);
++extern uint64_t prot_bytes_out(struct protstream *s);
+ #define prot_bytes_in(s) ((s)->bytes_in)
+ #define prot_bytes_out(s) ((s)->bytes_out)
+ 
+-- 
+2.39.2
+
+
+From ed73edb806a442133eaf439ac1844c95ba450752 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Wed, 21 Feb 2024 11:35:44 -0500
+Subject: [PATCH 12/16] imapd.c: rename 'maxsize' to 'maxmsgsize'
+
+---
+ imap/imapd.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/imap/imapd.c b/imap/imapd.c
+index 5e28e17fc..b883fcfd7 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -135,7 +135,7 @@ static int imaps = 0;
+ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+-static int64_t maxsize = 0;
++static int64_t maxmsgsize = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -904,8 +904,8 @@ int service_init(int argc, char **argv, char **envp)
+ 
+     prometheus_increment(CYRUS_IMAP_READY_LISTENERS);
+ 
+-    maxsize = config_getbytesize(IMAPOPT_MAXMESSAGESIZE, 'B');
+-    if (maxsize <= 0) maxsize = BYTESIZE_UNLIMITED;
++    maxmsgsize = config_getbytesize(IMAPOPT_MAXMESSAGESIZE, 'B');
++    if (maxmsgsize <= 0) maxmsgsize = BYTESIZE_UNLIMITED;
+ 
+     return 0;
+ }
+@@ -3505,7 +3505,7 @@ static void capa_response(int flags)
+         prot_printf(imapd_out, " IDLE");
+     }
+ 
+-    prot_printf(imapd_out, " APPENDLIMIT=%" PRIi64, maxsize);
++    prot_printf(imapd_out, " APPENDLIMIT=%" PRIi64, maxmsgsize);
+ }
+ 
+ /*
+@@ -4025,13 +4025,13 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxsize, &size,
++            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From 4a321af3d3babe22853cd0421bff12cfe264f4cd Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Fri, 23 Feb 2024 15:08:42 -0500
+Subject: [PATCH 13/16] imapd.c: limit the total size of IMAP command arguments
+
+Only concerned with commands that can have an unlimited
+number of arguments.
+---
+ changes/next/imap_literal_limits |  7 ++-
+ imap/imap_err.et                 |  3 +
+ imap/imapd.c                     | 97 +++++++++++++++++++++++++++++---
+ imap/imapd.h                     |  1 +
+ imap/imapparse.c                 | 10 ++++
+ lib/imapoptions                  |  9 +++
+ 6 files changed, 116 insertions(+), 11 deletions(-)
+
+diff --git a/changes/next/imap_literal_limits b/changes/next/imap_literal_limits
+index c7fc35bbc..f1ea34a0b 100644
+--- a/changes/next/imap_literal_limits
++++ b/changes/next/imap_literal_limits
+@@ -1,12 +1,13 @@
+ Description:
+ 
+-Adds a config option to limit the size of a single literal allowed
+-by the IMAP parser.  Also properly applies LITERAL- to IMAP APPEND.
++Adds config options to limit the size of a single literal allowed
++by the IMAP parser and to limit the total size of IMAP command arguments.
++Also properly applies LITERAL- to IMAP APPEND.
+ 
+ 
+ Config changes:
+ 
+-New 'maxliteral' option.
++New 'maxliteral' and 'maxargssize' options.
+ 
+ 
+ Upgrade instructions:
+diff --git a/imap/imap_err.et b/imap/imap_err.et
+index 5768f49d1..d1391199d 100644
+--- a/imap/imap_err.et
++++ b/imap/imap_err.et
+@@ -69,6 +69,9 @@ ec IMAP_MESSAGE_TOO_LARGE,
+ ec IMAP_MESSAGE_TOOBIG,
+    "[TOOBIG] Message size exceeds fixed limit"
+ 
++ec IMAP_ARGS_TOO_LARGE,
++   "[TOOBIG] Command arguments total size exceeds fixed limit"
++
+ ec IMAP_LITERAL_TOO_LARGE,
+    "[TOOBIG] Literal size exceeds fixed limit"
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index b883fcfd7..fb5dace4a 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -136,6 +136,8 @@ static sasl_ssf_t extprops_ssf = 0;
+ static int nosaslpasswdcheck = 0;
+ static int apns_enabled = 0;
+ static int64_t maxmsgsize = 0;
++static int64_t maxargssize = 0;
++static uint64_t maxargssize_mark = 0;
+ 
+ /* PROXY STUFF */
+ /* we want a list of our outgoing connections here and which one we're
+@@ -907,6 +909,9 @@ int service_init(int argc, char **argv, char **envp)
+     maxmsgsize = config_getbytesize(IMAPOPT_MAXMESSAGESIZE, 'B');
+     if (maxmsgsize <= 0) maxmsgsize = BYTESIZE_UNLIMITED;
+ 
++    maxargssize = config_getbytesize(IMAPOPT_MAXARGSSIZE, 'B');
++    if (maxargssize <= 0) maxargssize = BYTESIZE_UNLIMITED;
++
+     return 0;
+ }
+ 
+@@ -1356,6 +1361,9 @@ static void cmdloop(void)
+            allowed when not logged in */
+         if (!imapd_userid && !strchr("AELNCIS", cmd.s[0])) goto nologin;
+ 
++        /* Set limit on the total number of bytes allowed for arguments */
++        maxargssize_mark = prot_bytes_in(imapd_in) + maxargssize;
++
+         /* Start command timer */
+         cmdtime_starttimer();
+ 
+@@ -3942,6 +3950,9 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+         curstage = xzmalloc(sizeof(*curstage));
+         ptrarray_push(&stages, curstage);
+ 
++        /* Set limit on the total number of bytes allowed for mailbox+append-opts */
++        maxargssize_mark = prot_bytes_in(imapd_in) + (maxargssize - strlen(name));
++
+         /* now parsing "append-opts" in the ABNF */
+ 
+         /* Parse flags */
+@@ -3950,6 +3961,8 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             strarray_init(&curstage->flags);
+             do {
+                 c = getword(imapd_in, &arg);
++                if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4057,15 +4070,23 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+     }
+ 
+  done:
+-    if (r) {
+-        eatline(imapd_in, c);
+-    } else {
++    switch (r) {
++    case IMAP_ZERO_LENGTH_LITERAL:
++    case IMAP_MESSAGE_TOO_LARGE:
++        break;
++
++    case 0:
+         /* we should be looking at the end of the line */
+-        if (!IS_EOL(c, imapd_in)) {
+-            parseerr = "junk after literal";
+-            r = IMAP_PROTOCOL_ERROR;
+-            eatline(imapd_in, c);
+-        }
++        if (IS_EOL(c, imapd_in)) break;
++
++        parseerr = "junk after literal";
++        r = IMAP_PROTOCOL_ERROR;
++
++        GCC_FALLTHROUGH
++
++    default:
++        eatline(imapd_in, c);
++        break;
+     }
+ 
+     /* Append from the stage(s) */
+@@ -4281,6 +4302,9 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         c = getword(imapd_in, &arg);
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+                 client_capa |= CAPA_CONDSTORE;
+@@ -4653,6 +4677,9 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+         c = getword(imapd_in, &fetchatt);
+     }
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+         case 'A':
+@@ -4783,6 +4810,8 @@ badannotation:
+                     }
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
++                        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5117,6 +5146,9 @@ badannotation:
+         }
+         do {
+             c = getword(imapd_in, &fetchatt);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5463,6 +5495,9 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+         do {
+             c = getword(imapd_in, &storemod);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+                 if (c != ' ') {
+@@ -5555,6 +5590,8 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+ 
+     for (;;) {
+         c = getword(imapd_in, &flagname);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -5750,6 +5787,8 @@ static void cmd_search(char *tag, char *cmd)
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
+ 
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     /* Set FUZZY search according to config and quirks */
+     static const char *annot = IMAP_ANNOT_NS "search-fuzzy-always";
+     char *inbox = mboxname_user_mbox(imapd_userid, NULL);
+@@ -5961,6 +6000,9 @@ static void cmd_sort(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     if (imapd_id.quirks & QUIRK_SEARCHFUZZY)
+         searchargs->fuzzy_depth++;
+ 
+@@ -6077,6 +6119,9 @@ static void cmd_thread(char *tag, int usinguid)
+     searchargs = new_searchargs(tag, GETSEARCH_CHARSET_FIRST,
+                                 &imapd_namespace, imapd_userid, imapd_authstate,
+                                 imapd_userisadmin || imapd_userisproxyadmin);
++
++    searchargs->maxargssize_mark = maxargssize_mark;
++
+     c = get_search_program(imapd_in, imapd_out, searchargs);
+     if (c == EOF) {
+         eatline(imapd_in, ' ');
+@@ -7710,6 +7755,8 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         listargs->cmd = LIST_CMD_EXTENDED;
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8559,6 +8606,9 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         newquotas[res] = limit;
+         if (c == ')') break;
+         else if (c != ' ') goto badlist;
++
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8711,6 +8761,9 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     c = getword(imapd_in, &arg);
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+             statusitems |= STATUS_MESSAGES;
+@@ -9094,6 +9147,9 @@ static int parsecreateargs(struct dlist **extargs)
+         /* new style RFC 4466 arguments */
+         do {
+             c = getword(imapd_in, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+             c = prot_getc(imapd_in);
+@@ -9102,6 +9158,9 @@ static int parsecreateargs(struct dlist **extargs)
+                 sub = dlist_newlist(res, name);
+                 do {
+                     c = getword(imapd_in, &val);
++                    if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+                 if (c != ')') goto fail;
+@@ -9170,6 +9229,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9221,6 +9282,8 @@ static int parse_annotate_fetch_data(const char *tag,
+                 c = getastring(imapd_in, imapd_out, &arg);
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9299,6 +9362,8 @@ static int parse_metadata_string_or_list(const char *tag,
+         /* entry list */
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9403,6 +9468,8 @@ static int parse_annotate_store_data(const char *tag,
+             c = getastring(imapd_in, imapd_out, &entry);
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9445,6 +9512,9 @@ static int parse_annotate_store_data(const char *tag,
+                 goto baddata;
+             }
+ 
++            if (prot_bytes_in(imapd_in) > maxargssize_mark)
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+ 
+@@ -9520,6 +9590,8 @@ static int parse_metadata_store_data(const char *tag,
+     do {
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9533,6 +9605,8 @@ static int parse_metadata_store_data(const char *tag,
+ 
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11821,6 +11895,9 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     nsort = 0;
+     n = 0;
+     for (;;) {
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+             nsort += SORTGROWSIZE;
+@@ -11970,6 +12047,8 @@ static int getlistselopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -12074,6 +12153,8 @@ static int getlistretopts(char *tag, struct listargs *args)
+     for (;;) {
+         c = getword(imapd_in, &buf);
+ 
++        if (prot_bytes_in(imapd_in) > maxargssize_mark)
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapd.h b/imap/imapd.h
+index dd1559a95..d8fe76016 100644
+--- a/imap/imapd.h
++++ b/imap/imapd.h
+@@ -234,6 +234,7 @@ struct searchargs {
+     int state;
+     /* used only during parsing */
+     int fuzzy_depth;
++    uint64_t maxargssize_mark;
+ 
+     /* For ESEARCH & XCONVMULTISORT */
+     const char *tag;
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 17e0804ca..2dceaed94 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -764,6 +764,11 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+             goto bad;
+         }
+ 
++        if (searchargs->maxargssize_mark &&
++            prot_bytes_in(pin) > searchargs->maxargssize_mark) {
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        }
++
+     } while (c == ' ');
+ 
+     if (!(searchargs->returnopts & ~(SEARCH_RETURN_SAVE|SEARCH_RETURN_RELEVANCY))) {
+@@ -1539,6 +1544,11 @@ static int get_search_criterion(struct protstream *pin,
+         return EOF;
+     }
+ 
++    if (base->maxargssize_mark &&
++        prot_bytes_in(pin) > base->maxargssize_mark) {
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++    }
++
+     if (!keep_charset)
+         base->state &= ~GETSEARCH_CHARSET_KEYWORD;
+     if (base->state & GETSEARCH_SOURCE)
+diff --git a/lib/imapoptions b/lib/imapoptions
+index 8810639b5..731962510 100644
+--- a/lib/imapoptions
++++ b/lib/imapoptions
+@@ -1708,6 +1708,15 @@ Blank lines and lines beginning with ``#'' are ignored.
+ /* Maximum number of logged in sessions allowed per user,
+    zero means no limit */
+ 
++{ "maxargssize", "0", BYTESIZE, "UNRELEASED" }
++/* Maximum total size of arguments to an IMAP command that will be
++   accepted by Cyrus.
++   Commands with arguments that exceed this limit will be rejected. 
++.PP
++   If set to 0 (the default), a large internally-defined limit will be applied.
++.PP
++   If no unit is specified, bytes is assumed. */
++
+ { "maxmessagesize", "0", BYTESIZE, "3.8.0" }
+ /* Maximum size of messages that will be accepted by Cyrus.  This affects LMTP
+    deliveries, IMAP appends, DAV uploads, etc.  Messages larger than this will
+-- 
+2.39.2
+
+
+From 57bf6856838765020f74d4c649c002f7525fccb5 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Tue, 12 Mar 2024 23:16:30 -0400
+Subject: [PATCH 14/16] Add IMAPLimits.pm
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 529 ++++++++++++++++++++++
+ cassandane/Cassandane/IMAPMessageStore.pm |   8 +-
+ 2 files changed, 534 insertions(+), 3 deletions(-)
+ create mode 100644 cassandane/Cassandane/Cyrus/IMAPLimits.pm
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+new file mode 100644
+index 000000000..9576d1d88
+--- /dev/null
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -0,0 +1,529 @@
++#!/usr/bin/perl
++#
++#  Copyright (c) 2011-2023 FastMail Pty Ltd. All rights reserved.
++#
++#  Redistribution and use in source and binary forms, with or without
++#  modification, are permitted provided that the following conditions
++#  are met:
++#
++#  1. Redistributions of source code must retain the above copyright
++#     notice, this list of conditions and the following disclaimer.
++#
++#  2. Redistributions in binary form must reproduce the above copyright
++#     notice, this list of conditions and the following disclaimer in
++#     the documentation and/or other materials provided with the
++#     distribution.
++#
++#  3. The name "Fastmail Pty Ltd" must not be used to
++#     endorse or promote products derived from this software without
++#     prior written permission. For permission or any legal
++#     details, please contact
++#      FastMail Pty Ltd
++#      PO Box 234
++#      Collins St West 8007
++#      Victoria
++#      Australia
++#
++#  4. Redistributions of any form whatsoever must retain the following
++#     acknowledgment:
++#     "This product includes software developed by Fastmail Pty. Ltd."
++#
++#  FASTMAIL PTY LTD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY  AND FITNESS, IN NO
++#  EVENT SHALL OPERA SOFTWARE AUSTRALIA BE LIABLE FOR ANY SPECIAL, INDIRECT
++#  OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
++#  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
++#  OF THIS SOFTWARE.
++#
++
++package Cassandane::Cyrus::IMAPLimits;
++use strict;
++use warnings;
++use Mail::JMAPTalk 0.13;
++use Data::Dumper;
++
++use lib '.';
++use base qw(Cassandane::Cyrus::TestCase);
++use Cassandane::Util::Log;
++
++my $email = <<EOF;
++Subject: foo
++Date: bar
++From: <foobar\@example.com>
++
++Body
++EOF
++
++$email =~ s/\r?\n/\r\n/gs;
++
++my $toobig_email = $email . "X" x 100;
++
++sub assert_bye_toobig
++{
++    my ($self, $store) = @_;
++
++    $store = $self->{store} if (!defined $store);
++
++    # We want to override Mail::IMAPTalk's builtin handling of the BYE
++    # untagged response, as it will 'die' immediately without parsing
++    # the remainder of the line and especially without picking out the
++    # [TOOBIG] response code that we want to see.
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        bye => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    # Check that we got a BYE [TOOBIG] response
++    $store->idle_response($handlers, 1);
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub assert_cmd_bye_toobig
++{
++    my $self = shift;
++    my $cmd = shift;
++
++    my $talk = $self->{store}->get_client();
++    $talk->enable('qresync'); # IMAPTalk requires lower-case
++    $talk->select('INBOX');
++
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_bye_toobig();
++}
++
++sub assert_cmd_no_toobig
++{
++    my $self = shift;
++    my $talk = shift;
++    my $cmd = shift;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            # Pick out the [TOOBIG] response code
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    $talk->_imap_cmd($cmd, 0, $handlers, @_);
++
++    # Check that we got a NO [TOOBIG] response
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++sub new
++{
++    my $class = shift;
++
++    my $config = Cassandane::Config->default()->clone();
++    $config->set(maxword => 25);
++    $config->set(maxquoted => 25);
++    $config->set(maxliteral => 25);
++    $config->set(literalminus => 1);
++    $config->set(maxargssize => 45);
++    $config->set(maxmessagesize => 100);
++    $config->set(event_groups => "message mailbox applepushservice");
++    $config->set(aps_topic => "mail");
++
++    return $class->SUPER::new({
++        adminstore => 1,
++        config => $config,
++        services => ['imap'],
++    }, @_);
++}
++
++sub set_up
++{
++    my ($self) = @_;
++    $self->SUPER::set_up();
++}
++
++sub tear_down
++{
++    my ($self) = @_;
++    $self->SUPER::tear_down();
++}
++
++sub test_maxword
++{
++    my ($self) = @_;
++
++    # Oversized command name
++    $self->assert_cmd_bye_toobig("X" x 26);
++}
++
++sub test_maxword_astring
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', "X" x 26);
++}
++
++sub test_maxquoted
++{
++    my ($self) = @_;
++
++    # Oversized mailbox name
++    $self->assert_cmd_bye_toobig('SELECT', { Quote => "X" x 26 });
++}
++
++sub test_maxliteral_nosync
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " SELECT {26+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_maxliteral_sync
++{
++    my ($self) = @_;
++
++    # Unlike oversized non-sync literals which fatal() in one central location,
++    # oversized sync literals fail with a NO response in multiple places,
++    # so we test as many of those places as possible.
++    # Having said that, arguments parsed in cmdloop() or in get_search_criterion()
++    # are mostly handled centrally.
++
++    # Authenticated State
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'SELECT',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Literal => "X" x 26 } ]);
++
++    $self->assert_cmd_no_toobig($talk, 'ID',
++                                [ { Quote => 'foo' }, { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LIST',
++                                { Quote => '' }, { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'LISTRIGHTS',
++                                'INBOX', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'SETACL',
++                                'INBOX', 'anyone', { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'GETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SETMETADATA',
++                                'INBOX', [ '/comment', { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                { Literal => "X" x 26 });
++
++    $self->assert_cmd_no_toobig($talk, 'XAPPLEPUSHSERVICE',
++                                'FOO', { Literal => "X" x 26 });
++
++    # Selected State
++    $talk->select('INBOX');
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'ANNOTATION',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'BODY[HEADER.FIELDS',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'FETCH',
++                                '1', [ 'RFC822.HEADER.LINES',
++                                       [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION', [ { Literal => "X" x 26 } ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'STORE',
++                                '1', 'ANNOTATION',
++                                [ { Quote => '/comment' },
++                                  [ { Quote => 'value' },
++                                    { Literal => "X" x 26 } ] ] );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'HEADER', 'SUBJECT', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'SEARCH',
++                                'ANNOTATION', '/comment',
++                                'value', { Literal => "X" x 26 } );
++
++    $self->assert_cmd_no_toobig($talk, 'ESEARCH',
++                                'IN', [ 'MAILBOXES', { Literal => "X" x 26 } ] );
++}
++
++sub test_maxargssize_append_flags
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 [ "X" x 25, "X" x 25 ], { Literal => $email } );
++}
++
++sub test_maxargssize_append_annot
++{
++    my ($self) = @_;
++
++    # Use MULTIAPPEND, fail the second
++    $self->assert_cmd_bye_toobig('APPEND', 'INBOX',
++                                 { Literal => $email },
++                                 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ],
++                                 { Literal => $email } );
++}
++
++sub test_maxargssize_create
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE', "X" x 25, [ "X" x 25 ] );
++}
++
++sub test_maxargssize_create_ext
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('CREATE',
++                                 "X" x 5, [ "X" x 5, [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_fetch
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY', 'ENVELOPE', 'FLAGS',
++                                   'INTERNALDATE', 'RFC822.SIZE' ]);
++}
++
++sub test_maxargssize_fetch_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ [ "X" x 25, "X" x 25 ] ], "X" x 5 ] );
++}
++
++sub test_maxargssize_fetch_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'ANNOTATION',
++                                   [ "X" x 5, [ "X" x 25, "X" x 25 ] ] ] );
++}
++
++sub test_maxargssize_fetch_headers
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('FETCH', '1',
++                                 [ 'BODY[HEADER.FIELDS', [ "X" x 25, "X" x 25 ] ] );
++}
++
++sub test_maxargssize_getmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('GETMETADATA', 'INBOX', [ "X" x 25, "X" x 25 ] );
++}
++
++sub test_maxargssize_list_multi
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST', { Quote => '' }, [ "X" x 25, "X" x 25 ]);
++}
++
++sub test_maxargssize_list_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 [ 'SUBSCRIBED', 'REMOTE',
++                                   'RECURSIVEMATCH', 'SPECIAL-USE' ],
++                                 { Quote => '' }, '*');
++}
++
++sub test_maxargssize_list_return
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('LIST',
++                                 { Quote => '' }, '*', 'RETURN',
++                                 [ 'SUBSCRIBED', 'CHILDREN',
++                                   'MYRIGHTS', 'SPECIAL-USE' ] );
++}
++
++sub test_maxargssize_search
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SEARCH',
++                                 'TEXT', "X" x 25, 'TEXT', { Quote => "X" x 25 } );
++}
++
++sub test_maxargssize_multisearch
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('ESEARCH',
++                                 'IN', [ 'MAILBOXES', [ "X" x 25, "X" x 25 ] ]);
++}
++
++sub test_maxargssize_select
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SELECT', 'INBOX',
++                                 [ 'QRESYNC', [ '1234567890', '1234567890' ],
++                                   'ANNOTATE' ] );
++}
++
++sub test_maxargssize_setmetadata
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ "X" x 25, { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setmetadata2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SETMETADATA', 'INBOX',
++                                 [ '/shared', { Quote => "X" x 25 },
++                                   '/shared', { Quote => "X" x 25 } ] );
++}
++
++sub test_maxargssize_setquota
++{
++    my ($self) = @_;
++
++    my $store = $self->{adminstore};
++    my $talk = $store->get_client();
++
++    $talk->_send_cmd('SETQUOTA', 'user.cassandane',
++                     [ 'STORAGE', '1234567890',
++                       'MESSAGE', '1234567890',
++                       'MAILBOX', '1234567890' ] );
++    $self->assert_bye_toobig($store);
++}
++
++sub test_maxargssize_sort
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('SORT',
++                                 [ 'ARRIVAL', 'CC', 'DATE',
++                                   'FROM', 'REVERSE', 'SIZE', 'TO' ],
++                                 'UTF-8', 'ALL');
++}
++
++sub test_maxargssize_status
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STATUS', 'INBOX',
++                                 [ 'MESSAGES', 'UIDNEXT',
++                                   'UIDVALIDITY', 'UNSEEN', 'SIZE' ] );
++}
++
++sub test_maxargssize_store_annot
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 25, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_maxargssize_store_annot2
++{
++    my ($self) = @_;
++
++    $self->assert_cmd_bye_toobig('STORE', '1', 'ANNOTATION',
++                                 [ "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ],
++                                   "X" x 5, [ 'VALUE', { Quote => "X" x 25 } ] ] );
++}
++
++sub test_append_zero
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_cmd('APPEND', 0, '', 'INBOX', { Literal => '' } );
++    $self->assert_str_equals('no', $talk->get_last_completion_response());
++}
++
++sub test_maxmessagesize_sync_literal
++{
++    my ($self) = @_;
++
++    # Synchronizing literals are the default in IMAPTalk v4.05 (and earlier)
++    my $talk = $self->{store}->get_client(NoLiteralPlus => 1);
++
++    $self->assert_cmd_no_toobig($talk, 'APPEND',
++                                'INBOX', { Literal => $toobig_email } );
++}
++
++sub test_maxmessagesize_nosync_literal
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    # Do this by brute force until we have IMAPTalk v4.06+
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++sub test_literal_minus
++{
++    my ($self) = @_;
++
++    my $talk = $self->{store}->get_client();
++    $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_bye_toobig();
++}
++
++1;
+diff --git a/cassandane/Cassandane/IMAPMessageStore.pm b/cassandane/Cassandane/IMAPMessageStore.pm
+index 338d1c5f3..959a9fabc 100644
+--- a/cassandane/Cassandane/IMAPMessageStore.pm
++++ b/cassandane/Cassandane/IMAPMessageStore.pm
+@@ -83,7 +83,7 @@ sub new
+ 
+ sub connect
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+     # if already successfully connected, do nothing
+     return
+@@ -115,6 +115,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to '$self->{host}:$self->{port}': $@";
+     }
+@@ -129,6 +130,7 @@ sub connect
+                       Pedantic => 1,
+                       PreserveINBOX => 1,
+                       Uid => 0,
++                      NoLiteralPlus => delete $params{NoLiteralPlus} || 0,
+                   )
+             or die "Cannot connect to server: $@";
+     }
+@@ -323,9 +325,9 @@ sub remove
+ 
+ sub get_client
+ {
+-    my ($self) = @_;
++    my ($self, %params) = @_;
+ 
+-    $self->connect();
++    $self->connect(%params);
+     return $self->{client};
+ }
+ 
+-- 
+2.39.2
+
+
+From 9536206ea6750fe50bd974f65129b18b2a32ec6e Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:49:46 -0400
+Subject: [PATCH 15/16] imapd.c: also emit a NO [TOOBIG] response for oversized
+ no-sync APPEND
+
+---
+ cassandane/Cassandane/Cyrus/IMAPLimits.pm | 46 ++++++++++++++---------
+ imap/imapd.c                              | 23 ++++++++----
+ 2 files changed, 44 insertions(+), 25 deletions(-)
+
+diff --git a/cassandane/Cassandane/Cyrus/IMAPLimits.pm b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+index 9576d1d88..32d069653 100644
+--- a/cassandane/Cassandane/Cyrus/IMAPLimits.pm
++++ b/cassandane/Cassandane/Cyrus/IMAPLimits.pm
+@@ -59,6 +59,7 @@ $email =~ s/\r?\n/\r\n/gs;
+ 
+ my $toobig_email = $email . "X" x 100;
+ 
++# Check that we got an untagged BYE [TOOBIG] response
+ sub assert_bye_toobig
+ {
+     my ($self, $store) = @_;
+@@ -79,11 +80,11 @@ sub assert_bye_toobig
+         }
+     };
+ 
+-    # Check that we got a BYE [TOOBIG] response
+     $store->idle_response($handlers, 1);
+     $self->assert_num_equals(1, $got_toobig);
+ }
+ 
++# Send a command and expect an untagged BYE [TOOBIG] response
+ sub assert_cmd_bye_toobig
+ {
+     my $self = shift;
+@@ -97,28 +98,37 @@ sub assert_cmd_bye_toobig
+     $self->assert_bye_toobig();
+ }
+ 
++# Check that we got a tagged NO [TOOBIG] response
++sub assert_no_toobig
++{
++    my ($self, $talk) = @_;
++
++    my $got_toobig = 0;
++    my $handlers =
++    {
++        'no' => sub
++        {
++            my (undef, $resp) = @_;
++            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
++        }
++    };
++
++    eval {
++        $talk->_parse_response($handlers);
++    };
++
++    $self->assert_num_equals(1, $got_toobig);
++}
++
++# Send a command and expect a tagged NO [TOOBIG] response
+ sub assert_cmd_no_toobig
+ {
+     my $self = shift;
+     my $talk = shift;
+     my $cmd = shift;
+ 
+-    my $got_toobig = 0;
+-    my $handlers =
+-    {
+-        'no' => sub
+-        {
+-            # Pick out the [TOOBIG] response code
+-            my (undef, $resp) = @_;
+-            $got_toobig = 1 if (uc($resp->[0]) eq '[TOOBIG]');
+-        }
+-    };
+-
+-    $talk->_imap_cmd($cmd, 0, $handlers, @_);
+-
+-    # Check that we got a NO [TOOBIG] response
+-    $self->assert_str_equals('no', $talk->get_last_completion_response());
+-    $self->assert_num_equals(1, $got_toobig);
++    $talk->_send_cmd($cmd, @_);
++    $self->assert_no_toobig($talk);
+ }
+ 
+ sub new
+@@ -514,6 +524,7 @@ sub test_maxmessagesize_nosync_literal
+     my $talk = $self->{store}->get_client();
+     # Do this by brute force until we have IMAPTalk v4.06+
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {101+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+@@ -523,6 +534,7 @@ sub test_literal_minus
+ 
+     my $talk = $self->{store}->get_client();
+     $talk->_imap_socket_out($talk->{CmdId}++ . " APPEND INBOX {4097+}\015\012");
++    $self->assert_no_toobig($talk);
+     $self->assert_bye_toobig();
+ }
+ 
+diff --git a/imap/imapd.c b/imap/imapd.c
+index fb5dace4a..afd58bd66 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3557,7 +3557,7 @@ static int isokflag(char *s, int *isseen)
+     }
+ }
+ 
+-static int getliteralsize(const char *p, int c, size_t maxsize,
++static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+                           unsigned *size, int *binary, const char **parseerr)
+ 
+ {
+@@ -3589,10 +3589,14 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+         /* LITERAL- says maximum size is 4096! */
+         if (lminus && num > 4096) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+             fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
++            prot_printf(imapd_out, "%s NO %s\r\n", tag,
++                        error_message(IMAP_MESSAGE_TOOBIG));
+             fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
+         }
+         isnowait++;
+@@ -3622,8 +3626,8 @@ static int getliteralsize(const char *p, int c, size_t maxsize,
+     return 0;
+ }
+ 
+-static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *binary,
+-                         const char **parseerr)
++static int catenate_text(const char *tag, FILE *f, size_t maxsize,
++                         unsigned *totalsize, int *binary, const char **parseerr)
+ {
+     int c;
+     static struct buf arg;
+@@ -3635,7 +3639,8 @@ static int catenate_text(FILE *f, size_t maxsize, unsigned *totalsize, int *bina
+     c = getword(imapd_in, &arg);
+ 
+     /* Read size from literal */
+-    r = getliteralsize(arg.s, c, maxsize - *totalsize, &size, binary, parseerr);
++    r = getliteralsize(tag, arg.s, c, maxsize - *totalsize,
++                       &size, binary, parseerr);
+     if (r) return r;
+ 
+     /* Catenate message part to stage */
+@@ -3782,7 +3787,8 @@ static int catenate_url(const char *s, const char *cur_name, FILE *f,
+     return r;
+ }
+ 
+-static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsigned *totalsize,
++static int append_catenate(const char *tag, FILE *f, const char *cur_name,
++                           size_t maxsize, unsigned *totalsize,
+                            int *binary, const char **parseerr, const char **url)
+ {
+     int c, r = 0;
+@@ -3796,7 +3802,7 @@ static int append_catenate(FILE *f, const char *cur_name, size_t maxsize, unsign
+         }
+ 
+         if (!strcasecmp(arg.s, "TEXT")) {
+-            int r1 = catenate_text(f, maxsize, totalsize, binary, parseerr);
++            int r1 = catenate_text(tag, f, maxsize, totalsize, binary, parseerr);
+             if (r1) return r1;
+ 
+             /* if we see a SP, we're trying to catenate more than one part */
+@@ -4038,13 +4044,14 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+ 
+             /* Catenate the message part(s) to stage */
+             size = 0;
+-            r = append_catenate(curstage->f, cur_name, maxmsgsize, &size,
++            r = append_catenate(tag, curstage->f, cur_name, maxmsgsize, &size,
+                                 &(curstage->binary), &parseerr, &url);
+             if (r) goto done;
+         }
+         else {
+             /* Read size from literal */
+-            r = getliteralsize(arg.s, c, maxmsgsize, &size, &(curstage->binary), &parseerr);
++            r = getliteralsize(tag, arg.s, c, maxmsgsize,
++                               &size, &(curstage->binary), &parseerr);
+             if (!r && size == 0) r = IMAP_ZERO_LENGTH_LITERAL;
+             if (r) goto done;
+ 
+-- 
+2.39.2
+
+
+From d2f960b07cd32ba10cf4cd828e5dd98dea1bfdc2 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch@fastmail.com>
+Date: Thu, 21 Mar 2024 23:55:13 -0400
+Subject: [PATCH 16/16] imapd.c, imapparse.c: call fatal(EX_PROTOCOL) when
+ client exceeds a limit
+
+---
+ cunit/parse.testc | 12 ++++++------
+ imap/imapd.c      | 48 +++++++++++++++++++++++------------------------
+ imap/imapparse.c  | 22 +++++++++++-----------
+ 3 files changed, 41 insertions(+), 41 deletions(-)
+
+diff --git a/cunit/parse.testc b/cunit/parse.testc
+index 5a97f9b73..1786706cb 100644
+--- a/cunit/parse.testc
++++ b/cunit/parse.testc
+@@ -119,7 +119,7 @@ static void test_getint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -188,7 +188,7 @@ static void test_getsint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint32, int32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint32, int32_t, STR4, &c, &val, &bytes_in);
+@@ -255,7 +255,7 @@ static void test_getuint32(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint32, uint32_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint32, uint32_t, STR4, &c, &val, &bytes_in);
+@@ -322,7 +322,7 @@ static void test_getint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -391,7 +391,7 @@ static void test_getsint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getsint64, int64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getsint64, int64_t, STR4, &c, &val, &bytes_in);
+@@ -458,7 +458,7 @@ static void test_getuint64(void)
+     /* test a string with too many digits */
+     CU_EXPECT_CYRFATAL_BEGIN;
+         wrap_int_parser(getuint64, uint64_t, STR3, &c, &val, NULL);
+-    CU_EXPECT_CYRFATAL_END(EX_IOERR, "num too big");
++    CU_EXPECT_CYRFATAL_END(EX_PROTOCOL, "num too big");
+ 
+     /* test a valid value with a different terminator */
+     wrap_int_parser(getuint64, uint64_t, STR4, &c, &val, &bytes_in);
+diff --git a/imap/imapd.c b/imap/imapd.c
+index afd58bd66..58457601a 100644
+--- a/imap/imapd.c
++++ b/imap/imapd.c
+@@ -3591,13 +3591,13 @@ static int getliteralsize(const char *tag, const char *p, int c, size_t maxsize,
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_LITERAL_MINUS_TOO_LARGE));
+-            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+         }
+         if (num > maxsize) {
+             /* Fail per RFC 7888, Section 4, choice 2 */
+             prot_printf(imapd_out, "%s NO %s\r\n", tag,
+                         error_message(IMAP_MESSAGE_TOOBIG));
+-            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_IOERR);
++            fatal(error_message(IMAP_MESSAGE_TOOBIG), EX_PROTOCOL);
+         }
+         isnowait++;
+         p++;
+@@ -3968,7 +3968,7 @@ static void cmd_append(char *tag, char *name, const char *cur_name)
+             do {
+                 c = getword(imapd_in, &arg);
+                 if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                    fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                 if (!curstage->flags.count && !arg.s[0] && c == ')') break; /* empty list */
+                 if (!isokflag(arg.s, &sync_seen)) {
+                     parseerr = "Invalid flag in Append command";
+@@ -4310,7 +4310,7 @@ static void cmd_select(char *tag, char *cmd, char *name)
+         if (arg.s[0] == '\0') goto badlist;
+         for (;;) {
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(arg.s);
+             if (!strcmp(arg.s, "CONDSTORE")) {
+@@ -4685,7 +4685,7 @@ static int parse_fetch_args(const char *tag, const char *cmd,
+     }
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         ucase(fetchatt.s);
+         switch (fetchatt.s[0]) {
+@@ -4818,7 +4818,7 @@ badannotation:
+                     do {
+                         c = getastring(imapd_in, imapd_out, &fieldname);
+                         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+                         if (c == IMAP_LITERAL_TOO_LARGE) {
+                             prot_printf(imapd_out, "%s NO %s in %s %s\r\n",
+                                         tag, error_message(c), cmd, fetchatt.s);
+@@ -5154,7 +5154,7 @@ badannotation:
+         do {
+             c = getword(imapd_in, &fetchatt);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(fetchatt.s);
+             if (!strcmp(fetchatt.s, "CHANGEDSINCE")) {
+@@ -5503,7 +5503,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+         do {
+             c = getword(imapd_in, &storemod);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             ucase(storemod.s);
+             if (!strcmp(storemod.s, "UNCHANGEDSINCE")) {
+@@ -5598,7 +5598,7 @@ static void cmd_store(char *tag, char *sequence, int usinguid)
+     for (;;) {
+         c = getword(imapd_in, &flagname);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == '(' && !flagname.s[0] && !flagsparsed && !inlist) {
+             inlist = 1;
+             continue;
+@@ -7763,7 +7763,7 @@ static void getlistargs(char *tag, struct listargs *listargs)
+         for (;;) {
+             c = getastring(imapd_in, imapd_out, &buf);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (*buf.s)
+                 strarray_append(&listargs->pat, buf.s);
+@@ -8615,7 +8615,7 @@ void cmd_setquota(const char *tag, const char *quotaroot)
+         else if (c != ' ') goto badlist;
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+     c = prot_getc(imapd_in);
+     if (!IS_EOL(c, imapd_in)) {
+@@ -8769,7 +8769,7 @@ static int parse_statusitems(unsigned *statusitemsp, const char **errstr)
+     if (arg.s[0] == '\0') goto bad;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         lcase(arg.s);
+         if (!strcmp(arg.s, "messages")) {
+@@ -9155,7 +9155,7 @@ static int parsecreateargs(struct dlist **extargs)
+         do {
+             c = getword(imapd_in, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             name = ucase(arg.s);
+             if (c != ' ') goto fail;
+@@ -9166,7 +9166,7 @@ static int parsecreateargs(struct dlist **extargs)
+                 do {
+                     c = getword(imapd_in, &val);
+                     if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+                     dlist_setatom(sub, name, val.s);
+                 } while (c == ' ');
+@@ -9237,7 +9237,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9290,7 +9290,7 @@ static int parse_annotate_fetch_data(const char *tag,
+             else
+                 c = getqstring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9370,7 +9370,7 @@ static int parse_metadata_string_or_list(const char *tag,
+         do {
+             c = getastring(imapd_in, imapd_out, &arg);
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+             if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+             if (c == EOF) {
+                 prot_printf(imapd_out,
+@@ -9476,7 +9476,7 @@ static int parse_annotate_store_data(const char *tag,
+         else
+             c = getqstring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -9520,7 +9520,7 @@ static int parse_annotate_store_data(const char *tag,
+             }
+ 
+             if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+             /* add the attrib-value pair to the list */
+             appendattvalue(&attvalues, attrib.s, &value);
+@@ -9598,7 +9598,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get entry */
+         c = getastring(imapd_in, imapd_out, &entry);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c != ' ') {
+             prot_printf(imapd_out,
+@@ -9613,7 +9613,7 @@ static int parse_metadata_store_data(const char *tag,
+         /* get value */
+         c = getbnstring(imapd_in, imapd_out, &value);
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (c == IMAP_LITERAL_TOO_LARGE) goto maxliteral;
+         if (c == EOF) {
+             prot_printf(imapd_out,
+@@ -11903,7 +11903,7 @@ static int getsortcriteria(char *tag, struct sortcrit **sortcrit)
+     n = 0;
+     for (;;) {
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+ 
+         if (n >= nsort - 1) {   /* leave room for implicit criterion */
+             /* (Re)allocate an array for sort criteria */
+@@ -12055,7 +12055,7 @@ static int getlistselopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n",
+@@ -12161,7 +12161,7 @@ static int getlistretopts(char *tag, struct listargs *args)
+         c = getword(imapd_in, &buf);
+ 
+         if (prot_bytes_in(imapd_in) > maxargssize_mark)
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         if (!*buf.s) {
+             prot_printf(imapd_out,
+                         "%s BAD Invalid syntax in List command\r\n", tag);
+diff --git a/imap/imapparse.c b/imap/imapparse.c
+index 2dceaed94..010921089 100644
+--- a/imap/imapparse.c
++++ b/imap/imapparse.c
+@@ -74,7 +74,7 @@ EXPORTED int getword(struct protstream *in, struct buf *buf)
+         }
+         buf_putc(buf, c);
+         if (config_maxword && buf_len(buf) > config_maxword) {
+-            fatal("[TOOBIG] Word too long", EX_IOERR);
++            fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+         }
+     }
+ }
+@@ -138,7 +138,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             }
+             buf_putc(buf, c);
+             if (config_maxquoted && buf_len(buf) > config_maxquoted) {
+-                fatal("[TOOBIG] Quoted value too long", EX_IOERR);
++                fatal("[TOOBIG] Quoted value too long", EX_PROTOCOL);
+             }
+         }
+ 
+@@ -157,11 +157,11 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+             /* LITERAL- says maximum size is 4096! */
+             if (lminus && len > 4096) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_MINUS_TOO_LARGE), EX_PROTOCOL);
+             }
+             if (config_maxliteral && len >= 0 && (unsigned) len > config_maxliteral) {
+                 /* Fail per RFC 7888, Section 4, choice 2 */
+-                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_IOERR);
++                fatal(error_message(IMAP_LITERAL_TOO_LARGE), EX_PROTOCOL);
+             }
+             isnowait++;
+             c = prot_getc(pin);
+@@ -225,7 +225,7 @@ EXPORTED int getxstring(struct protstream *pin, struct protstream *pout,
+                 }
+                 buf_putc(buf, c);
+                 if (config_maxword && buf_len(buf) > config_maxword) {
+-                    fatal("[TOOBIG] Word too long", EX_IOERR);
++                    fatal("[TOOBIG] Word too long", EX_PROTOCOL);
+                 }
+                 c = prot_getc(pin);
+             }
+@@ -284,7 +284,7 @@ EXPORTED int getint32(struct protstream *pin, int32_t *num)
+     /* INT_MAX == 2147483647 */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 214748364 || (result == 214748364 && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -337,7 +337,7 @@ EXPORTED int getuint32(struct protstream *pin, uint32_t *num)
+     /* UINT_MAX == 4294967295U */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 429496729 || (result == 429496729 && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -361,7 +361,7 @@ EXPORTED int getint64(struct protstream *pin, int64_t *num)
+     /* LLONG_MAX == 9223372036854775807LL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 922337203685477580LL || (result == 922337203685477580LL && (c > '7')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -414,7 +414,7 @@ EXPORTED int getuint64(struct protstream *pin, uint64_t *num)
+     /* ULLONG_MAX == 18446744073709551615ULL */
+     while ((c = prot_getc(pin)) != EOF && cyrus_isdigit(c)) {
+         if (result > 1844674407370955161ULL || (result == 1844674407370955161ULL && (c > '5')))
+-            fatal("num too big", EX_IOERR);
++            fatal("num too big", EX_PROTOCOL);
+         result = result * 10 + c - '0';
+         gotchar = 1;
+     }
+@@ -766,7 +766,7 @@ EXPORTED int get_search_return_opts(struct protstream *pin,
+ 
+         if (searchargs->maxargssize_mark &&
+             prot_bytes_in(pin) > searchargs->maxargssize_mark) {
+-            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++            fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+         }
+ 
+     } while (c == ' ');
+@@ -1546,7 +1546,7 @@ static int get_search_criterion(struct protstream *pin,
+ 
+     if (base->maxargssize_mark &&
+         prot_bytes_in(pin) > base->maxargssize_mark) {
+-        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_IOERR);
++        fatal(error_message(IMAP_ARGS_TOO_LARGE), EX_PROTOCOL);
+     }
+ 
+     if (!keep_charset)
+-- 
+2.39.2
+
diff --git a/mail/mailhog/Makefile b/mail/mailhog/Makefile
index 57e32f4c4a99..7b756e4e2da9 100644
--- a/mail/mailhog/Makefile
+++ b/mail/mailhog/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mailhog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	mail devel
 
 MAINTAINER=	mops@punkt.de
diff --git a/mail/mailpit/Makefile b/mail/mailpit/Makefile
index fcffaed90313..f5a56f1e2b41 100644
--- a/mail/mailpit/Makefile
+++ b/mail/mailpit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mailpit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	mail devel
 MASTER_SITES=	https://www.madpilot.net/mailpit/:npmcache \
 		LOCAL/madpilot/mailpit:npmcache
diff --git a/mail/mailslurper/Makefile b/mail/mailslurper/Makefile
index 2c30fbb5a7d1..bd077ca3f104 100644
--- a/mail/mailslurper/Makefile
+++ b/mail/mailslurper/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mailslurper
 PORTVERSION=	1.14.2.g20201217
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	mail
 
 MAINTAINER=	einar@isnic.is
diff --git a/mail/opensmtpd-filter-rspamd/Makefile b/mail/opensmtpd-filter-rspamd/Makefile
index 5702f2cf464a..a48d421a3a5e 100644
--- a/mail/opensmtpd-filter-rspamd/Makefile
+++ b/mail/opensmtpd-filter-rspamd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	opensmtpd-filter-rspamd
 PORTVERSION=	0.1.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	mail
 
 MAINTAINER=	manu@FreeBSD.Org
diff --git a/mail/opensmtpd-filter-senderscore/Makefile b/mail/opensmtpd-filter-senderscore/Makefile
index a05a62462828..7a8c886f8289 100644
--- a/mail/opensmtpd-filter-senderscore/Makefile
+++ b/mail/opensmtpd-filter-senderscore/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opensmtpd-filter-senderscore
 PORTVERSION=	0.1.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	mail
 
 MAINTAINER=	manu@FreeBSD.Org
diff --git a/mail/rubygem-actionmailbox61/Makefile b/mail/rubygem-actionmailbox61/Makefile
index 688c4de4918e..c82fa8b6800a 100644
--- a/mail/rubygem-actionmailbox61/Makefile
+++ b/mail/rubygem-actionmailbox61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailbox
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/mail/rubygem-actionmailbox61/distinfo b/mail/rubygem-actionmailbox61/distinfo
index f427d61e2d86..9bc20b8438bb 100644
--- a/mail/rubygem-actionmailbox61/distinfo
+++ b/mail/rubygem-actionmailbox61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391004
-SHA256 (rubygem/actionmailbox-6.1.7.7.gem) = 32ff32be51cc9b603126a42f705b6bffafc757dc375c87d41d43eca8823041c4
-SIZE (rubygem/actionmailbox-6.1.7.7.gem) = 22528
+TIMESTAMP = 1717568530
+SHA256 (rubygem/actionmailbox-6.1.7.8.gem) = c04af56f3751839a27e4c903f9daf48511ba5d2f981ca27b958f74baffc3ce09
+SIZE (rubygem/actionmailbox-6.1.7.8.gem) = 22528
diff --git a/mail/rubygem-actionmailbox70/Makefile b/mail/rubygem-actionmailbox70/Makefile
index 66a05314a929..d11a4e75ac3d 100644
--- a/mail/rubygem-actionmailbox70/Makefile
+++ b/mail/rubygem-actionmailbox70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailbox
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/mail/rubygem-actionmailbox70/distinfo b/mail/rubygem-actionmailbox70/distinfo
index c60fa30a9237..057f88d98f85 100644
--- a/mail/rubygem-actionmailbox70/distinfo
+++ b/mail/rubygem-actionmailbox70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391030
-SHA256 (rubygem/actionmailbox-7.0.8.1.gem) = 89d721547b178b397b86e1af11adb221098134d083f481ebf90b37431982c8b8
-SIZE (rubygem/actionmailbox-7.0.8.1.gem) = 22528
+TIMESTAMP = 1717568556
+SHA256 (rubygem/actionmailbox-7.0.8.4.gem) = 3326fd92baabc3ff9d6e0931dc455769e9571604202af49b2d4cb84cf0062074
+SIZE (rubygem/actionmailbox-7.0.8.4.gem) = 22528
diff --git a/mail/rubygem-actionmailbox71/Makefile b/mail/rubygem-actionmailbox71/Makefile
index b33ed1865a98..67dc5e40d9b7 100644
--- a/mail/rubygem-actionmailbox71/Makefile
+++ b/mail/rubygem-actionmailbox71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailbox
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/mail/rubygem-actionmailbox71/distinfo b/mail/rubygem-actionmailbox71/distinfo
index 8cce66a1902f..02f170f47739 100644
--- a/mail/rubygem-actionmailbox71/distinfo
+++ b/mail/rubygem-actionmailbox71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391056
-SHA256 (rubygem/actionmailbox-7.1.3.2.gem) = 2493fe676720b6f82a7f0c0396b7ebc41e08ca2abbf5e9c3c9cd11f68bb3b8a9
-SIZE (rubygem/actionmailbox-7.1.3.2.gem) = 22528
+TIMESTAMP = 1717568582
+SHA256 (rubygem/actionmailbox-7.1.3.4.gem) = a3fd3019a44597e49ae18b4ed5c68e0f21c1d1b389bbcc10be357e205a83cad0
+SIZE (rubygem/actionmailbox-7.1.3.4.gem) = 22528
diff --git a/mail/rubygem-actionmailer61/Makefile b/mail/rubygem-actionmailer61/Makefile
index 24a65c530a09..26702a854ac7 100644
--- a/mail/rubygem-actionmailer61/Makefile
+++ b/mail/rubygem-actionmailer61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailer
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/mail/rubygem-actionmailer61/distinfo b/mail/rubygem-actionmailer61/distinfo
index 617d71b937ab..3e8d17719449 100644
--- a/mail/rubygem-actionmailer61/distinfo
+++ b/mail/rubygem-actionmailer61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391006
-SHA256 (rubygem/actionmailer-6.1.7.7.gem) = aa9460432f186bd1e19f2e23bf212d1f123011681ad176f3dafa57f101903347
-SIZE (rubygem/actionmailer-6.1.7.7.gem) = 30720
+TIMESTAMP = 1717568532
+SHA256 (rubygem/actionmailer-6.1.7.8.gem) = 3aa947f3e0325d3be1aad96423a4a0f95c04f9180c5ce159ed29ea150d889745
+SIZE (rubygem/actionmailer-6.1.7.8.gem) = 30720
diff --git a/mail/rubygem-actionmailer70/Makefile b/mail/rubygem-actionmailer70/Makefile
index af94783f3011..b8a3180e538a 100644
--- a/mail/rubygem-actionmailer70/Makefile
+++ b/mail/rubygem-actionmailer70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailer
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/mail/rubygem-actionmailer70/distinfo b/mail/rubygem-actionmailer70/distinfo
index b4b24ac9d99d..5fe2db17e42a 100644
--- a/mail/rubygem-actionmailer70/distinfo
+++ b/mail/rubygem-actionmailer70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391032
-SHA256 (rubygem/actionmailer-7.0.8.1.gem) = 4c1f470e5577a82bdfbf5fd1eca6590990371e80c48eb04ae79883a7e521f21c
-SIZE (rubygem/actionmailer-7.0.8.1.gem) = 30720
+TIMESTAMP = 1717568558
+SHA256 (rubygem/actionmailer-7.0.8.4.gem) = f9f3a782b6cc9568fb1e61395f13ca4cf79afaa1fca85a1d314aef63cd3abac1
+SIZE (rubygem/actionmailer-7.0.8.4.gem) = 30720
diff --git a/mail/rubygem-actionmailer71/Makefile b/mail/rubygem-actionmailer71/Makefile
index bd73a0a6b18b..f081da952865 100644
--- a/mail/rubygem-actionmailer71/Makefile
+++ b/mail/rubygem-actionmailer71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionmailer
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/mail/rubygem-actionmailer71/distinfo b/mail/rubygem-actionmailer71/distinfo
index 22029677f278..06c35c6d0ddc 100644
--- a/mail/rubygem-actionmailer71/distinfo
+++ b/mail/rubygem-actionmailer71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391058
-SHA256 (rubygem/actionmailer-7.1.3.2.gem) = dab3ad5df3053c24e68c96d88394a3d9d45090dbd3f0c9b2d68b43d78aed5504
-SIZE (rubygem/actionmailer-7.1.3.2.gem) = 33792
+TIMESTAMP = 1717568584
+SHA256 (rubygem/actionmailer-7.1.3.4.gem) = 1f196096740587b08ef935db8a672971f448cadb8299e3d9a7bc24088a2a0351
+SIZE (rubygem/actionmailer-7.1.3.4.gem) = 33792
diff --git a/mail/smtprelay/Makefile b/mail/smtprelay/Makefile
index 67ac2072cb01..58f3e348ffc3 100644
--- a/mail/smtprelay/Makefile
+++ b/mail/smtprelay/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	smtprelay
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.10.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	mail
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/mail/snappymail/Makefile b/mail/snappymail/Makefile
index 346880ae6062..7e88b8febb1f 100644
--- a/mail/snappymail/Makefile
+++ b/mail/snappymail/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	snappymail
-DISTVERSION=	2.36.1
+DISTVERSION=	2.36.4
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/the-djmaze/snappymail/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
diff --git a/mail/snappymail/distinfo b/mail/snappymail/distinfo
index e7c03bf59d76..6891a3a6313c 100644
--- a/mail/snappymail/distinfo
+++ b/mail/snappymail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713947961
-SHA256 (snappymail-2.36.1.tar.gz) = 0e3e25ca0d33fd67f2f825161c726d48d1db8ad1662c968b95eb71ca25ddae65
-SIZE (snappymail-2.36.1.tar.gz) = 5949590
+TIMESTAMP = 1719428055
+SHA256 (snappymail-2.36.4.tar.gz) = a4a398c84895b336d93358837bc7ba62068d3c1e8ca2201cdb87b4e8dc9e79bd
+SIZE (snappymail-2.36.4.tar.gz) = 6748097
diff --git a/mail/snappymail/pkg-plist b/mail/snappymail/pkg-plist
index a4ca95f72628..77e1a837415d 100644
--- a/mail/snappymail/pkg-plist
+++ b/mail/snappymail/pkg-plist
@@ -745,6 +745,9 @@
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/LoveDark/images/background.jpg
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/LoveDark/images/preview.png
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/LoveDark/styles.css
+%%WWWDIR%%/snappymail/v/%%VER%%/themes/Magnetic/images/background.png
+%%WWWDIR%%/snappymail/v/%%VER%%/themes/Magnetic/images/preview.png
+%%WWWDIR%%/snappymail/v/%%VER%%/themes/Magnetic/styles.css
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/NextcloudV25+/images/preview.png
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/NextcloudV25+/styles.css
 %%WWWDIR%%/snappymail/v/%%VER%%/themes/NightShine/images/background.jpg
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 5638fffa46c9..f2fc16acbbe6 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	thunderbird
-DISTVERSION=	115.10.2
+DISTVERSION=	115.13.0
 CATEGORIES=	mail news net-im wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
 DISTFILES=	${DISTNAME}.source${EXTRACT_SUFX}
 
 MAINTAINER=	gecko@FreeBSD.org
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index a9dc2e7f600b..709fbc601439 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714411589
-SHA256 (thunderbird-115.10.2.source.tar.xz) = 47bbd0645d7636a5bd81a3e613ef3181c4760dbb476f1609812e35659b7d24e6
-SIZE (thunderbird-115.10.2.source.tar.xz) = 537592900
+TIMESTAMP = 1720024059
+SHA256 (thunderbird-115.13.0.source.tar.xz) = 8d30bb308c305e10110694e992e965d073b1cccce0d2704b27641d36e07aed4a
+SIZE (thunderbird-115.13.0.source.tar.xz) = 539608140
diff --git a/math/abella/Makefile b/math/abella/Makefile
index a99fdfbb916a..fb64cf6b8ed9 100644
--- a/math/abella/Makefile
+++ b/math/abella/Makefile
@@ -10,6 +10,8 @@ WWW=		https://abella-prover.org/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN=		until https://github.com/abella-prover/abella/issues/154 is resolved
+
 BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild \
 		ocamlfind:devel/ocaml-findlib
 
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index 0b4e083ea19b..8c1811ee432f 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -10,6 +10,8 @@ WWW=		http://ceres-solver.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	compilation fails, gcc-13 fails with the error: use of built-in trait '__remove_cvref(_Tp)' in function signature; use library traits instead, see https://pkg-status.freebsd.org/ampere3/data/140releng-armv7-default/26c5fe5d2fe6/logs/ceres-solver-2.2.0_8.log
+
 BUILD_DEPENDS=	glog>=0.5.0:devel/glog
 LIB_DEPENDS=	libglog.so:devel/glog
 RUN_DEPENDS:=	${BUILD_DEPENDS:Meigen*}
diff --git a/math/colpack/Makefile b/math/colpack/Makefile
index cfdde5749d16..a91e97f8cc39 100644
--- a/math/colpack/Makefile
+++ b/math/colpack/Makefile
@@ -12,6 +12,8 @@ WWW=		https://github.com/CSCsw/ColPack
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_FreeBSD_13_armv7=	compilation fails: error: expected identifier before '__is_convertible'
+
 USES=		cmake
 USE_LDCONFIG=	yes
 
diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile
index ca484e46d13f..f0a0dbe89d91 100644
--- a/math/giacxcas/Makefile
+++ b/math/giacxcas/Makefile
@@ -21,6 +21,7 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_PERMS_DOC=	dist-mirror pkg-mirror auto-accept
 LICENSE_DISTFILES_DOC=	giac_${DISTVERSION}${EXTRACT_SUFX}
 
+BROKEN_armv7=	compilation fails: constant expression evaluates to 61171872541 which cannot be narrowed to type 'long' [-Wc++11-narrowing]
 BROKEN_i386=	compilation fails: constant expression evaluates to 61171872541 which cannot be narrowed to type 'long' [-Wc++11-narrowing]
 BROKEN_powerpc=	compilation fails: constant expression evaluates to 61171872541 which cannot be narrowed to type 'long' [-Wc++11-narrowing]
 
diff --git a/math/kamis/Makefile b/math/kamis/Makefile
index 6ee28c1dbd37..d33923150cca 100644
--- a/math/kamis/Makefile
+++ b/math/kamis/Makefile
@@ -10,13 +10,13 @@ WWW=		https://karlsruhemis.github.io/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_armv7=	gcc13 fails: error: use of built-in trait '__remove_cvref(_InIter1)' in function signature, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278630
+#BROKEN_armv7=	gcc13 fails: error: use of built-in trait '__remove_cvref(_InIter1)' in function signature, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278630
 
 USES=		cmake
 USE_LDCONFIG=	yes
 
 .if !exists(/usr/include/omp.h)
-USES+=		compiler:gcc-c++11-lib
+BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
 USE_GITHUB=	yes
diff --git a/math/lean4/Makefile b/math/lean4/Makefile
index cfb76980d3a5..561c7ae4fb5f 100644
--- a/math/lean4/Makefile
+++ b/math/lean4/Makefile
@@ -10,6 +10,7 @@ WWW=		https://lean-lang.org/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	compilation fails: ../../.build/stage1/lib/temp/Init/Coe.depend: No such file or directory
 BROKEN_i386=	linking fails: INTERNAL PANIC: out of memory (during: Linking runLinter)
 
 BUILD_DEPENDS=	bash:shells/bash
diff --git a/math/py-pyaudi/Makefile b/math/py-pyaudi/Makefile
index 9e4cbedced92..2f1332e14b79 100644
--- a/math/py-pyaudi/Makefile
+++ b/math/py-pyaudi/Makefile
@@ -13,7 +13,8 @@ WWW=		http://darioizzo.github.io/audi/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BROKEN_i386=	fails to compile, see https://github.com/darioizzo/audi/issues/62
+BROKEN_armv7=	compilation fails: constraints not satisfied for class template 'd_packed_monomial' [with T = unsigned long long, PSize = 8]
+BROKEN_i386=	not for 32-bit systems, see https://github.com/darioizzo/audi/issues/62
 
 BUILD_DEPENDS=	audi>0:math/audi \
 		pybind11>0:devel/pybind11
diff --git a/misc/arrow-datafusion/Makefile b/misc/arrow-datafusion/Makefile
index 5533183dd026..924197bcb192 100644
--- a/misc/arrow-datafusion/Makefile
+++ b/misc/arrow-datafusion/Makefile
@@ -10,6 +10,8 @@ WWW=		https://arrow.apache.org/datafusion
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
+BROKEN_i386=	compilation fails: this arithmetic operation will overflow, see https://github.com/purpleprotocol/mimalloc_rust/issues/116
+
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 USES=		cargo
@@ -19,6 +21,8 @@ GH_ACCOUNT=	apache
 
 WRKSRC_SUBDIR=	datafusion-cli
 
+RUSTFLAGS=	${ARCH:S/i386/YES/:C/^[a-z].*//:S/YES/-C target-feature=+sse,+sse2/} # add sse sse2 target-features only on i386
+
 CARGO_CRATES=	addr2line-0.21.0 \
 		adler-1.0.2 \
 		adler32-1.2.0 \
diff --git a/misc/cheat/Makefile b/misc/cheat/Makefile
index 7416dc3cb0c4..3dde94decc84 100644
--- a/misc/cheat/Makefile
+++ b/misc/cheat/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cheat
 DISTVERSION=	4.4.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/chrono/Makefile b/misc/chrono/Makefile
index 9a560e93ba0d..bb6d3176554e 100644
--- a/misc/chrono/Makefile
+++ b/misc/chrono/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	chrono
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0-4
 DISTVERSIONSUFFIX=	-g70cda7f
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	misc
 PKGNAMESUFFIX=	-time-tracking
 
diff --git a/misc/concourse/Makefile b/misc/concourse/Makefile
index 9bda4cc0d3a6..94a29f13ca61 100644
--- a/misc/concourse/Makefile
+++ b/misc/concourse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	concourse
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.7.2
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/cryptoballot/Makefile b/misc/cryptoballot/Makefile
index d2b2c36eb09a..af58a53f972c 100644
--- a/misc/cryptoballot/Makefile
+++ b/misc/cryptoballot/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cryptoballot
 DISTVERSION=	g20181015
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/dive/Makefile b/misc/dive/Makefile
index 96216caf66fa..00874b210a3f 100644
--- a/misc/dive/Makefile
+++ b/misc/dive/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index ff544ec01275..56c9eda64f2c 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	exercism
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	misc
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/misc/fq/Makefile b/misc/fq/Makefile
index 5b87a8d21162..ee129587e17d 100644
--- a/misc/fq/Makefile
+++ b/misc/fq/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	fq
 PORTVERSION=	0.10.0
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 7cec09852779..913908bf0e44 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20240216
+PORTVERSION=	20240510
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 9b933a1f89ee..370d2d32612c 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freebsd-doc
-PORTVERSION=	20240323
+PORTVERSION=	20240510
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/doceng
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 5a26d8124130..7ad52d51cbab 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711227557
-SHA256 (freebsd-doc-20240323.tar.gz) = 9448f0b377aa0809a4c9c7a92cc522f948a08c968533f4ad2fb17d0cb65a398e
-SIZE (freebsd-doc-20240323.tar.gz) = 41700683
+TIMESTAMP = 1715329762
+SHA256 (freebsd-doc-20240510.tar.gz) = 9f3603081939fd93c4b6144058bff0ed86650fff482724df78269fbb96fc5315
+SIZE (freebsd-doc-20240510.tar.gz) = 41721174
diff --git a/misc/freebsd-release-manifests/Makefile b/misc/freebsd-release-manifests/Makefile
index b91d6bb8dd98..faa302fbce7a 100644
--- a/misc/freebsd-release-manifests/Makefile
+++ b/misc/freebsd-release-manifests/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	freebsd-release-manifests
-DISTVERSION=	20240302
+DISTVERSION=	20240531
 CATEGORIES=	misc
 MASTER_SITES=	#
 DISTFILES=	#
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.1-RELEASE
new file mode 100644
index 000000000000..a6516133272c
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-14.1-RELEASE
@@ -0,0 +1,9 @@
+base-dbg.txz	d4fd842ddfe0dd9aaa634d2c1dea1934e526a1367a6f9bf675ae08efd560c3df	1702	base_dbg	"Base system (Debugging)"	off
+base.txz	bb451694e8435e646b5ff7ddc5e94d5c6c9649f125837a34b2a2dd419732f347	29832	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	f0cf041845657ffb955ef655ff8750be4217bfb8da0f3cfc1b3d6693b6d2ae59	866	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	f05c0a74f101ee5638185c36003ed4d3dd6972826de6a64d91ec5cd0fdd3a0a6	877	kernel	"Kernel (MANDATORY)"	on
+lib32-dbg.txz	8ac38b8e0b1a236b009f191ec164a2b34803162af9aecfd4d6ceab7615fe5298	258	lib32_dbg	"32-bit compatibility libraries (Debugging)"	off
+lib32.txz	238972769de2ce2d432edc9b56c9870e021905497eb7a11945b48726e714b477	730	lib32	"32-bit compatibility libraries"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	53519b2a47be1d3a655ec03f2428fcffc3e1ff90a9f07e788ffdb12c4c64c3e0	7179	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.1-RELEASE
new file mode 100644
index 000000000000..efdca4877020
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-14.1-RELEASE
@@ -0,0 +1,9 @@
+base-dbg.txz	02ef3b1e38293c88a8a251dc5b7264407686c38d01a72d16f9c2b0d1d9c82a3e	1685	base_dbg	"Base system (Debugging)"	off
+base.txz	b25830252e0dce0161004a5b69a159cbbd92d5e92ae362b06158dbb3f2568d32	29546	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	196f11f870e87260f88d869fdbfde0e5f3acbaa92fa8c7cc6f9dd8385dbbcbd4	719	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	cd16ba9bad26887ceda8809cc5acd190edeaac02c370914cbee8a73112b222bd	792	kernel	"Kernel (MANDATORY)"	on
+lib32-dbg.txz	0128db16dbca412e2457fb241092b36ce820e3a6dc3f667cd4b4094c43de06ec	249	lib32_dbg	"32-bit compatibility libraries (Debugging)"	off
+lib32.txz	ea7456d83d41ddeb21569e297d330b401bc6766937f760f2549fddf49bcfe66a	711	lib32	"32-bit compatibility libraries"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	f9939675441160365af3c8e19affd53802f74ba66a9cc42bfe3e87ff31cf1481	7176	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-14.1-RELEASE
new file mode 100644
index 000000000000..91b3ed26dfdb
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-14.1-RELEASE
@@ -0,0 +1,7 @@
+base-dbg.txz	71b25d2800cdfbee55bc34c701c2c045b6860ae61e464f61a7e35455ee3d8b36	1677	base_dbg	"Base system (Debugging)"	off
+base.txz	9be42cb03698a8f4df4c3df74f608f624c8ca6e3e59cae34f0b4a5b2baf6990f	29632	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	4cfd4eaef1e576fb31b78a51b879ab851444406eb20599326799f973c7f781ed	829	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	8a9cb52bf3a3fca0a7fce35a578438468c4d1223f243d4455d12a1bbfd8f4f2d	839	kernel	"Kernel (MANDATORY)"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	d4252c92f03026b3000ad9877dec60b81fa68a0eb0da16fc19ed5e9a9f389039	7177	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-14.1-RELEASE
new file mode 100644
index 000000000000..2a694247a8df
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-14.1-RELEASE
@@ -0,0 +1,7 @@
+base-dbg.txz	ec04c4a80fb0190dab3db910fe59d48a20b3b4f177c8196970263938490baa5a	1652	base_dbg	"Base system (Debugging)"	off
+base.txz	ded0958fe1b92d8121f558e6d8714c25fab155c1b88e20449fefaff50e0aede5	29303	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	df7a9ae1eb6c4f6f80f7a42cbac06b7ac82b6dc4972d757aba3f27c6cf720ed1	620	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	7e8c4a1ea4e01404c6af1064c75fe3ac46ed7464dd369f0ec2d795833ca7ae78	629	kernel	"Kernel (MANDATORY)"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	3274b5528fe7d927ac1c7a3f8a48264d5d6c7599fd68fb5193ce0d4187754d73	7162	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-14.1-RELEASE
new file mode 100644
index 000000000000..b3a7350cd747
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-14.1-RELEASE
@@ -0,0 +1,9 @@
+base-dbg.txz	1fac93442db7f695ed424c634bdd3a779c7e027d88fafdc2d2d57062ec89381c	1675	base_dbg	"Base system (Debugging)"	off
+base.txz	bdc90b70293fe7372d70b0951f00b1ea54ab853b3c7f3719f8b35df9e1afc027	29363	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	71a113b396476068b83abb1b315a2b11fa042b911e47f0cbb361fe4f6f0de0ca	645	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	4a9c8ad3b1dfa36ddbed56fb7bf32b587a772f21335c1d1a8b5c6e1c2e5c2393	654	kernel	"Kernel (MANDATORY)"	on
+lib32-dbg.txz	f462c7c51bf3c95c0fa228e53cab4900f5c5617770a57c2c9686450fe184a491	248	lib32_dbg	"32-bit compatibility libraries (Debugging)"	off
+lib32.txz	7be46161e2b161206216ccd1f5f60398ca74c4c2cdfd5ab42c848b95d3149752	709	lib32	"32-bit compatibility libraries"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	18813fce76cedc08f2aa44a6efa474af8ceef8861088d266e40f56e6c29a841c	7166	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64le-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64le-14.1-RELEASE
new file mode 100644
index 000000000000..fcf2c71f1936
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64le-14.1-RELEASE
@@ -0,0 +1,7 @@
+base-dbg.txz	197d07bc9e061663c3d541d87373a5026a185aa34ef556836d1746254cfb3c14	1662	base_dbg	"Base system (Debugging)"	off
+base.txz	596ab01786225f63b2e878ca47a9534ca5f5b0214e6a8f6f4112388eec817cfe	29344	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	3b6b3d80e38ad95edb655a9da00f528fe251bea64e648d335eb618b17f6decbe	644	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	8ee7fd309d0fcb46dad9d2fc2727f4cd895b2867da7301f68f48d5e9b36c5671	653	kernel	"Kernel (MANDATORY)"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	37a98eab0147a2706bf0fdeb6ac8d481b75042ee3fc3f2349031c4af2338f775	7177	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-14.1-RELEASE
new file mode 100644
index 000000000000..d238952789fe
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpcspe-14.1-RELEASE
@@ -0,0 +1,7 @@
+base-dbg.txz	d1d3d3b8d3f87533d154a0efc9a7ebc9f9cdcb40fe5f8822a4e6150839529b2f	1651	base_dbg	"Base system (Debugging)"	off
+base.txz	a12a9dd67ac66b60423579c67fcad88fbfbeee1e1de7a39bacf8a17b950a6119	29298	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	54724f5a3e9d18f3d828486f94cf476576a9a57466fa9eb28ac4bdb455fdee27	601	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	29714c8b3fd83d08d18570c199286c9bf99d32f60a3383c5641d887ca42572d7	610	kernel	"Kernel (MANDATORY)"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	3b6e6a37f02b99059dbd86fa25c440db63a096c6ab7ed3d980e342153bb0e739	7162	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/riscv-riscv64-14.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/riscv-riscv64-14.1-RELEASE
new file mode 100644
index 000000000000..e91045bd0440
--- /dev/null
+++ b/misc/freebsd-release-manifests/files/MANIFESTS/riscv-riscv64-14.1-RELEASE
@@ -0,0 +1,7 @@
+base-dbg.txz	59f651e90f113fcdd756ec4d58d1d64601c28cf05784846c677365b6c12b5afa	1657	base_dbg	"Base system (Debugging)"	off
+base.txz	fc4ab51fc5c8a543acc0bf697f7dee882a67579b4a1709328c5c1d9ec657ca10	29358	base	"Base system (MANDATORY)"	on
+kernel-dbg.txz	5e185c8f9f74dd7cc2004611f0eda8e6cf8bf44d6fe5706c2d4a1dca9c0d4e1c	611	kernel_dbg	"Kernel (Debugging)"	on
+kernel.txz	321e538f9078659d8852e9a1628febac013fc3167e22e782266039a4b54fd3b7	623	kernel	"Kernel (MANDATORY)"	on
+ports.txz	11ab7fe7b3fb36ced228fd70fd1744678c3c62c64f1b2bf9b870da1328c44715	200400	ports	"Ports tree"	off
+src.txz	4297779013a7470cc352ea714ff107895678aceb06e3b4fd5b5916eb1bc7e7ef	108568	src	"System source tree"	off
+tests.txz	e0fb8420ea9affb3d17a417b010b7e642363f1dba434c8aa85a10df7ac26716e	7174	tests	"Test suite"	off
diff --git a/misc/freebsd-release-manifests/pkg-plist b/misc/freebsd-release-manifests/pkg-plist
index bbdaa5a905c1..ddbbd135e0a9 100644
--- a/misc/freebsd-release-manifests/pkg-plist
+++ b/misc/freebsd-release-manifests/pkg-plist
@@ -22,3 +22,11 @@
 %%DATADIR%%/MANIFESTS/powerpc-powerpc64le-14.0-RELEASE
 %%DATADIR%%/MANIFESTS/powerpc-powerpcspe-14.0-RELEASE
 %%DATADIR%%/MANIFESTS/riscv-riscv64-14.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64le-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpcspe-14.1-RELEASE
+%%DATADIR%%/MANIFESTS/riscv-riscv64-14.1-RELEASE
diff --git a/misc/gobuster/Makefile b/misc/gobuster/Makefile
index ceae4218bebc..3b991292e035 100644
--- a/misc/gobuster/Makefile
+++ b/misc/gobuster/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gobuster
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.6.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	misc dns www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/hwdata/Makefile b/misc/hwdata/Makefile
index e4d6d2c34e77..ddde1af7c6ad 100644
--- a/misc/hwdata/Makefile
+++ b/misc/hwdata/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hwdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.381
+DISTVERSION=	0.382
 PORTEPOCH=	1
 CATEGORIES=	misc
 
diff --git a/misc/hwdata/distinfo b/misc/hwdata/distinfo
index 83ad5f3d8cc9..b837aa53376b 100644
--- a/misc/hwdata/distinfo
+++ b/misc/hwdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712328188
-SHA256 (vcrhonek-hwdata-v0.381_GH0.tar.gz) = 53435c73964ddc24ac53fa86e29e8b9244ca1cab0578ffdd82fd280f35863004
-SIZE (vcrhonek-hwdata-v0.381_GH0.tar.gz) = 2416050
+TIMESTAMP = 1715258003
+SHA256 (vcrhonek-hwdata-v0.382_GH0.tar.gz) = 5e25457b562a5227eb77eac21d5e4344bd1183c7d62b41e7d3e780ae33e053c1
+SIZE (vcrhonek-hwdata-v0.382_GH0.tar.gz) = 2423254
diff --git a/misc/lf/Makefile b/misc/lf/Makefile
index e0b8edbdda2d..8dfef1478224 100644
--- a/misc/lf/Makefile
+++ b/misc/lf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lf
 DISTVERSIONPREFIX=	r
 DISTVERSION=	32
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile
index 8aa63731b554..7c292b06660e 100644
--- a/misc/llama-cpp/Makefile
+++ b/misc/llama-cpp/Makefile
@@ -10,6 +10,8 @@ WWW=		https://github.com/ggerganov/llama.cpp
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278810
+
 USES=		cmake:testing compiler:c++11-lang python:run shebangfix
 USE_LDCONFIG=	yes
 
diff --git a/misc/ls-lint/Makefile b/misc/ls-lint/Makefile
index b5bb806af8cf..3ddc163b7daf 100644
--- a/misc/ls-lint/Makefile
+++ b/misc/ls-lint/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ls-lint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index 1efb2a77dee2..88ad787598a0 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -10,8 +10,6 @@ WWW=		https://www.openvdb.org/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_armv7=	compilation fails: LLVM ERROR: out of memory
-
 LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
 		libboost_system.so:devel/boost-libs \
 		libImath.so:math/Imath \
diff --git a/misc/perkeep/Makefile b/misc/perkeep/Makefile
index 175b5d432986..914eabc38276 100644
--- a/misc/perkeep/Makefile
+++ b/misc/perkeep/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	perkeep
 DISTVERSION=	0.11
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/misc/py-wandb/Makefile b/misc/py-wandb/Makefile
index d72d389a3b3e..363e6e98d29e 100644
--- a/misc/py-wandb/Makefile
+++ b/misc/py-wandb/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	wandb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.6
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo
index d91a7f4aa725..295652bda7ea 100644
--- a/misc/qt5-examples/distinfo
+++ b/misc/qt5-examples/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771501
-SHA256 (KDE/Qt/5.15.13/qt-everywhere-opensource-src-5.15.13.tar.xz) = 9550ec8fc758d3d8d9090e261329700ddcd712e2dda97e5fcfeabfac22bea2ca
-SIZE (KDE/Qt/5.15.13/qt-everywhere-opensource-src-5.15.13.tar.xz) = 660785400
+TIMESTAMP = 1716930656
+SHA256 (KDE/Qt/5.15.14/qt-everywhere-opensource-src-5.15.14.tar.xz) = fdd3a4f197d2c800ee0085c721f4bef60951cbda9e9c46e525d1412f74264ed7
+SIZE (KDE/Qt/5.15.14/qt-everywhere-opensource-src-5.15.14.tar.xz) = 661065140
diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist
index 89ef8dd59555..00fc4c641f64 100644
--- a/misc/qt5-examples/pkg-plist
+++ b/misc/qt5-examples/pkg-plist
@@ -414,6 +414,7 @@
 %%QT_EXAMPLEDIR%%/bluetooth/shared/Info.qmake.macos.plist
 %%QT_EXAMPLEDIR%%/charts/areachart/areachart.pro
 %%QT_EXAMPLEDIR%%/charts/areachart/main.cpp
+%%QT_EXAMPLEDIR%%/charts/audio/apple/Info.plist.in
 %%QT_EXAMPLEDIR%%/charts/audio/audio.pro
 %%QT_EXAMPLEDIR%%/charts/audio/main.cpp
 %%QT_EXAMPLEDIR%%/charts/audio/widget.cpp
@@ -1947,6 +1948,7 @@
 %%QT_EXAMPLEDIR%%/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg
 %%QT_EXAMPLEDIR%%/multimedia/video/doc/src/qmlvideo.qdoc
 %%QT_EXAMPLEDIR%%/multimedia/video/doc/src/qmlvideofx.qdoc
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/Info.plist
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/folder.png
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/leaves.jpg
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/up.png
diff --git a/misc/qt5-l10n/distinfo b/misc/qt5-l10n/distinfo
index 508340b1c6b6..27a1efa8a530 100644
--- a/misc/qt5-l10n/distinfo
+++ b/misc/qt5-l10n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771151
-SHA256 (KDE/Qt/5.15.13/kde-qttranslations-5.15.13p0.tar.xz) = 99e7862038b82782e8627526c3ad0b1bd0be0471ddb46266f6ba5aefbc26958b
-SIZE (KDE/Qt/5.15.13/kde-qttranslations-5.15.13p0.tar.xz) = 1610776
+TIMESTAMP = 1716930656
+SHA256 (KDE/Qt/5.15.14/kde-qttranslations-5.15.14p0.tar.xz) = 74e057e1ed8d6080ed9d33766add78347ff104be7960f9cacf704fcfbe1020ec
+SIZE (KDE/Qt/5.15.14/kde-qttranslations-5.15.14p0.tar.xz) = 1610888
diff --git a/misc/qt6-doc/distinfo b/misc/qt6-doc/distinfo
index d651634dca43..7858b3bb58ab 100644
--- a/misc/qt6-doc/distinfo
+++ b/misc/qt6-doc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711661445
-SHA256 (KDE/Qt/6.6.3/qtdoc-everywhere-src-6.6.3.tar.xz) = 08850585ea4cae04909a38bcb1318487c546fa6a0c350afda21ab0f356e3eac8
-SIZE (KDE/Qt/6.6.3/qtdoc-everywhere-src-6.6.3.tar.xz) = 13238476
+TIMESTAMP = 1718777717
+SHA256 (KDE/Qt/6.7.2/qtdoc-everywhere-src-6.7.2.tar.xz) = a0c1456cb66dc76065f287e4a607510854bb794141dd18fe7f7db9954587756d
+SIZE (KDE/Qt/6.7.2/qtdoc-everywhere-src-6.7.2.tar.xz) = 14497164
diff --git a/misc/qt6-doc/pkg-plist b/misc/qt6-doc/pkg-plist
index 1e946c46b5c7..a31de148eb75 100644
--- a/misc/qt6-doc/pkg-plist
+++ b/misc/qt6-doc/pkg-plist
@@ -37,7 +37,7 @@
 %%QT_DOCDIR%%/qtdoc/activeqt-testcon.html
 %%QT_DOCDIR%%/qtdoc/android-3rdparty-libs.html
 %%QT_DOCDIR%%/qtdoc/android-build-environment-variables.html
-%%QT_DOCDIR%%/qtdoc/android-building-user-projects.html
+%%QT_DOCDIR%%/qtdoc/android-building-projects-from-commandline.html
 %%QT_DOCDIR%%/qtdoc/android-building.html
 %%QT_DOCDIR%%/qtdoc/android-emojis.html
 %%QT_DOCDIR%%/qtdoc/android-environment-variables.html
@@ -85,6 +85,7 @@
 %%QT_DOCDIR%%/qtdoc/functions.html
 %%QT_DOCDIR%%/qtdoc/get-and-install-qt-cli.html
 %%QT_DOCDIR%%/qtdoc/get-and-install-qt.html
+%%QT_DOCDIR%%/qtdoc/getting-sources-from-git.html
 %%QT_DOCDIR%%/qtdoc/gettingstarted.html
 %%QT_DOCDIR%%/qtdoc/gpl.html
 %%QT_DOCDIR%%/qtdoc/groups.html
@@ -93,21 +94,27 @@
 %%QT_DOCDIR%%/qtdoc/i18n-plural-rules.html
 %%QT_DOCDIR%%/qtdoc/i18n-source-translation.html
 %%QT_DOCDIR%%/qtdoc/images/5OiIqFTjUZI.jpg
+%%QT_DOCDIR%%/qtdoc/images/Android_Studio_Settings.png
 %%QT_DOCDIR%%/qtdoc/images/BenchmarkDemoQt6.png
+%%QT_DOCDIR%%/qtdoc/images/CheckPluginInstall.png
 %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Dark.png
 %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Light.png
 %%QT_DOCDIR%%/qtdoc/images/FX_Material_Showroom.png
 %%QT_DOCDIR%%/qtdoc/images/Material_Dark.png
 %%QT_DOCDIR%%/qtdoc/images/Material_Light.png
+%%QT_DOCDIR%%/qtdoc/images/SettingsSet.png
 %%QT_DOCDIR%%/qtdoc/images/Settings_CustomStyle.png
 %%QT_DOCDIR%%/qtdoc/images/Settings_Material.png
+%%QT_DOCDIR%%/qtdoc/images/Settings_Qt.png
 %%QT_DOCDIR%%/qtdoc/images/Settings_iOS.png
+%%QT_DOCDIR%%/qtdoc/images/_AkKSLp5FnM.png
 %%QT_DOCDIR%%/qtdoc/images/accessibleobjecttree.png
 %%QT_DOCDIR%%/qtdoc/images/addalarms.png
 %%QT_DOCDIR%%/qtdoc/images/alarms2.png
 %%QT_DOCDIR%%/qtdoc/images/alarms3.png
 %%QT_DOCDIR%%/qtdoc/images/android-single-abis.png
 %%QT_DOCDIR%%/qtdoc/images/android-source-folder.png
+%%QT_DOCDIR%%/qtdoc/images/android_studio_select_run.png
 %%QT_DOCDIR%%/qtdoc/images/animation-examples.png
 %%QT_DOCDIR%%/qtdoc/images/applicationwindow.png
 %%QT_DOCDIR%%/qtdoc/images/arrow_bc.png
@@ -116,13 +123,17 @@
 %%QT_DOCDIR%%/qtdoc/images/btn_prev.png
 %%QT_DOCDIR%%/qtdoc/images/bullet_dn.png
 %%QT_DOCDIR%%/qtdoc/images/bullet_sq.png
+%%QT_DOCDIR%%/qtdoc/images/car_configurator_overview.png
 %%QT_DOCDIR%%/qtdoc/images/coffee_machine_modify.png
 %%QT_DOCDIR%%/qtdoc/images/coffee_machine_overview.png
 %%QT_DOCDIR%%/qtdoc/images/coffee_machine_selection.png
 %%QT_DOCDIR%%/qtdoc/images/colorpalette_editing.png
 %%QT_DOCDIR%%/qtdoc/images/colorpalette_listing.png
 %%QT_DOCDIR%%/qtdoc/images/colorpalette_urlselection.png
+%%QT_DOCDIR%%/qtdoc/images/colorpalette_userlisting.png
 %%QT_DOCDIR%%/qtdoc/images/controls.png
+%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_1.png
+%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_2.png
 %%QT_DOCDIR%%/qtdoc/images/deployment-mac-application.png
 %%QT_DOCDIR%%/qtdoc/images/deployment-mac-bundlestructure.png
 %%QT_DOCDIR%%/qtdoc/images/desktop_dark.png
@@ -147,6 +158,7 @@
 %%QT_DOCDIR%%/qtdoc/images/icon_Tools.png
 %%QT_DOCDIR%%/qtdoc/images/integrity-os.png
 %%QT_DOCDIR%%/qtdoc/images/layout-examples.png
+%%QT_DOCDIR%%/qtdoc/images/lightningviewer.jpg
 %%QT_DOCDIR%%/qtdoc/images/logo.png
 %%QT_DOCDIR%%/qtdoc/images/mainscreen.png
 %%QT_DOCDIR%%/qtdoc/images/maintenancetool.png
@@ -156,6 +168,8 @@
 %%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg
 %%QT_DOCDIR%%/qtdoc/images/ok.png
 %%QT_DOCDIR%%/qtdoc/images/open-project.png
+%%QT_DOCDIR%%/qtdoc/images/open_existing_project.png
+%%QT_DOCDIR%%/qtdoc/images/osmbuildings.jpg
 %%QT_DOCDIR%%/qtdoc/images/piemenu.gif
 %%QT_DOCDIR%%/qtdoc/images/project-structure.png
 %%QT_DOCDIR%%/qtdoc/images/project_structure.png
@@ -170,6 +184,7 @@
 %%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-opacity.png
 %%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-rectangles.png
 %%QT_DOCDIR%%/qtdoc/images/qml-uses-visual-transforms.png
+%%QT_DOCDIR%%/qtdoc/images/qt-android-architecture.drawio.svg
 %%QT_DOCDIR%%/qtdoc/images/qt-codesample.png
 %%QT_DOCDIR%%/qtdoc/images/qt-edu-apply.png
 %%QT_DOCDIR%%/qtdoc/images/qt-edu-browse-qbsp.png
@@ -192,7 +207,6 @@
 %%QT_DOCDIR%%/qtdoc/images/qt-edu-qbsp-download.png
 %%QT_DOCDIR%%/qtdoc/images/qt-edu-qbsp.png
 %%QT_DOCDIR%%/qtdoc/images/qt-embedded-fontfeatures.png
-%%QT_DOCDIR%%/qtdoc/images/qt_android_architecture.png
 %%QT_DOCDIR%%/qtdoc/images/qtcreator-clazy-checks-for-porting-to-qt6.png
 %%QT_DOCDIR%%/qtdoc/images/qtcreator-create-templates.png
 %%QT_DOCDIR%%/qtdoc/images/qtcreator-qt-quick-editors.png
@@ -215,6 +229,9 @@
 %%QT_DOCDIR%%/qtdoc/images/sa8155-target.png
 %%QT_DOCDIR%%/qtdoc/images/sa8155p.png
 %%QT_DOCDIR%%/qtdoc/images/scalability-gridlayout.png
+%%QT_DOCDIR%%/qtdoc/images/select_example_project.png
+%%QT_DOCDIR%%/qtdoc/images/select_gear_install_plugin.png
+%%QT_DOCDIR%%/qtdoc/images/selectpluginjar.png
 %%QT_DOCDIR%%/qtdoc/images/session.png
 %%QT_DOCDIR%%/qtdoc/images/small_dark.png
 %%QT_DOCDIR%%/qtdoc/images/small_light.png
@@ -279,6 +296,7 @@
 %%QT_DOCDIR%%/qtdoc/newclasses64.html
 %%QT_DOCDIR%%/qtdoc/newclasses65.html
 %%QT_DOCDIR%%/qtdoc/newclasses66.html
+%%QT_DOCDIR%%/qtdoc/newclasses67.html
 %%QT_DOCDIR%%/qtdoc/obsoleteclasses.html
 %%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html
 %%QT_DOCDIR%%/qtdoc/overviews-main.html
@@ -315,6 +333,8 @@
 %%QT_DOCDIR%%/qtdoc/qt-gui-concepts.html
 %%QT_DOCDIR%%/qtdoc/qt-intro.html
 %%QT_DOCDIR%%/qtdoc/qt-online-installation.html
+%%QT_DOCDIR%%/qtdoc/qt-releases.html
+%%QT_DOCDIR%%/qtdoc/qt-tools-for-android-studio.html
 %%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html
 %%QT_DOCDIR%%/qtdoc/qtconcurrent-mtexamples.html
 %%QT_DOCDIR%%/qtdoc/qtconcurrentexamples.html
@@ -325,6 +345,7 @@
 %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-thermostatexample-phosphoricons.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-attribution-todolistexample-materialicons.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-calqlatr-example.html
+%%QT_DOCDIR%%/qtdoc/qtdoc-demos-car-configurator-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-clocks-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-coffee-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-colorpaletteclient-example.html
@@ -333,7 +354,9 @@
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-documentviewer-plugins-txtviewer-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-fx-material-showroom-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-hangman-example.html
+%%QT_DOCDIR%%/qtdoc/qtdoc-demos-lightningviewer-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-mediaplayer-example.html
+%%QT_DOCDIR%%/qtdoc/qtdoc-demos-osmbuildings-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-photosurface-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-robotarm-example.html
 %%QT_DOCDIR%%/qtdoc/qtdoc-demos-rssnews-example.html
@@ -406,6 +429,7 @@
 %%QT_DOCDIR%%/qtdoc/uic.html
 %%QT_DOCDIR%%/qtdoc/unicode.html
 %%QT_DOCDIR%%/qtdoc/unix-signals.html
+%%QT_DOCDIR%%/qtdoc/vxworks.html
 %%QT_DOCDIR%%/qtdoc/wasm.html
 %%QT_DOCDIR%%/qtdoc/wayland-and-qt.html
 %%QT_DOCDIR%%/qtdoc/webos.html
@@ -416,6 +440,7 @@
 %%QT_DOCDIR%%/qtdoc/whatsnew64.html
 %%QT_DOCDIR%%/qtdoc/whatsnew65.html
 %%QT_DOCDIR%%/qtdoc/whatsnew66.html
+%%QT_DOCDIR%%/qtdoc/whatsnew67.html
 %%QT_DOCDIR%%/qtdoc/whatsnewqt6.html
 %%QT_DOCDIR%%/qtdoc/why-moc.html
 %%QT_DOCDIR%%/qtdoc/windows-building.html
diff --git a/misc/qt6-examples/Makefile b/misc/qt6-examples/Makefile
index 36d10bdbfd27..6fb8ea33badb 100644
--- a/misc/qt6-examples/Makefile
+++ b/misc/qt6-examples/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	examples
 DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	misc
-MASTER_SITES=	QT/official_releases/qt/${QT6_VERSION:R}/${QT6_VERSION}/single
+MASTER_SITES=	QT/${_QT6_RELEASE_TYPE}_releases/qt/${QT6_VERSION:R}/${QT6_VERSION}/single
 PKGNAMEPREFIX=	qt6-
 DISTNAME=	qt-everywhere-src-${QT6_VERSION}
 DIST_SUBDIR=	KDE/Qt/${QT6_VERSION}
diff --git a/misc/qt6-examples/distinfo b/misc/qt6-examples/distinfo
index 5210a2ca11f0..697f7f1a57e5 100644
--- a/misc/qt6-examples/distinfo
+++ b/misc/qt6-examples/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663435
-SHA256 (KDE/Qt/6.6.3/qt-everywhere-src-6.6.3.tar.xz) = 69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104
-SIZE (KDE/Qt/6.6.3/qt-everywhere-src-6.6.3.tar.xz) = 801192112
+TIMESTAMP = 1718779140
+SHA256 (KDE/Qt/6.7.2/qt-everywhere-src-6.7.2.tar.xz) = 0aaea247db870193c260e8453ae692ca12abc1bd841faa1a6e6c99459968ca8a
+SIZE (KDE/Qt/6.7.2/qt-everywhere-src-6.7.2.tar.xz) = 935696876
diff --git a/misc/qt6-examples/pkg-plist b/misc/qt6-examples/pkg-plist
index f61e820cbe6f..854204068223 100644
--- a/misc/qt6-examples/pkg-plist
+++ b/misc/qt6-examples/pkg-plist
@@ -27,14 +27,6 @@
 %%QT_EXAMPLEDIR%%/activeqt/simple/simple.inf
 %%QT_EXAMPLEDIR%%/activeqt/simple/simple.pro
 %%QT_EXAMPLEDIR%%/activeqt/simple/simple.rc
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/main.cpp
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/main.qml
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/simpleqml.def
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/simpleqml.ico
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/simpleqml.pro
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/simpleqml.qrc
-%%QT_EXAMPLEDIR%%/activeqt/simpleqml/simpleqml.rc
 %%QT_EXAMPLEDIR%%/activeqt/wrapper/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/activeqt/wrapper/doc/src/wrapper.qdoc
 %%QT_EXAMPLEDIR%%/activeqt/wrapper/main.cpp
@@ -832,11 +824,17 @@
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/car/main.cpp
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/common/car.xml
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/connected.svg
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/connecting.svg
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/controller.cpp
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/controller.h
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/controller.pro
-%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/controller.ui
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/down.svg
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/icons.qrc
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/left.svg
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/main.cpp
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/right.svg
+%%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/controller/up.svg
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/doc/images/remotecontrolledcar-car-example.webp
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/doc/src/dbus-remotecontrolledcar.qdoc
 %%QT_EXAMPLEDIR%%/dbus/remotecontrolledcar/remotecontrolledcar.pro
@@ -981,6 +979,7 @@
 %%QT_EXAMPLEDIR%%/demos/FX_Material_Showroom/src/import_qml_plugins.h
 %%QT_EXAMPLEDIR%%/demos/FX_Material_Showroom/src/main.cpp
 %%QT_EXAMPLEDIR%%/demos/calqlatr/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/calqlatr/Main.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/android/AndroidManifest.xml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-hdpi/icon.png
 %%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-ldpi/icon.png
@@ -989,21 +988,106 @@
 %%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-xxhdpi/icon.png
 %%QT_EXAMPLEDIR%%/demos/calqlatr/android/res/drawable-xxxhdpi/icon.png
 %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.pro
-%%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.qmlproject
 %%QT_EXAMPLEDIR%%/demos/calqlatr/calqlatr.qrc
+%%QT_EXAMPLEDIR%%/demos/calqlatr/content/BackspaceButton.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/content/CalculatorButton.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/content/Display.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/content/NumberPad.qml
 %%QT_EXAMPLEDIR%%/demos/calqlatr/content/calculator.js
-%%QT_EXAMPLEDIR%%/demos/calqlatr/content/images/paper-edge-left.png
-%%QT_EXAMPLEDIR%%/demos/calqlatr/content/images/paper-edge-right.png
-%%QT_EXAMPLEDIR%%/demos/calqlatr/content/images/paper-grip.png
+%%QT_EXAMPLEDIR%%/demos/calqlatr/content/images/backspace.svg
+%%QT_EXAMPLEDIR%%/demos/calqlatr/content/images/backspace_fill.svg
 %%QT_EXAMPLEDIR%%/demos/calqlatr/doc/images/qtquick-demo-calqlatr.png
 %%QT_EXAMPLEDIR%%/demos/calqlatr/doc/src/calqlatr.qdoc
 %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/AppleIconCalqlatr.png
 %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
 %%QT_EXAMPLEDIR%%/demos/calqlatr/main.cpp
+%%QT_EXAMPLEDIR%%/demos/calqlatr/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject
+%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds
+%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qrc
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/CarPaintMaterial.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/_asset_ref.json
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/carpaint.metainfo
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material16.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/designer/images/material@2x.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/images/LDR_RGB1_3.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/shaders/carmat_simple_nf.frag
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/ComponentBundles/MaterialBundle/shaders/carmat_simple_nf.vert
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/Ev_SportsCar_low.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/Ev_SportsCar_low.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/EV_SportsCar_low/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/Uk5ofde_LOD0.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/Uk5ofde_LOD0.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/_icons/Uk5ofde_LOD0_libicon
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/_icons/Uk5ofde_LOD0_libicon@2x
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5ofde_LOD0/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/Uk5pebv_LOD0.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/Uk5pebv_LOD0.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/_icons/Uk5pebv_LOD0_libicon
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/_icons/Uk5pebv_LOD0_libicon@2x
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Uk5pebv_LOD0/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/Ulbrbdt_LOD0.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/Ulbrbdt_LOD0.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/_icons/Ulbrbdt_LOD0_libicon
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/_icons/Ulbrbdt_LOD0_libicon@2x
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ulbrbdt_LOD0/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/Venodhb_LOD0.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/Venodhb_LOD0.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/_icons/Venodhb_LOD0_libicon
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/_icons/Venodhb_LOD0_libicon@2x
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Venodhb_LOD0/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/Ventdee_LOD0.hints
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/Ventdee_LOD0.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/_icons/Ventdee_LOD0_libicon
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/_icons/Ventdee_LOD0_libicon@2x
+%%QT_EXAMPLEDIR%%/demos/car-configurator/asset_imports/Quick3DAssets/Ventdee_LOD0/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/assets/assets_download.json
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/App.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/CameraReset.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/DebugBox.ui.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/Icons.ui.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/Logo.ui.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/FigmaExportCarConfig/SvgPathItem.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/Headlights.ui.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/KissButton.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/KissButtonSeparator.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/MouseRotatorAndWASD.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/PinchWidget.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/ScreenPrimary.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect1/WallEffect1.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect2/WallEffect2.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/WallEffect3/WallEffect3.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/content/images/builtWithQt.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/doc/images/car_configurator_overview.png
+%%QT_EXAMPLEDIR%%/demos/car-configurator/doc/src/car_configurator.qdoc
+%%QT_EXAMPLEDIR%%/demos/car-configurator/hdr.qrc
+%%QT_EXAMPLEDIR%%/demos/car-configurator/hdr_low.qrc
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/Constants.qml
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/assetdownloader.cpp
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/assetdownloader.h
+%%QT_EXAMPLEDIR%%/demos/car-configurator/imports/CarRendering/qmldir
+%%QT_EXAMPLEDIR%%/demos/car-configurator/qmlmodules.cmake
+%%QT_EXAMPLEDIR%%/demos/car-configurator/qtquickcontrols2.conf
+%%QT_EXAMPLEDIR%%/demos/car-configurator/src/app_environment.h
+%%QT_EXAMPLEDIR%%/demos/car-configurator/src/import_qml_components_plugins.h
+%%QT_EXAMPLEDIR%%/demos/car-configurator/src/import_qml_plugins.h
+%%QT_EXAMPLEDIR%%/demos/car-configurator/src/main.cpp
 %%QT_EXAMPLEDIR%%/demos/clocks/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/clocks/clocks.pro
 %%QT_EXAMPLEDIR%%/demos/clocks/clocks.qml
@@ -1026,18 +1110,49 @@
 %%QT_EXAMPLEDIR%%/demos/coffee/ApplicationFlowForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/coffee/ChoosingCoffee.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/ChoosingCoffeeForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/CoffeeCard.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/CoffeeCardForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Colors.qml
-%%QT_EXAMPLEDIR%%/demos/coffee/Cup.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/Cup.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/CustomButton.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/CustomButtonForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/CustomSlider.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/CustomSliderForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/CustomToolBar.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/CustomToolBarForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Home.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/HomeForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Insert.qml
-%%QT_EXAMPLEDIR%%/demos/coffee/LICENSE.txt
+%%QT_EXAMPLEDIR%%/demos/coffee/InsertForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Progress.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/ProgressForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Ready.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/ReadyForm.ui.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/Settings.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/SettingsForm.ui.qml
+%%QT_EXAMPLEDIR%%/demos/coffee/android/AndroidManifest.xml
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-anydpi-v26/ic_launcher.xml
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-hdpi/ic_launcher.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-hdpi/ic_launcher_background.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-hdpi/ic_launcher_foreground.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-hdpi/ic_launcher_monochrome.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-mdpi/ic_launcher.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-mdpi/ic_launcher_background.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-mdpi/ic_launcher_foreground.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-mdpi/ic_launcher_monochrome.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xhdpi/ic_launcher.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xhdpi/ic_launcher_background.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xhdpi/ic_launcher_foreground.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xhdpi/ic_launcher_monochrome.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxhdpi/ic_launcher.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxhdpi/ic_launcher_background.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxhdpi/ic_launcher_foreground.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxhdpi/ic_launcher_monochrome.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxxhdpi/ic_launcher.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxxhdpi/ic_launcher_background.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+%%QT_EXAMPLEDIR%%/demos/coffee/android/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
 %%QT_EXAMPLEDIR%%/demos/coffee/coffee.pro
 %%QT_EXAMPLEDIR%%/demos/coffee/coffeemachine.qrc
 %%QT_EXAMPLEDIR%%/demos/coffee/doc/images/coffee_machine_emptycup.png
@@ -1067,60 +1182,55 @@
 %%QT_EXAMPLEDIR%%/demos/coffee/images/icons/keyboard_backspace_white_left.svg
 %%QT_EXAMPLEDIR%%/demos/coffee/images/icons/keyboard_backspace_white_right.svg
 %%QT_EXAMPLEDIR%%/demos/coffee/images/icons/light_mode_black_24dp.svg
+%%QT_EXAMPLEDIR%%/demos/coffee/ios/Assets.xcassets/AppIcon.appiconset/App Icon-Coffee.png
+%%QT_EXAMPLEDIR%%/demos/coffee/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
 %%QT_EXAMPLEDIR%%/demos/coffee/main.cpp
 %%QT_EXAMPLEDIR%%/demos/coffee/main.qml
 %%QT_EXAMPLEDIR%%/demos/coffee/qmldir
 %%QT_EXAMPLEDIR%%/demos/coffee/qtquickcontrols2.conf
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/MainWindow.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/ColorDialogDelete.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/ColorDialogEditor.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/ColorView.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/Main.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/ServerSelection.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/UserMenu.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/ColorPalette/qmldir
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/Button.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/Popup.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/TextField.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/UIStyle.qml
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/QtExampleStyle/qmldir
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/abstractresource.h
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/basiclogin.cpp
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/basiclogin.h
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/colorpalette.qrc
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/colorpaletteclient.pro
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_editing.png
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_listing.png
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_urlselection.png
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/images/colorpalette_userlisting.png
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/doc/src/colorpaletteclient.qdoc
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/add.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/delete.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/edit.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/file_upload.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/login.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/logout.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20/refresh.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/add.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/delete.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/edit.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/file_upload.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/login.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/logout.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@2/refresh.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/add.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/delete.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/edit.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/file_upload.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/login.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/logout.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@3/refresh.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/add.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/delete.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/edit.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/file_upload.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/login.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/logout.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/20x20@4/refresh.png
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/index.theme
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/colorpaletteclient/qt_attribution.json
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/close.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/delete.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/dots.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/edit.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/login.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/logout.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/ok.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/plus.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/qt.png
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/qt_attribution.json
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/testserver.png
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/update.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/user.svg
+%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/icons/userMask.svg
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/main.cpp
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/paginatedresource.cpp
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/paginatedresource.h
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/qmldir
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/restaccessmanager.cpp
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/restaccessmanager.h
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/restservice.cpp
 %%QT_EXAMPLEDIR%%/demos/colorpaletteclient/restservice.h
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/util.cpp
-%%QT_EXAMPLEDIR%%/demos/colorpaletteclient/util.h
 %%QT_EXAMPLEDIR%%/demos/demos.pro
 %%QT_EXAMPLEDIR%%/demos/dice/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/dice/Carpet.qml
@@ -1229,6 +1339,12 @@
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/pdfviewer.json
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.cpp
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/pdfviewer/zoomselector.h
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.cpp
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.h
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.json
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/q3dviewer.qml
+%%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/q3dviewer/queryMimeTypes.qml
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.cpp
 %%QT_EXAMPLEDIR%%/demos/documentviewer/plugins/txtviewer/txtviewer.h
@@ -1295,6 +1411,141 @@
 %%QT_EXAMPLEDIR%%/demos/hangman/qml/StoreView.qml
 %%QT_EXAMPLEDIR%%/demos/hangman/qml/Word.qml
 %%QT_EXAMPLEDIR%%/demos/hangman/resources.qrc
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/Info.plist
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/ActionsLayer.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/DistanceTimeLayer.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/LightningMapLayer.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/LightningView.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/LightningViewConfig.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/Main.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/MapLayersDrawer.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/MapLayersItem.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/MapType.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/MapView.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/SwitchMap.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/controller.cpp
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/controller.h
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/distance.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/globe.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/lightning-layer.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/lightning-strike.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/map-layers.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/map.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/recenter.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/icons/user-location.svg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/laststrikeinfo.h
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningitemdata.cpp
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningitemdata.h
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningitemmodel.cpp
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningitemmodel.h
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningprovider.cpp
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewer/lightningprovider.h
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/Button.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/Config.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/RoundButton.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/StyleImage.qml
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/button-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/flatbutton-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/dark/images/roundbutton-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/button-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/flatbutton-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-checked@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-disabled.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-disabled@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-hovered.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-hovered@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-pressed.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background-pressed@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/LightningViewerStyle/light/images/roundbutton-background@2x.png
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/doc/images/lightningviewer.jpg
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/doc/src/lightningviewer.qdoc
+%%QT_EXAMPLEDIR%%/demos/lightningviewer/main.cpp
 %%QT_EXAMPLEDIR%%/demos/maroon/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/maroon/content/BuildButton.qml
 %%QT_EXAMPLEDIR%%/demos/maroon/content/GameCanvas.qml
@@ -1454,9 +1705,27 @@
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/theme_info.png
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.qdoc
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.rst
+%%QT_EXAMPLEDIR%%/demos/mediaplayer/filenameprovider.h
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py
 %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/3rdparty/mapbox/earcut.h
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/Main.qml
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/OSMCameraController.qml
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/customshaderbuildings.frag
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/customshaderbuildings.vert
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/customshadertiles.frag
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/doc/images/osmbuildings.jpg
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/doc/src/osmbuildings.qdoc
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/geometry.cpp
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/geometry.h
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/main.cpp
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/manager.cpp
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/manager.h
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/qml.qrc
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/request.cpp
+%%QT_EXAMPLEDIR%%/demos/osmbuildings/request.h
 %%QT_EXAMPLEDIR%%/demos/photosurface/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/demos/photosurface/doc/images/qtquick-demo-photosurface-small.png
 %%QT_EXAMPLEDIR%%/demos/photosurface/doc/src/photosurface.qdoc
@@ -2130,33 +2399,6 @@
 %%QT_EXAMPLEDIR%%/demos/todolist/src/app_environment.h
 %%QT_EXAMPLEDIR%%/demos/todolist/src/import_qml_plugins.h
 %%QT_EXAMPLEDIR%%/demos/todolist/src/main.cpp
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/FlipBar.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/LineInput.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/ListFooter.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/ListHeader.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/SearchDelegate.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/TweetDelegate.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/TweetsModel.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/anonymous.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/bird-anim-sprites.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/icon-clear.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/icon-loading.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/icon-refresh.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/resources/icon-search.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/shaders/compile.bat
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/shaders/effect.frag
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/shaders/effect.frag.qsb
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/shaders/effect.vert
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/shaders/effect.vert.qsb
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/content/tweetsearch.mjs
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-1.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-2.png
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/doc/src/tweetsearch.qdoc
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/main.cpp
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/tweetsearch.pro
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/tweetsearch.qml
-%%QT_EXAMPLEDIR%%/demos/tweetsearch/tweetsearch.qmlproject
 %%QT_EXAMPLEDIR%%/designer/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/designer/README
 %%QT_EXAMPLEDIR%%/designer/calculatorbuilder/CMakeLists.txt
@@ -2219,159 +2461,134 @@
 %%QT_EXAMPLEDIR%%/designer/taskmenuextension/tictactoeplugin.h
 %%QT_EXAMPLEDIR%%/designer/taskmenuextension/tictactoetaskmenu.cpp
 %%QT_EXAMPLEDIR%%/designer/taskmenuextension/tictactoetaskmenu.h
-%%QT_EXAMPLEDIR%%/embedded/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/digiflip/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/digiflip/digiflip.cpp
-%%QT_EXAMPLEDIR%%/embedded/digiflip/digiflip.pro
-%%QT_EXAMPLEDIR%%/embedded/embedded.pro
-%%QT_EXAMPLEDIR%%/embedded/flickable/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/flickable/flickable.cpp
-%%QT_EXAMPLEDIR%%/embedded/flickable/flickable.h
-%%QT_EXAMPLEDIR%%/embedded/flickable/flickable.pro
-%%QT_EXAMPLEDIR%%/embedded/flickable/main.cpp
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/aircraft.png
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/flightinfo.cpp
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/flightinfo.pro
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/flightinfo.qrc
-%%QT_EXAMPLEDIR%%/embedded/flightinfo/form.ui
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/lightmaps.cpp
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/lightmaps.h
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/lightmaps.pro
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/main.cpp
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/mapzoom.cpp
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/mapzoom.h
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/slippymap.cpp
-%%QT_EXAMPLEDIR%%/embedded/lightmaps/slippymap.h
-%%QT_EXAMPLEDIR%%/embedded/raycasting/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/raycasting/raycasting.cpp
-%%QT_EXAMPLEDIR%%/embedded/raycasting/raycasting.pro
-%%QT_EXAMPLEDIR%%/embedded/raycasting/raycasting.qrc
-%%QT_EXAMPLEDIR%%/embedded/raycasting/textures.png
-%%QT_EXAMPLEDIR%%/embedded/styleexample/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/add.png
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/application.qss
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/blue.qss
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/khaki.qss
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/nature_1.jpg
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/nostyle.qss
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/remove.png
-%%QT_EXAMPLEDIR%%/embedded/styleexample/files/transparent.qss
-%%QT_EXAMPLEDIR%%/embedded/styleexample/main.cpp
-%%QT_EXAMPLEDIR%%/embedded/styleexample/styleexample.pro
-%%QT_EXAMPLEDIR%%/embedded/styleexample/styleexample.qrc
-%%QT_EXAMPLEDIR%%/embedded/styleexample/stylewidget.cpp
-%%QT_EXAMPLEDIR%%/embedded/styleexample/stylewidget.h
-%%QT_EXAMPLEDIR%%/embedded/styleexample/stylewidget.ui
 %%QT_EXAMPLEDIR%%/examples.pro
-%%QT_EXAMPLEDIR%%/graphs/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/axishandling/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/axishandling/axishandling.pro
-%%QT_EXAMPLEDIR%%/graphs/axishandling/axishandling.qrc
-%%QT_EXAMPLEDIR%%/graphs/axishandling/customformatter.cpp
-%%QT_EXAMPLEDIR%%/graphs/axishandling/customformatter.h
-%%QT_EXAMPLEDIR%%/graphs/axishandling/doc/images/axishandling-example.png
-%%QT_EXAMPLEDIR%%/graphs/axishandling/doc/src/axishandling.qdoc
-%%QT_EXAMPLEDIR%%/graphs/axishandling/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/AxisDragging.qml
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/AxisFormatting.qml
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/Data.qml
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/cube.mesh
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/cubetexture.png
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qml/axishandling/main.qml
-%%QT_EXAMPLEDIR%%/graphs/axishandling/qmldir
-%%QT_EXAMPLEDIR%%/graphs/bars/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/bars/bars.pro
-%%QT_EXAMPLEDIR%%/graphs/bars/bars.qrc
-%%QT_EXAMPLEDIR%%/graphs/bars/doc/images/bars-example.png
-%%QT_EXAMPLEDIR%%/graphs/bars/doc/src/bars.qdoc
-%%QT_EXAMPLEDIR%%/graphs/bars/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/Axes.qml
-%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/Data.qml
-%%QT_EXAMPLEDIR%%/graphs/bars/qml/bars/main.qml
-%%QT_EXAMPLEDIR%%/graphs/examples.pri
-%%QT_EXAMPLEDIR%%/graphs/graphs.pro
-%%QT_EXAMPLEDIR%%/graphs/scatter/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/scatter/doc/images/scatter-example.png
-%%QT_EXAMPLEDIR%%/graphs/scatter/doc/src/scatter.qdoc
-%%QT_EXAMPLEDIR%%/graphs/scatter/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/scatter/qml/scatter/Data.qml
-%%QT_EXAMPLEDIR%%/graphs/scatter/qml/scatter/main.qml
-%%QT_EXAMPLEDIR%%/graphs/scatter/scatter.pro
-%%QT_EXAMPLEDIR%%/graphs/scatter/scatter.qrc
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/datasource.cpp
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/datasource.h
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/doc/images/surfacegallery-example.png
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/doc/src/surfacegallery.qdoc
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SpectrogramData.qml
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/heightmap.png
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/heightmap.readme
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/qml/surfacegallery/main.qml
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/surfacegallery.pro
-%%QT_EXAMPLEDIR%%/graphs/surfacegallery/surfacegallery.qrc
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/axesinputhandler.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/axesinputhandler.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/bargraph.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/bargraph.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/custominputhandler.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/custominputhandler.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_1.png
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_2.png
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/layer_3.png
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/license.txt
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/maptexture.jpg
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/narrowarrow.mesh
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/oilrig.mesh
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/pipe.mesh
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/raindata.txt
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/refinery.mesh
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/refinery.obj
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/data/topography.png
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/doc/images/widgetgraphgallery-example.png
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/graphmodifier.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/graphmodifier.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/highlightseries.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/highlightseries.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/rainfalldata.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/rainfalldata.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scatterdatamodifier.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scatterdatamodifier.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scattergraph.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/scattergraph.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraph.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraph.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraphmodifier.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/surfacegraphmodifier.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/topographicseries.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/topographicseries.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardatamapping.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardatamapping.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardataproxy.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantbardataproxy.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantdataset.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/variantdataset.h
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/widgetgraphgallery.pro
-%%QT_EXAMPLEDIR%%/graphs/widgetgraphgallery/widgetgraphgallery.qrc
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/doc/images/widgetvolumetric-example.png
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/doc/src/widgetvolumetric.qdoc
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_ground.png
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_magma.png
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/layer_water.png
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/main.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/volumetric.cpp
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/volumetric.h
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/widgetvolumetric.pro
-%%QT_EXAMPLEDIR%%/graphs/widgetvolumetric/widgetvolumetric.qrc
+%%QT_EXAMPLEDIR%%/graphs/2d/2d.pro
+%%QT_EXAMPLEDIR%%/graphs/2d/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/2d/examples.pri
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/doc/images/hellographs-example.png
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/doc/src/hellographs.qdoc
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/hellographs.pro
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/hellographs.qrc
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/2d/hellographs/qml/hellographs/main.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/3d.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/axishandling.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/axishandling.qrc
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/customformatter.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/customformatter.h
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/doc/images/axishandling-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/doc/src/axishandling.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/AxisDragging.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/AxisFormatting.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/Data.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/cube.mesh
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/cubetexture.png
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qml/axishandling/main.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/axishandling/qmldir
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/bars.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/bars.qrc
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/doc/images/bars-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/doc/src/bars.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/Axes.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/Data.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/bars/qml/bars/main.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/examples.pri
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/doc/images/scatter-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/doc/src/scatter.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/background.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/background_hide.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/camera.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/camera2.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/flatten.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/shadow.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/shadow_hide.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/smooth_curve.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/images/theme.svg
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/qml/scatter/Data.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/qml/scatter/Graph.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/qml/scatter/main.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/scatter.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/scatter/scatter.qrc
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/datasource.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/datasource.h
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/doc/images/surfacegallery-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/doc/src/surfacegallery.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/SpectrogramData.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.png
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/heightmap.readme
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/qml/surfacegallery/main.qml
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/surfacegallery.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/surfacegallery/surfacegallery.qrc
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/axesinputhandler.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/axesinputhandler.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/bargraph.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/bargraph.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/custominputhandler.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/custominputhandler.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_1.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_2.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/layer_3.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/license.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/maptexture.jpg
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/narrowarrow.mesh
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/oilrig.mesh
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/pipe.mesh
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/raindata.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/refinery.mesh
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/refinery.obj
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/data/topography.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/doc/images/widgetgraphgallery-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/doc/src/widgetgraphgallery.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/graphmodifier.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/graphmodifier.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/highlightseries.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/highlightseries.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/rainfalldata.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/rainfalldata.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scatterdatamodifier.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scatterdatamodifier.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraph.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/scattergraph.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraph.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraph.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphmodifier.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/surfacegraphmodifier.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/topographicseries.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/topographicseries.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantbardatamapping.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantbardatamapping.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantbardataproxy.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantbardataproxy.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantdataset.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/variantdataset.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/widgetgraphgallery.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetgraphgallery/widgetgraphgallery.qrc
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/doc/images/widgetvolumetric-example.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/doc/src/widgetvolumetric.qdoc
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/layer_ground.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/layer_magma.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/layer_water.png
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/main.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/volumetric.cpp
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/volumetric.h
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/widgetvolumetric.pro
+%%QT_EXAMPLEDIR%%/graphs/3d/widgetvolumetric/widgetvolumetric.qrc
 %%QT_EXAMPLEDIR%%/gui/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/gui/doc/images/rhiwindow_example.jpg
 %%QT_EXAMPLEDIR%%/gui/doc/src/rasterwindow.qdoc
@@ -2787,31 +3004,38 @@
 %%QT_EXAMPLEDIR%%/multimedia/spectrum/waveform.cpp
 %%QT_EXAMPLEDIR%%/multimedia/spectrum/waveform.h
 %%QT_EXAMPLEDIR%%/multimedia/video/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/AudioControl.qml
 %%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/MetadataInfo.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/Mute_Icon.svg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/PlaybackControl.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/PlaybackRateControl.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/PlaybackSeekControl.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/PlayerMenuBar.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/Speaker_Icon.svg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/TracksInfo.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/OqosZsDqvzQ.jpg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/PlayerMenuBar.gif
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/architecture-overview.gif
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/audio-control.gif
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/meta-data.png
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/nHrBbW0H-pc.jpg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/play-pause-stop.gif
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/playbackControlPanel.gif
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/qmlmediaplayer.jpg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/sf_yv01UtIw.jpg
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/url.png
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/Main.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/AudioControl.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/MetadataInfo.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/PlaybackControl.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/PlaybackSeekControl.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/SettingsPopup.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/TracksInfo.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/controls/UrlPopup.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/mediaplayer.png
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/images/settings.png
 %%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/backward10.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/ff.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/forward10.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/link.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/loop.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/more.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/mute.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/open_new.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/pause_symbol.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/play_symbol.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/rewind.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/settings.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/speaker.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/stop_symbol.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/url.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/volume.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/volume_mute.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/zoom_maximize.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/images/zoom_minimize.svg
 %%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/main.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/mediaplayer/main.qml
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/Info.plist.in
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/images/qmlvideo-menu.jpg
@@ -2819,63 +3043,71 @@
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/doc/src/qmlvideo.qdoc
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor.cpp
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor.h
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/FrequencyItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitor/qmldir
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/frequencymonitordeclarative.cpp
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/folder.png
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/leaves.jpg
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/images/up.png
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/main.cpp
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor.cpp
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor.h
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/PerformanceItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitor/qmldir
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitordeclarative.cpp
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/performancemonitordeclarative.h
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/frequencymonitor/FrequencyItem.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/performancemonitor/PerformanceItem.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
-%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.png
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.pro
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.svg
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraBasic.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraDrag.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraDummy.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraFullScreen.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraFullScreenInverted.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraMove.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraOverlay.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraResize.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraRotate.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraSpin.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/Content.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/ErrorDialog.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/Main.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/Scene.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneBasic.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneDrag.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneFullScreen.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneFullScreenInverted.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneMove.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneMulti.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneOverlay.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneResize.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneRotate.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneSelectionPanel.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SceneSpin.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/SeekControl.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoBasic.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoDrag.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoDummy.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoFillMode.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoFullScreen.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoFullScreenInverted.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoItem.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoMetadata.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoMove.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoOverlay.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoPlaybackRate.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoResize.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoRotate.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoSeek.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/VideoSpin.qml
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/folder.png
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/leaves.jpg
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/up.png
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmldir
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmlvideo_global.h
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.cpp
+%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.h
 %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/trace.h
 %%QT_EXAMPLEDIR%%/multimedia/video/recorder/AudioInputSelect.qml
 %%QT_EXAMPLEDIR%%/multimedia/video/recorder/CMakeLists.txt
@@ -2940,15 +3172,17 @@
 %%QT_EXAMPLEDIR%%/network/doc/images/blockingfortuneclient-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/broadcastreceiver-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/broadcastsender-example.png
+%%QT_EXAMPLEDIR%%/network/doc/images/dnslookup-example.webp
 %%QT_EXAMPLEDIR%%/network/doc/images/fortuneclient-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/fortuneserver-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/http-example.webp
+%%QT_EXAMPLEDIR%%/network/doc/images/multi-stream-client-example.webp
+%%QT_EXAMPLEDIR%%/network/doc/images/multi-stream-server-example.webp
 %%QT_EXAMPLEDIR%%/network/doc/images/multicastreceiver-example.webp
 %%QT_EXAMPLEDIR%%/network/doc/images/multicastsender-example.webp
-%%QT_EXAMPLEDIR%%/network/doc/images/network-chat-example.png
+%%QT_EXAMPLEDIR%%/network/doc/images/network-chat-example.webp
 %%QT_EXAMPLEDIR%%/network/doc/images/rsslisting.png
-%%QT_EXAMPLEDIR%%/network/doc/images/securesocketclient.png
-%%QT_EXAMPLEDIR%%/network/doc/images/securesocketclient2.png
+%%QT_EXAMPLEDIR%%/network/doc/images/securesocketclient-example.webp
 %%QT_EXAMPLEDIR%%/network/doc/images/secureudpclient-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/secureudpserver-example.png
 %%QT_EXAMPLEDIR%%/network/doc/images/threadedfortuneserver-example.png
@@ -2956,11 +3190,14 @@
 %%QT_EXAMPLEDIR%%/network/doc/src/blockingfortuneclient.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/broadcastreceiver.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/broadcastsender.qdoc
+%%QT_EXAMPLEDIR%%/network/doc/src/dnslookup.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/fortuneclient.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/fortuneserver.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/http.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/multicastreceiver.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/multicastsender.qdoc
+%%QT_EXAMPLEDIR%%/network/doc/src/multistreamclient.qdoc
+%%QT_EXAMPLEDIR%%/network/doc/src/multistreamserver.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/network-chat.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/rsslisting.qdoc
 %%QT_EXAMPLEDIR%%/network/doc/src/securesocketclient.qdoc
@@ -3094,17 +3331,17 @@
 %%QT_EXAMPLEDIR%%/network/torrent/filemanager.cpp
 %%QT_EXAMPLEDIR%%/network/torrent/filemanager.h
 %%QT_EXAMPLEDIR%%/network/torrent/icons.qrc
-%%QT_EXAMPLEDIR%%/network/torrent/icons/1downarrow.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/1uparrow.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/bottom.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/edit_add.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/edit_remove.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/exit.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/peertopeer.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/player_pause.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/player_play.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/player_stop.png
-%%QT_EXAMPLEDIR%%/network/torrent/icons/stop.png
+%%QT_EXAMPLEDIR%%/network/torrent/icons/1downarrow.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/1uparrow.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/about.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/bottom.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/edit_add.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/edit_remove.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/exit.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/peertopeer.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/player_pause.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/player_play.svg
+%%QT_EXAMPLEDIR%%/network/torrent/icons/player_stop.svg
 %%QT_EXAMPLEDIR%%/network/torrent/main.cpp
 %%QT_EXAMPLEDIR%%/network/torrent/mainwindow.cpp
 %%QT_EXAMPLEDIR%%/network/torrent/mainwindow.h
@@ -3216,6 +3453,7 @@
 %%QT_EXAMPLEDIR%%/opcua/opcuaviewer/treeitem.h
 %%QT_EXAMPLEDIR%%/opcua/waterpump/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/opcua/waterpump/simulationserver/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/opcua/waterpump/simulationserver/doc/simulationserver.qdoc
 %%QT_EXAMPLEDIR%%/opcua/waterpump/simulationserver/main.cpp
 %%QT_EXAMPLEDIR%%/opcua/waterpump/simulationserver/simulationserver.cpp
 %%QT_EXAMPLEDIR%%/opcua/waterpump/simulationserver/simulationserver.h
@@ -3244,7 +3482,7 @@
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/Tank2Unit.qml
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/TankSimulation.qml
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/ValueDisplay.qml
-%%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/doc/images/tankexample.jpg
+%%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/doc/images/tankexample.png
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/doc/waterpump-qmlcpp.qdoc
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/main.cpp
 %%QT_EXAMPLEDIR%%/opcua/waterpump/waterpump-qmlcpp/main.qml
@@ -3270,13 +3508,6 @@
 %%QT_EXAMPLEDIR%%/opengl/2dpainting/window.h
 %%QT_EXAMPLEDIR%%/opengl/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/opengl/README
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/contextinfo.pro
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/main.cpp
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/renderwindow.cpp
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/renderwindow.h
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/widget.cpp
-%%QT_EXAMPLEDIR%%/opengl/contextinfo/widget.h
 %%QT_EXAMPLEDIR%%/opengl/cube/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/opengl/cube/cube.png
 %%QT_EXAMPLEDIR%%/opengl/cube/cube.pro
@@ -3380,27 +3611,28 @@
 %%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qml
 %%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qrc
 %%QT_EXAMPLEDIR%%/pdf/pdf.pro
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/main.cpp
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/pdfviewer.pro
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/document-open.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-clear.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-copy.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-select-all.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-down-search.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-next-view-page.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-previous-view-page.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-up-search.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-left.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-right.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/test.pdf
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-best.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-width.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-in.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-original.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-out.svg
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qml
-%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qrc
+%%QT_EXAMPLEDIR%%/pdf/singlepage/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/pdf/singlepage/doc/src/singlepage.qdoc
+%%QT_EXAMPLEDIR%%/pdf/singlepage/main.cpp
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/document-open.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/edit-clear.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/edit-copy.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/edit-select-all.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/go-down-search.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/go-next-view-page.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/go-previous-view-page.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/go-up-search.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/rotate-left.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/rotate-right.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/test.pdf
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/zoom-fit-best.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/zoom-fit-width.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/zoom-in.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/zoom-original.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/resources/zoom-out.svg
+%%QT_EXAMPLEDIR%%/pdf/singlepage/singlepage.pro
+%%QT_EXAMPLEDIR%%/pdf/singlepage/viewer.qml
+%%QT_EXAMPLEDIR%%/pdf/singlepage/viewer.qrc
 %%QT_EXAMPLEDIR%%/pdfwidgets/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc
@@ -3428,6 +3660,83 @@
 %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp
 %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h
 %%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro
+%%QT_EXAMPLEDIR%%/platforms/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/platforms/android/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/platforms/android/doc/images/portrait_java.png
+%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qml_in_android_studio_projects.qdoc
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.cpp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.qml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/build.gradle
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/AndroidManifest.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/Colors.java
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/MainActivity.java
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/layout/activity_main.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/colors.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/strings.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/styles.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/themes.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/backup_rules.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/data_extraction_rules.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/build.gradle
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle.properties
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle/wrapper/gradle-wrapper.properties
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/settings.gradle
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/build.gradle
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/AndroidManifest.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/java/com/example/qml_in_kotlin_based_android_project/Colors.kt
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/java/com/example/qml_in_kotlin_based_android_project/MainActivity.kt
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/layout/activity_main.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/colors.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/strings.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/styles.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/values/themes.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/xml/backup_rules.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/app/src/main/res/xml/data_extraction_rules.xml
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/build.gradle
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/gradle.properties
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/gradle/wrapper/gradle-wrapper.properties
+%%QT_EXAMPLEDIR%%/platforms/android/qml_in_kotlin_based_android_project/settings.gradle
 %%QT_EXAMPLEDIR%%/positioning/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/clientapplication.cpp
@@ -3503,21 +3812,20 @@
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/appmodel.h
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/doc/images/example-weatherinfo.png
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/doc/src/weatherinfo.qdoc
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/README.txt
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/qt_attribution.json
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-few-clouds.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-fog.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-haze.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-icy.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-overcast.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-showers-scattered.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-showers.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sleet.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-snow.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-storm.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sunny.png
-%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-thundershower.png
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/waypoint.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-few-clouds.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-fog.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-haze.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-icy.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-overcast.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-showers-scattered.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-showers.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sleet.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-snow.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-storm.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sunny-very-few-clouds.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-sunny.svg
+%%QT_EXAMPLEDIR%%/positioning/weatherinfo/icons/weather-thundershower.svg
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/main.cpp
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/openmeteobackend.cpp
 %%QT_EXAMPLEDIR%%/positioning/weatherinfo/openmeteobackend.h
@@ -3544,28 +3852,6 @@
 %%QT_EXAMPLEDIR%%/qmake/tutorial/hellowin.cpp
 %%QT_EXAMPLEDIR%%/qmake/tutorial/main.cpp
 %%QT_EXAMPLEDIR%%/qml/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/GenericSceneItem.qml
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/PaletteItem.qml
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/PerspectiveItem.qml
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/Sun.qml
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/src/dynamicscene.qdoc
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.pro
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qml
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qmlproject
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qrc
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/NOTE
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/face-smile.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/moon.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/rabbit_brown.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/rabbit_bw.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/star.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/sun.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/images/tree_s.png
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/itemCreation.js
-%%QT_EXAMPLEDIR%%/qml/dynamicscene/main.cpp
-%%QT_EXAMPLEDIR%%/qml/locale/locale.qml
 %%QT_EXAMPLEDIR%%/qml/qml-i18n/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qml/qml-i18n/doc/images/qml-i18n-example.png
 %%QT_EXAMPLEDIR%%/qml/qml-i18n/doc/src/i18n.qdoc
@@ -3579,8 +3865,6 @@
 %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject
 %%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qrc
 %%QT_EXAMPLEDIR%%/qml/qml.pro
-%%QT_EXAMPLEDIR%%/qml/qmldom/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/qmldom/qmldomloadeditwrite.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/advanced1-Base-project/CMakeLists.txt
@@ -3665,29 +3949,32 @@
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/qmldir.in
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/extending-qml-advanced.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/main.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.h
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/qmldir
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/main.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.h
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/qmldir
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/main.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.h
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/qmldir
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp
@@ -3695,8 +3982,9 @@
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/qmldir
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp
@@ -3704,6 +3992,8 @@
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/qmldir
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/App.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro
@@ -3714,10 +4004,10 @@
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/pieslice.h
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/qmldir
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.pro
-%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/main.cpp
+%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/qmldir
 %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/extending-qml.pro
 %%QT_EXAMPLEDIR%%/qml/tutorials/tutorials.pro
 %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter1/CMakeLists.txt
@@ -3735,13 +4025,6 @@
 %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter3/helloplugin.h
 %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter3/plugin.json
 %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter3/test.qml
-%%QT_EXAMPLEDIR%%/qmltest/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qmltest/qmltest.pro
-%%QT_EXAMPLEDIR%%/qmltest/qmltest/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/qmltest/qmltest/qmltest.pro
-%%QT_EXAMPLEDIR%%/qmltest/qmltest/tst_basic.qml
-%%QT_EXAMPLEDIR%%/qmltest/qmltest/tst_item.qml
-%%QT_EXAMPLEDIR%%/qmltest/qmltest/tst_qmltest.cpp
 %%QT_EXAMPLEDIR%%/qt3d/3d-text/3d-text.pro
 %%QT_EXAMPLEDIR%%/qt3d/3d-text/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/qt3d/3d-text/main.cpp
@@ -4014,17 +4297,6 @@
 %%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qmlproject
 %%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qrc
 %%QT_EXAMPLEDIR%%/quick/customitems/flipable/main.cpp
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_1.png
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_2.png
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/moon.png
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/main.cpp
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.cpp
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.h
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.pro
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.qml
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.qmlproject
-%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/maskedmousearea.qrc
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/TextBalloon/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/TextBalloon/plugin.h
@@ -4040,11 +4312,6 @@
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/painteditem.qrc
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/textballoons.qml
 %%QT_EXAMPLEDIR%%/quick/customitems/painteditem/textballoonuser.pro
-%%QT_EXAMPLEDIR%%/quick/delegatechooser/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.pro
-%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.qml
-%%QT_EXAMPLEDIR%%/quick/delegatechooser/main.cpp
-%%QT_EXAMPLEDIR%%/quick/delegatechooser/qml.qrc
 %%QT_EXAMPLEDIR%%/quick/draganddrop/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/draganddrop/doc/images/qml-draganddrop-example.png
 %%QT_EXAMPLEDIR%%/quick/draganddrop/doc/src/draganddrop.qdoc
@@ -4060,12 +4327,12 @@
 %%QT_EXAMPLEDIR%%/quick/draganddrop/views/Icon.qml
 %%QT_EXAMPLEDIR%%/quick/draganddrop/views/gridview.qml
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/Main.qml
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/doc/images/qml-embeddedinwidgets-example.jpg
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/doc/src/embeddedinwidgets.qdoc
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.pro
-%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.qrc
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/main.cpp
-%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/main.qml
+%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/qmldir
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/reflect.frag
 %%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/reflect.frag.qsb
 %%QT_EXAMPLEDIR%%/quick/imageelements/BorderImageSelector.qml
@@ -4330,14 +4597,6 @@
 %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/rotation.qml
 %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/sharing.qml
 %%QT_EXAMPLEDIR%%/quick/particles/imageparticle/sprites.qml
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/delegates.qml
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/images/rocket.png
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/itemparticle.pro
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/itemparticle.qml
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/itemparticle.qrc
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/main.cpp
-%%QT_EXAMPLEDIR%%/quick/particles/itemparticle/script.js
 %%QT_EXAMPLEDIR%%/quick/particles/particles.pro
 %%QT_EXAMPLEDIR%%/quick/particles/system/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/particles/system/doc/images/qml-system-example.png
@@ -4443,6 +4702,91 @@
 %%QT_EXAMPLEDIR%%/quick/quick-accessibility/main.cpp
 %%QT_EXAMPLEDIR%%/quick/quick-accessibility/quick-accessibility.pro
 %%QT_EXAMPLEDIR%%/quick/quick.pro
+%%QT_EXAMPLEDIR%%/quick/quickshapes/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/quickshapes.pro
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/arcDirection.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/arcRotation.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/capStyles.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/clippedtigers.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/cubicCurve.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/dashPattern.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/doc/images/qml-shapes-example.png
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/doc/src/shapes.qdoc
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/ellipticalArcs.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/fillRules.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/gradientSpreadModes.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/interactive.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/joinStyles.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/largeOrSmallArc.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/linearGradient.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/main.cpp
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/main.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/quadraticCurve.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/radialGradient.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/sampling.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/shapegallery.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/shapes.pro
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/shapes.qrc
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/strokeOrFill.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/tapableTriangle.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/text.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/tiger.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/tigerLoader.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/shapes/zoomtiger.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/BouncyShape.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Cloud.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithLightning.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithLightningAndRain_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithLightning_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithRain.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithRain_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithSnow.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/CloudWithSnow_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Cloud_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/DemoShape.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Europe.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Europe_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Gear.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Gear_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/MapLabel.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SettingsDrawer.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Sun.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindCloud.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindCloud_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindLargeCloud_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindRainCloud.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindRainCloud_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindSmallCloud.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/SunBehindSmallCloud_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/Sun_generated.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/Europe.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/OFL.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/WorkSans-Regular.ttf
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/apache.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/attribution.txt
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-and-rain-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-lightning-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-rain-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/cloud-with-snow-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/gear-alt-stroke.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-cloud-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-large-cloud-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-rain-cloud-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-behind-small-cloud-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/assets/sun-svgrepo-com.svg
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/doc/images/qml-weatherforecast-example.png
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/doc/images/settings.png
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/doc/images/zoomed.png
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/doc/src/weatherforecast.qdoc
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/main.cpp
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/main.qml
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/qt_attribution.json
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/qtquickcontrols2.conf
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/weatherforecast.pro
+%%QT_EXAMPLEDIR%%/quick/quickshapes/weatherforecast/weatherforecast.qrc
 %%QT_EXAMPLEDIR%%/quick/quickwidgets/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickwidgetversuswindow_opengl/doc/images/qquickwidgetversuswindow-opengl-example.jpg
@@ -4496,9 +4840,19 @@
 %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/rendercontrol_opengl.pro
 %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.cpp
 %%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_opengl/window_singlethreaded.h
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/demo.qml
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/doc/images/rendercontrol-rhi-example.jpg
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/doc/src/rendercontrol_rhi.qdoc
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/main.cpp
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/rendercontrol_rhi.pro
+%%QT_EXAMPLEDIR%%/quick/rendercontrol/rendercontrol_rhi/rendercontrol_rhi.qrc
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/doc/images/qtquicklayouts-example-responsivelayouts.png
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/doc/src/qtquickresponsiveLayouts-examples.qdoc
+%%QT_EXAMPLEDIR%%/quick/responsivelayouts/icons/grid.svg
+%%QT_EXAMPLEDIR%%/quick/responsivelayouts/icons/settings.svg
+%%QT_EXAMPLEDIR%%/quick/responsivelayouts/icons/text.svg
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/main.cpp
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/responsivelayouts.pro
 %%QT_EXAMPLEDIR%%/quick/responsivelayouts/responsivelayouts.qml
@@ -4602,20 +4956,25 @@
 %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.cpp
 %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.h
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/SettingsDrawer.qml
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/images/rhitextureitem-example.jpg
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/doc/src/rhitextureitem.qdoc
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/icon_settings.png
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/icon_settings@2x.png
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/icon_settings@3x.png
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/icon_settings@4x.png
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/main.cpp
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/main.qml
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/checker.frag.qsb
-%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/logo.frag.qsb
-%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/logo.vert.qsb
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/color.frag.qsb
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/prebuilts_for_qmake/color.vert.qsb
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.cpp
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.h
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.pro
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/rhitextureitem.qrc
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/checker.frag
-%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/logo.frag
-%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/logo.vert
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/color.frag
+%%QT_EXAMPLEDIR%%/quick/scenegraph/rhitextureitem/shaders/color.vert
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/images/rhiunderqml-example.jpg
 %%QT_EXAMPLEDIR%%/quick/scenegraph/rhiunderqml/doc/src/rhiunderqml.qdoc
@@ -4631,6 +4990,8 @@
 %%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.frag
 %%QT_EXAMPLEDIR%%/quick/scenegraph/shared/squircle_rhi.vert
 %%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/doc/images/threadedanimation-example.jpg
+%%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/doc/src/threadedanimation.qdoc
 %%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/main.cpp
 %%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/main.qml
 %%QT_EXAMPLEDIR%%/quick/scenegraph/threadedanimation/spinner.cpp
@@ -4697,44 +5058,12 @@
 %%QT_EXAMPLEDIR%%/quick/shadereffects/shadereffects.qml
 %%QT_EXAMPLEDIR%%/quick/shadereffects/shadereffects.qmlproject
 %%QT_EXAMPLEDIR%%/quick/shadereffects/shadereffects.qrc
-%%QT_EXAMPLEDIR%%/quick/shapes/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/quick/shapes/arcDirection.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/arcRotation.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/capStyles.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/clippedtigers.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/cubicCurve.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/dashPattern.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/doc/images/qml-shapes-example.png
-%%QT_EXAMPLEDIR%%/quick/shapes/doc/src/shapes.qdoc
-%%QT_EXAMPLEDIR%%/quick/shapes/ellipticalArcs.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/fillRules.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/gradientSpreadModes.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/interactive.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/joinStyles.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/largeOrSmallArc.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/linearGradient.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/main.cpp
-%%QT_EXAMPLEDIR%%/quick/shapes/main.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/quadraticCurve.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/radialGradient.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/sampling.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/shapegallery.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/shapes.pro
-%%QT_EXAMPLEDIR%%/quick/shapes/shapes.qrc
-%%QT_EXAMPLEDIR%%/quick/shapes/strokeOrFill.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/tapableTriangle.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/text.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/tiger.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/tigerLoader.qml
-%%QT_EXAMPLEDIR%%/quick/shapes/zoomtiger.qml
 %%QT_EXAMPLEDIR%%/quick/shared/Button.qml
 %%QT_EXAMPLEDIR%%/quick/shared/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick/shared/CheckBox.qml
-%%QT_EXAMPLEDIR%%/quick/shared/FlickrRssModel.qml
 %%QT_EXAMPLEDIR%%/quick/shared/Images.qml
 %%QT_EXAMPLEDIR%%/quick/shared/Label.qml
 %%QT_EXAMPLEDIR%%/quick/shared/LauncherList.qml
-%%QT_EXAMPLEDIR%%/quick/shared/QtBundleQmlModuleForMacOS.cmake
 %%QT_EXAMPLEDIR%%/quick/shared/README
 %%QT_EXAMPLEDIR%%/quick/shared/SimpleLauncherDelegate.qml
 %%QT_EXAMPLEDIR%%/quick/shared/Slider.qml
@@ -4886,12 +5215,7 @@
 %%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qrc
 %%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro
 %%QT_EXAMPLEDIR%%/quick/views/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/delegatemodel.qmlproject
 %%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml
-%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.pro
-%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.qrc
-%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/main.cpp
-%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/slideshow.qml
 %%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png
 %%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc
 %%QT_EXAMPLEDIR%%/quick/views/gridview/gridview-example.qml
@@ -5059,6 +5383,26 @@
 %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/main.qml
 %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/qml.qrc
 %%QT_EXAMPLEDIR%%/quick3d/dynamiccreation/weirdShape.mesh
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/ColorPicker.qml
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/Main.qml
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/SectionLayout.qml
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/doc/images/stencil_outline.jpg
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/doc/src/qtquick3d-examples-outline_extension.qdoc
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeExpanded.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeExpanded@2x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeExpanded@3x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeExpanded@4x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeUnexpanded.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeUnexpanded@2x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeUnexpanded@3x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/TreeUnexpanded@4x.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/images/grid_8x8.png
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/main.cpp
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/models/suzanne.mesh
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/outlinerenderextension.cpp
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/outlinerenderextension.h
+%%QT_EXAMPLEDIR%%/quick3d/extensions/stenciloutline/shaders/huesaturation.frag
 %%QT_EXAMPLEDIR%%/quick3d/hellocube/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick3d/hellocube/doc/images/hellocube.png
 %%QT_EXAMPLEDIR%%/quick3d/hellocube/doc/src/hellocube.qdoc
@@ -5140,6 +5484,8 @@
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/MaterialRed.qml
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/MaterialRedExtended.qml
+%%QT_EXAMPLEDIR%%/quick3d/offlineshaders/doc/images/offlineshaders-example.jpg
+%%QT_EXAMPLEDIR%%/quick3d/offlineshaders/doc/src/qtquick3d-examples-offlineshaders.qdoc
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/main.cpp
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/main.qml
 %%QT_EXAMPLEDIR%%/quick3d/offlineshaders/maps/metallic/basecolor.jpg
@@ -6004,8 +6350,6 @@
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-desktop.jpg
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/doc/images/qtquickcontrols-texteditor-touch.jpg
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/doc/src/qtquickcontrols-texteditor.qdoc
-%%QT_EXAMPLEDIR%%/quickcontrols/texteditor/documenthandler.cpp
-%%QT_EXAMPLEDIR%%/quickcontrols/texteditor/documenthandler.h
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/einstein.png
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/example.md
 %%QT_EXAMPLEDIR%%/quickcontrols/texteditor/fonts/fontello.ttf
@@ -6026,8 +6370,11 @@
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/DemoModeIndicator.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/FitnessPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/LauncherPage.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/ListHeaderItem.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/ListItem.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/Main.qml
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/NaviButton.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/MenuHeader.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/NavigationFallbackPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/NavigationPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/NotificationsPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/RouteElement.qml
@@ -6035,147 +6382,101 @@
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/SwipeViewPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/WeatherPage.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/WorldClockPage.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/fallbackroute.json
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/fitness.js
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/alarms.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/fitness.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/navigation.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/notifications.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/settings.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/weather.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36/worldclock.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/alarms.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/fitness.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/navigation.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/notifications.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/settings.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/weather.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/36x36@2/worldclock.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wearable/index.theme
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/back.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/back@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/back@3x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/back@4x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/background-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/background-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/home.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/home@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/home@3x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/home@4x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-end.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-end@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-leftturn-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-leftturn-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-leftturn-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-marker.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-rightturn-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-rightturn-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-rightturn-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-start.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-start@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-straight-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-straight-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-straight-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-straight-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-uturn.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/navigation-uturn@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarf-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarf-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarf-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarm-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarm-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-avatarm-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-missedcall-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-missedcall-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/notifications-missedcall-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-bluetooth-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-bluetooth-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-bluetooth-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-brightness-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-brightness-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-brightness-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-brightness-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-white.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode-white@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-demo-mode.svg
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-theme-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-theme-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-theme-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-theme-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-theme.svg
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-wifi-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-wifi-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-wifi-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/settings-wifi-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-humidity-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-humidity-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-humidity-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-humidity-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-pressure-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-pressure-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-pressure-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-pressure-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunrise-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunrise-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunrise-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunrise-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunset-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunset-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunset-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-sunset-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-temperature-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-temperature-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-temperature-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-temperature-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-wind-dark.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-wind-dark@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-wind-light.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/weather-wind-light@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-center.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-center@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-clock-night.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-clock-night@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-clock.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-second.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-second@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdaydial@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdayhour@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissdayminute@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnightdial@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnighthour@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissnightminute@2x.png
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/world-clock-swissseconds.png
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/back-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/back-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bearleft-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bearleft-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bearright-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bearright-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bell-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bell-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bluetooth-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/bluetooth-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/clock-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/clock-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/darkmode-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/darkmode-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/demomode-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/demomode-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/drop-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/drop-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/forward-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/forward-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/hearth-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/hearth-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/left-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/left-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/lightleft-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/lightleft-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/lightright-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/lightright-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/maps-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/maps-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/notification-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/notification-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/plus-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/plus-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/pressure-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/pressure-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/right-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/right-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/settings-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/settings-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sun-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sun-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sunrise-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sunrise-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sunset-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/sunset-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/thermometer-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/thermometer-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/uturnleft-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/uturnleft-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/uturnright-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/uturnright-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-few-clouds-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-few-clouds-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-fog-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-fog-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-haze-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-haze-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-icy-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-icy-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-overcast-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-overcast-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-showers-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-showers-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-showers-scattered-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-showers-scattered-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sleet-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sleet-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-snow-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-snow-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-storm-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-storm-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sunny-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sunny-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sunny-very-few-clouds-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-sunny-very-few-clouds-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-thundershower-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/weather-thundershower-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wifi-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wifi-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wind-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/wind-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/icons/yellowsun.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fallbackmap.png
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-running-light.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-dark.svg
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/images/fitness-man-walking-light.svg
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/navigation.js
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/notifications.js
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/qmldir
-%%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/walk_route.json
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/weather.js
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/Wearable/weather.json
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableSettings/CMakeLists.txt
@@ -6186,6 +6487,10 @@
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/Slider.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/Switch.qml
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/UIStyle.qml
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/fonts/OFL.txt
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/fonts/TitilliumWeb-Bold.ttf
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/fonts/TitilliumWeb-Regular.ttf
+%%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/fonts/TitilliumWeb-SemiBold.ttf
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/WearableStyle/qmldir
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/doc/images/qtquickcontrols-wearable.png
 %%QT_EXAMPLEDIR%%/quickcontrols/wearable/doc/src/qtquickcontrols-wearable.qdoc
@@ -6825,6 +7130,7 @@
 %%QT_EXAMPLEDIR%%/svg/textobject/textobject.pro
 %%QT_EXAMPLEDIR%%/svg/textobject/window.cpp
 %%QT_EXAMPLEDIR%%/svg/textobject/window.h
+%%QT_EXAMPLEDIR%%/tutorials/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmDelegate.qml
 %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmDialog.qml
 %%QT_EXAMPLEDIR%%/tutorials/alarms/AlarmModel.qml
@@ -6836,6 +7142,7 @@
 %%QT_EXAMPLEDIR%%/tutorials/alarms/main.qml
 %%QT_EXAMPLEDIR%%/tutorials/alarms/qml.qrc
 %%QT_EXAMPLEDIR%%/tutorials/alarms/qtquickcontrols2.conf
+%%QT_EXAMPLEDIR%%/tutorials/tutorials.pro
 %%QT_EXAMPLEDIR%%/uitools/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/uitools/doc/images/textfinder-example-userinterface.webp
 %%QT_EXAMPLEDIR%%/uitools/doc/src/textfinder.qdoc
@@ -7124,6 +7431,7 @@
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/FindBar.qml
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/FullScreenNotification.qml
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/Info.cmake.macos.plist
+%%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/WebAuthDialog.qml
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/doc/images/quicknanobrowser-demo.jpg
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/doc/src/quicknanobrowser.qdoc
 %%QT_EXAMPLEDIR%%/webenginequick/quicknanobrowser/icons/3rdparty/COPYING
@@ -7303,6 +7611,9 @@
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/simplebrowser.pro
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/tabwidget.cpp
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/tabwidget.h
+%%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webauthdialog.cpp
+%%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webauthdialog.h
+%%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webauthdialog.ui
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webpage.cpp
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webpage.h
 %%QT_EXAMPLEDIR%%/webenginewidgets/simplebrowser/webpopupwindow.cpp
@@ -7388,6 +7699,7 @@
 %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.h
 %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.pro
 %%QT_EXAMPLEDIR%%/websockets/sslechoserver/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/websockets/sslechoserver/generate.sh
 %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.cert
 %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.key
 %%QT_EXAMPLEDIR%%/websockets/sslechoserver/main.cpp
@@ -7488,8 +7800,6 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/images/completer-example-word.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/completer-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/dropsite-example.png
-%%QT_EXAMPLEDIR%%/widgets/doc/images/echoplugin.png
-%%QT_EXAMPLEDIR%%/widgets/doc/images/echopluginexample.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/geometry.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/graphicssimpleanchorlayout-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/icons_monkey.png
@@ -7501,7 +7811,7 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_48x48.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_64x64.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/icons_qt_extended_8x8.png
-%%QT_EXAMPLEDIR%%/widgets/doc/images/imagegestures-example.jpg
+%%QT_EXAMPLEDIR%%/widgets/doc/images/imagegestures-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel-indexes.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel-items.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/itemviews-editabletreemodel-model.png
@@ -7518,10 +7828,8 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/images/orderform-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/regexp-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/regularexpression-example.png
-%%QT_EXAMPLEDIR%%/widgets/doc/images/settingseditor-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/sipdialog-closed.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/sipdialog-opened.png
-%%QT_EXAMPLEDIR%%/widgets/doc/images/stylepluginexample.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/systemtray-editor.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/systemtray-example.png
 %%QT_EXAMPLEDIR%%/widgets/doc/images/treemodel-structure.png
@@ -7534,15 +7842,14 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/src/basicgraphicslayouts.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/basiclayouts.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/basicsortfiltermodel.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/blurpicker.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/calculator.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/calendarwidget.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/chip.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/collidingmice-example.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/coloreditorfactory.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/combowidgetmapper.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/completer.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/composition.qdoc
+%%QT_EXAMPLEDIR%%/widgets/doc/src/cuberhiwidget.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/customsortfiltermodel.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/deform.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/diagramscene.qdoc
@@ -7550,7 +7857,6 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/src/draggableicons.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/draggabletext.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/easing.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/echoplugin.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/editabletreemodel.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/elasticnodes.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/fetchmore.qdoc
@@ -7559,7 +7865,6 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/groupbox.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/imagecomposition.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/licensewizard.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/lineedits.qdoc
@@ -7570,17 +7875,15 @@
 %%QT_EXAMPLEDIR%%/widgets/doc/src/regularexpression.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/screenshot.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/scribble.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/settingseditor.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/shapedclock.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/shortcuteditor.qdoc
+%%QT_EXAMPLEDIR%%/widgets/doc/src/simplerhiwidget.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/simpletreemodel.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/sliders.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/spinboxdelegate.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/spinboxes.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/spreadsheet.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/standarddialogs.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/stardelegate.qdoc
-%%QT_EXAMPLEDIR%%/widgets/doc/src/styleplugin.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/syntaxhighlighter.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/tabdialog.qdoc
 %%QT_EXAMPLEDIR%%/widgets/doc/src/tablet.qdoc
@@ -7615,24 +7918,6 @@
 %%QT_EXAMPLEDIR%%/widgets/draganddrop/dropsite/dropsitewindow.cpp
 %%QT_EXAMPLEDIR%%/widgets/draganddrop/dropsite/dropsitewindow.h
 %%QT_EXAMPLEDIR%%/widgets/draganddrop/dropsite/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blureffect.cpp
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blureffect.h
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blurpicker.cpp
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blurpicker.h
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blurpicker.pro
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/blurpicker.qrc
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/README.txt
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/accessories-calculator.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/accessories-text-editor.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/background.jpg
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/help-browser.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/internet-group-chat.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/internet-mail.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/internet-web-browser.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/office-calendar.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/images/system-users.png
-%%QT_EXAMPLEDIR%%/widgets/effects/blurpicker/main.cpp
 %%QT_EXAMPLEDIR%%/widgets/gallery/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/gallery/gallery.pro
 %%QT_EXAMPLEDIR%%/widgets/gallery/main.cpp
@@ -7753,13 +8038,6 @@
 %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/main.cpp
 %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.cpp
 %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.h
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.h
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.cpp
-%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.h
 %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
 %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/main.cpp
@@ -7814,11 +8092,6 @@
 %%QT_EXAMPLEDIR%%/widgets/itemviews/simpletreemodel/treeitem.h
 %%QT_EXAMPLEDIR%%/widgets/itemviews/simpletreemodel/treemodel.cpp
 %%QT_EXAMPLEDIR%%/widgets/itemviews/simpletreemodel/treemodel.h
-%%QT_EXAMPLEDIR%%/widgets/itemviews/spinboxdelegate/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/itemviews/spinboxdelegate/delegate.cpp
-%%QT_EXAMPLEDIR%%/widgets/itemviews/spinboxdelegate/delegate.h
-%%QT_EXAMPLEDIR%%/widgets/itemviews/spinboxdelegate/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro
 %%QT_EXAMPLEDIR%%/widgets/itemviews/spreadsheet/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/itemviews/spreadsheet/images/interview.png
 %%QT_EXAMPLEDIR%%/widgets/itemviews/spreadsheet/main.cpp
@@ -7937,8 +8210,6 @@
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/arthurstyle.h
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/arthurwidgets.cpp
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/arthurwidgets.h
-%%QT_EXAMPLEDIR%%/widgets/painting/shared/fbopaintdevice.cpp
-%%QT_EXAMPLEDIR%%/widgets/painting/shared/fbopaintdevice.h
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/hoverpoints.cpp
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/hoverpoints.h
 %%QT_EXAMPLEDIR%%/widgets/painting/shared/images/bg_pattern.png
@@ -7994,6 +8265,29 @@
 %%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/collector.h
 %%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/foreignwindows.pro
 %%QT_EXAMPLEDIR%%/widgets/qnx/foreignwindows/main.cpp
+%%QT_EXAMPLEDIR%%/widgets/rhi/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/cube.h
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/cuberhiwidget.pro
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/cuberhiwidget.qrc
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/examplewidget.cpp
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/examplewidget.h
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/main.cpp
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/shader_assets/texture.frag.qsb
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/shader_assets/texture.vert.qsb
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/shaders/texture.frag
+%%QT_EXAMPLEDIR%%/widgets/rhi/cuberhiwidget/shaders/texture.vert
+%%QT_EXAMPLEDIR%%/widgets/rhi/rhi.pro
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/CMakeLists.txt
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/examplewidget.cpp
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/examplewidget.h
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/main.cpp
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/shader_assets/color.frag.qsb
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/shader_assets/color.vert.qsb
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/shaders/color.frag
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/shaders/color.vert
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/simplerhiwidget.pro
+%%QT_EXAMPLEDIR%%/widgets/rhi/simplerhiwidget/simplerhiwidget.qrc
 %%QT_EXAMPLEDIR%%/widgets/richtext/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/richtext/README
 %%QT_EXAMPLEDIR%%/widgets/richtext/orderform/CMakeLists.txt
@@ -8032,19 +8326,6 @@
 %%QT_EXAMPLEDIR%%/widgets/tools/customcompleter/resources/wordlist.txt
 %%QT_EXAMPLEDIR%%/widgets/tools/customcompleter/textedit.cpp
 %%QT_EXAMPLEDIR%%/widgets/tools/customcompleter/textedit.h
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echoplugin.pro
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/echointerface.h
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/echowindow.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/echowindow.h
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/echowindow.pro
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/echowindow/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/plugin/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/plugin/echoplugin.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/plugin/echoplugin.h
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/plugin/echoplugin.json
-%%QT_EXAMPLEDIR%%/widgets/tools/echoplugin/plugin/plugin.pro
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/images/copy.png
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/main.cpp
@@ -8052,33 +8333,6 @@
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/regularexpression.qrc
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/regularexpressiondialog.cpp
 %%QT_EXAMPLEDIR%%/widgets/tools/regularexpression/regularexpressiondialog.h
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/inifiles/licensepage.ini
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/inifiles/qsa.ini
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/locationdialog.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/locationdialog.h
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/mainwindow.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/mainwindow.h
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/settingseditor.pro
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/settingstree.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/settingstree.h
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/variantdelegate.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/settingseditor/variantdelegate.h
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/plugin.pro
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/simplestyle.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/simplestyle.h
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/simplestyle.json
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/simplestyleplugin.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/plugin/simplestyleplugin.h
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/styleplugin.pro
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/stylewindow/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/stylewindow/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/stylewindow/stylewindow.cpp
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/stylewindow/stylewindow.h
-%%QT_EXAMPLEDIR%%/widgets/tools/styleplugin/stylewindow/stylewindow.pro
 %%QT_EXAMPLEDIR%%/widgets/tools/tools.pro
 %%QT_EXAMPLEDIR%%/widgets/tools/treemodelcompleter/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/tools/treemodelcompleter/main.cpp
@@ -8218,11 +8472,6 @@
 %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/main.cpp
 %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.cpp
 %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.h
-%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/CMakeLists.txt
-%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/groupbox.pro
-%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/main.cpp
-%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.cpp
-%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.h
 %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/CMakeLists.txt
 %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/lineedits.pro
 %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/main.cpp
diff --git a/misc/slides/Makefile b/misc/slides/Makefile
index 68f222d97381..713e73260431 100644
--- a/misc/slides/Makefile
+++ b/misc/slides/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	slides
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	misc
 PKGNAMESUFFIX=	-presentation-tool
 
diff --git a/misc/timetrace/Makefile b/misc/timetrace/Makefile
index 2e7f0df9f3e1..4fe970cf86a4 100644
--- a/misc/timetrace/Makefile
+++ b/misc/timetrace/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	timetrace
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14.3
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	misc
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/misc/tvm/Makefile b/misc/tvm/Makefile
index 53b0c9cb83a0..4b79dc13c5d4 100644
--- a/misc/tvm/Makefile
+++ b/misc/tvm/Makefile
@@ -10,6 +10,8 @@ WWW=		https://tvm.ai/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	comilation fails: error: expected identifier before '__is_convertible'
+
 BUILD_DEPENDS=	dmlc-core>0:devel/dmlc-core \
 		rang>0:devel/rang
 TEST_DEPENDS=	googletest>0:devel/googletest
diff --git a/misc/wego/Makefile b/misc/wego/Makefile
index 6d229a27a665..80b531af0214 100644
--- a/misc/wego/Makefile
+++ b/misc/wego/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wego
 DISTVERSION=	2.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	misc
 
 MAINTAINER=	pkubaj@FreeBSD.org
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 8935222ca332..f4017dad1c87 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	aom
-DISTVERSION=	3.8.2
+DISTVERSION=	3.8.3
 CATEGORIES=	multimedia
 MASTER_SITES=	https://storage.googleapis.com/${PORTNAME}-releases/
 DISTNAME=	lib${PORTNAME}-${DISTVERSION}
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 7805b30e6188..535be5b983a8 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709943112
-SHA256 (libaom-3.8.2.tar.gz) = 98f7d6d7ddbf06d088735f5e51782df053fd1b08c553882c2924bd0b2021a202
-SIZE (libaom-3.8.2.tar.gz) = 5455275
+TIMESTAMP = 1717797526
+SHA256 (libaom-3.8.3.tar.gz) = 543d1260a64c9c144a7de49a86a113e207aa3fd4a9ad935f0248d7a6adb2c0f8
+SIZE (libaom-3.8.3.tar.gz) = 5458382
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index c2984851035b..120df6538dea 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -13,5 +13,5 @@ include/aom/aomdx.h
 lib/libaom.a
 lib/libaom.so
 lib/libaom.so.3
-lib/libaom.so.3.8.2
+lib/libaom.so.3.8.3
 libdata/pkgconfig/aom.pc
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 6087a8e428d1..359172ba1830 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -4,6 +4,9 @@ PORTREVISION=	4
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
+PATCH_SITES=	https://github.com/audacious-media-player/${PORTNAME}/commit/
+PATCHFILES=	1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch:-p1
+
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Plugins needed for audacious
 WWW=		https://audacious-media-player.org/
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index b780519174a2..3800d03357c6 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1682842744
+TIMESTAMP = 1716832065
 SHA256 (audacious-plugins-4.3.1.tar.bz2) = 2dea26e3af583a2d684df240b27b2b2932bcd653df4db500a85f4fe5d5fdc8a6
 SIZE (audacious-plugins-4.3.1.tar.bz2) = 1786114
+SHA256 (1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch) = 600eed6250c56327cc02c84c6b93ee44d011145e09e0e31b5ab4e68990aca78b
+SIZE (1f0bc4c6940d27905d11e3324e30c6a63fad6392.patch) = 1023
diff --git a/multimedia/emby-server-devel/Makefile b/multimedia/emby-server-devel/Makefile
index 9f39bb8e80fc..88d6bb49157f 100644
--- a/multimedia/emby-server-devel/Makefile
+++ b/multimedia/emby-server-devel/Makefile
@@ -1,5 +1,5 @@
 DISTVERSION=	4.9.0.12
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index dd3af98d0c3d..872bfd739657 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	emby-server
 DISTVERSION?=	4.8.3.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \
 		https://mediabrowser.github.io/embytools/
@@ -35,7 +35,7 @@ LIB_DEPENDS=	libaribb24.so:multimedia/aribb24 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
-		libmbedtls.so:security/mbedtls \
+		libgnutls.so:security/gnutls \
 		libmfx.so:multimedia/intel-media-sdk \
 		libOpenCL.so:devel/ocl-icd \
 		libogg.so:audio/libogg \
@@ -86,6 +86,7 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-xlib \
 		--enable-chromaprint \
 		--enable-fontconfig \
+		--enable-gnutls \
 		--enable-gpl \
 		--enable-iconv \
 		--enable-libaribb24 \
@@ -104,7 +105,6 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--enable-libx264 \
 		--enable-libx265 \
 		--enable-libzvbi \
-		--enable-mbedtls \
 		--enable-opencl \
 		--enable-optimizations \
 		--enable-static \
diff --git a/multimedia/libva-nvidia-driver/Makefile b/multimedia/libva-nvidia-driver/Makefile
index 4885d80db457..45fd7ecae7e7 100644
--- a/multimedia/libva-nvidia-driver/Makefile
+++ b/multimedia/libva-nvidia-driver/Makefile
@@ -1,16 +1,10 @@
 PORTNAME=	libva-nvidia-driver
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.11
+DISTVERSION=	0.0.12
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	8e8d49e11772.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	5dc46a5a2fab.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	22be7754bee5.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	119a5a3ac448.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	39c08a61a888.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	fc1afd905f8c.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
-PATCHFILES+=	97430842d11a.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/220
+PATCHFILES+=	27a41fc60989.patch:-p1 # https://github.com/elFarto/nvidia-vaapi-driver/pull/291
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	NVDEC-based backend for VAAPI
diff --git a/multimedia/libva-nvidia-driver/distinfo b/multimedia/libva-nvidia-driver/distinfo
index d91fd7debce4..cea7cb3d8b18 100644
--- a/multimedia/libva-nvidia-driver/distinfo
+++ b/multimedia/libva-nvidia-driver/distinfo
@@ -1,17 +1,5 @@
-TIMESTAMP = 1699098983
-SHA256 (elFarto-nvidia-vaapi-driver-v0.0.11_GH0.tar.gz) = 3e1ed95d7e2b2b1377c9cb59c3e7caaf960134694e9441e1d91c38f224d1d5d9
-SIZE (elFarto-nvidia-vaapi-driver-v0.0.11_GH0.tar.gz) = 182479
-SHA256 (8e8d49e11772.patch) = 7bba9dc7e96961a4e9b7046c192cfe0bde7d76c9765dd3df4ad4c0368378a427
-SIZE (8e8d49e11772.patch) = 1258
-SHA256 (5dc46a5a2fab.patch) = 9d63405e05f60ac702a3842def28645907b5319dbcea124f97b965344f27cbd2
-SIZE (5dc46a5a2fab.patch) = 3602
-SHA256 (22be7754bee5.patch) = c41d0f88ed773c751d4f515d6e537232a679cbc5d38e985cb77f422259c107a9
-SIZE (22be7754bee5.patch) = 1248
-SHA256 (119a5a3ac448.patch) = d6d981539ea4c6c3143532ad0182aa68b6df72a5c58232e3692247f8afbeff6f
-SIZE (119a5a3ac448.patch) = 2064
-SHA256 (39c08a61a888.patch) = c84fedb1e77f8465c44d48e4aefd9d78399b40c3f75ac3fa8b1ae730db285e4c
-SIZE (39c08a61a888.patch) = 990
-SHA256 (fc1afd905f8c.patch) = 2afb9e9d0ad86d1b8bf286dbc9921f98c2c2efb0a0353e47d031a90dac515e3d
-SIZE (fc1afd905f8c.patch) = 1229
-SHA256 (97430842d11a.patch) = 272c10f67ac344b83d87a8662eda6f18d6955157597e4171ba060455af0e5a6a
-SIZE (97430842d11a.patch) = 1289
+TIMESTAMP = 1714987945
+SHA256 (elFarto-nvidia-vaapi-driver-v0.0.12_GH0.tar.gz) = 435974aeab87cd2cd5c849d18ec4932d5bdf9d6f021385f185c9bf33d7cb2422
+SIZE (elFarto-nvidia-vaapi-driver-v0.0.12_GH0.tar.gz) = 183420
+SHA256 (27a41fc60989.patch) = c7d5e5ad7046707775d1d02ccb14b50efe6102354649a96786f6fcb03a45100e
+SIZE (27a41fc60989.patch) = 1649
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 7d86ab5d19db..c92c1bdcda14 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.14.0
+DISTVERSION=	1.14.1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index f360f9815cf6..086d4a0c583b 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704834742
-SHA256 (webmproject-libvpx-v1.14.0_GH0.tar.gz) = 5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa
-SIZE (webmproject-libvpx-v1.14.0_GH0.tar.gz) = 5606471
+TIMESTAMP = 1717012823
+SHA256 (webmproject-libvpx-v1.14.1_GH0.tar.gz) = 901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977
+SIZE (webmproject-libvpx-v1.14.1_GH0.tar.gz) = 5614104
diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh
index 64a1cd33a14b..df0284446bb8 100644
--- a/multimedia/libvpx/files/patch-build_make_configure.sh
+++ b/multimedia/libvpx/files/patch-build_make_configure.sh
@@ -2,12 +2,13 @@
 - Recognize DragonFly as x86_64-linux-gcc target by default
 - Don't override -march= on armv6, armv7 and aarch64
 
---- build/make/configure.sh.orig	2024-01-09 21:12:22 UTC
+--- build/make/configure.sh.orig	2024-05-29 20:00:23 UTC
 +++ build/make/configure.sh
-@@ -752,6 +752,14 @@ process_common_toolchain() {
+@@ -785,6 +785,14 @@ process_common_toolchain() {
+     case "$gcctarget" in
        aarch64*)
          tgt_isa=arm64
-         ;;
++        ;;
 +      armv6*-gnueabihf)
 +        tgt_isa=armv6
 +        float_abi=hard
@@ -15,11 +16,10 @@
 +      armv6*-gnueabi)
 +        tgt_isa=armv6
 +        float_abi=softfp
-+        ;;
+         ;;
        armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
          tgt_isa=armv7
-         float_abi=hard
-@@ -806,7 +814,7 @@ process_common_toolchain() {
+@@ -840,7 +848,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
@@ -28,16 +28,16 @@
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -997,7 +1005,7 @@ EOF
-             fi
-           done
-           ;;
--        armv7|armv7s)
-+        armv6|armv7|armv7s)
-           soft_enable neon
-           # Only enable neon_asm when neon is also enabled.
-           enabled neon && soft_enable neon_asm
-@@ -1017,29 +1025,6 @@ EOF
+@@ -1015,7 +1023,7 @@ EOF
+     arm*)
+       soft_enable runtime_cpu_detect
+ 
+-      if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
++      if [ ${tgt_isa} = "armv6" ] || [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
+         soft_enable neon
+         # Only enable neon_asm when neon is also enabled.
+         enabled neon && soft_enable neon_asm
+@@ -1033,29 +1041,6 @@ EOF
            arch_int=${tgt_isa##armv}
            arch_int=${arch_int%%te}
            tune_cflags="-mtune="
diff --git a/multimedia/libvpx/pkg-plist b/multimedia/libvpx/pkg-plist
index b48a4cc542fe..539cbb668a2c 100644
--- a/multimedia/libvpx/pkg-plist
+++ b/multimedia/libvpx/pkg-plist
@@ -15,5 +15,5 @@ lib/libvpx.a
 lib/libvpx.so
 lib/libvpx.so.9
 lib/libvpx.so.9.0
-lib/libvpx.so.9.0.0
+lib/libvpx.so.9.0.1
 libdata/pkgconfig/vpx.pc
diff --git a/multimedia/livego/Makefile b/multimedia/livego/Makefile
index bb7a8aaf6e9d..9258ef7c216d 100644
--- a/multimedia/livego/Makefile
+++ b/multimedia/livego/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	livego
 DISTVERSION=	0.0.15
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ba0bf5d8d902..552393743618 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mkvtoolnix
-PORTVERSION=	84.0
+PORTVERSION=	85.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 049ca1d64b33..f6299dec4a0d 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714316078
-SHA256 (mkvtoolnix-84.0.tar.xz) = e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a
-SIZE (mkvtoolnix-84.0.tar.xz) = 11325260
+TIMESTAMP = 1718430407
+SHA256 (mkvtoolnix-85.0.tar.xz) = 702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
+SIZE (mkvtoolnix-85.0.tar.xz) = 11326932
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
deleted file mode 100644
index ac924ca25017..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/sorting.h.orig	2024-04-28 10:37:21 UTC
-+++ src/common/sorting.h
-@@ -27,7 +27,7 @@ template<  typename Titer
- 
- template<  typename Titer
-          , typename Tcriterion_maker
--         , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
-+         , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
-          , typename Tcomparator = std::less<Tcriterion>
-          >
- void
diff --git a/multimedia/navidrome/Makefile b/multimedia/navidrome/Makefile
index 9dab483237d3..463c8446b052 100644
--- a/multimedia/navidrome/Makefile
+++ b/multimedia/navidrome/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	navidrome
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.50.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://people.freebsd.org/~kbowling/distfiles/:npmcache
 DISTFILES=	${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache
diff --git a/multimedia/qt5-multimedia/distinfo b/multimedia/qt5-multimedia/distinfo
index bf4069fad925..cf67333a839e 100644
--- a/multimedia/qt5-multimedia/distinfo
+++ b/multimedia/qt5-multimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771152
-SHA256 (KDE/Qt/5.15.13/kde-qtmultimedia-5.15.13p2.tar.xz) = 13effe1bdd58a6cb1f9e03972aca2ede3116cb08ff31eff27510298ac2704a13
-SIZE (KDE/Qt/5.15.13/kde-qtmultimedia-5.15.13p2.tar.xz) = 3789940
+TIMESTAMP = 1716930657
+SHA256 (KDE/Qt/5.15.14/kde-qtmultimedia-5.15.14p2.tar.xz) = 2746bb8ff29c52317a7165053ddc8a4acaf554a63da23dbea7836cc6a267d24a
+SIZE (KDE/Qt/5.15.14/kde-qtmultimedia-5.15.14p2.tar.xz) = 3792456
diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile
index 08660da6d670..8556d26cfdd2 100644
--- a/multimedia/qt6-multimedia/Makefile
+++ b/multimedia/qt6-multimedia/Makefile
@@ -11,18 +11,17 @@ LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
 
 USES=		cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6
 USE_GL=		opengl
-USE_QT=		base declarative
+USE_QT=		base declarative shadertools:build
 
+CFLAGS_powerpc=		-DPFFFT_SIMD_DISABLE
 CXXFLAGS_powerpc64=	-mvsx
-CFLAGS_powerpc=	-DPFFFT_SIMD_DISABLE
 
-OPTIONS_DEFINE=	FFMPEG GSTREAMER Q3D V4L VAAPI X11
-OPTIONS_DEFAULT=FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11
-OPTIONS_SINGLE=	AUDIO
+OPTIONS_DEFINE=		FFMPEG GSTREAMER Q3D V4L VAAPI X11
+OPTIONS_DEFAULT=	FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11
+AUDIO_DESC=		Low-level audio backend
+OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO
-OPTIONS_SUB=	yes
-
-AUDIO_DESC=		Low level Audio Backend
+OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	FEATURE_alsa
@@ -32,12 +31,16 @@ FFMPEG_CMAKE_BOOL=	FEATURE_ffmpeg
 
 GSTREAMER_USES=		gnome gstreamer:1
 GSTREAMER_USE=		GL=egl GNOME=glib20 GSTREAMER=bad,gl,good,ugly
-GSTREAMER_CMAKE_BOOL=	FEATURE_gstreamer
+GSTREAMER_CMAKE_BOOL=	FEATURE_gstreamer \
+			FEATURE_gstreamer_1_0 \
+			FEATURE_gstreamer_app \
+			FEATURE_gstreamer_gl \
+			FEATURE_gstreamer_photography
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	FEATURE_pulseaudio
 
-Q3D_DESC=		Spatial Audio via Quick3D
+Q3D_DESC=		Spatial audio support via QtQuick3D
 Q3D_USE=		QT=quick3d,shadertools
 Q3D_CMAKE_BOOL=		FEATURE_spatialaudio_quick3d
 
@@ -50,16 +53,11 @@ VAAPI_USE=		GL=egl
 VAAPI_CMAKE_BOOL=	FEATURE_vaapi
 VAAPI_IMPLIES=		FFMPEG
 
+# We assume that the Qt stack has been built with consistent X11 options.
+# QT_FEATURE_xlib is defined globally by devel/qt6-base based upon whether
+# the X11 option was enabled in that port.
 X11_USES=		xorg
 X11_USE=		XORG=x11,xext,xrandr
-X11_CMAKE_BOOL=		FEATURE_xlib
 X11_IMPLIES=		FFMPEG
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if !(${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MGSTREAMER})
-	@${REINPLACE_CMD} '/MultimediaPlugins\.cmake/d' ${TMPPLIST}
-.endif
-
 .include <bsd.port.mk>
diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo
index 5becbb32f2b0..3c617b1ab066 100644
--- a/multimedia/qt6-multimedia/distinfo
+++ b/multimedia/qt6-multimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663460
-SHA256 (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = be00f830d2b14c9a12f3b6812ba3a23fdaaceb2dd9c1c6394c329c8bf6e53ab2
-SIZE (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = 8266612
+TIMESTAMP = 1718779141
+SHA256 (KDE/Qt/6.7.2/qtmultimedia-everywhere-src-6.7.2.tar.xz) = 8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3
+SIZE (KDE/Qt/6.7.2/qtmultimedia-everywhere-src-6.7.2.tar.xz) = 8451800
diff --git a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake
new file mode 100644
index 000000000000..a9d7f64fcd4a
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindFFmpeg.cmake.orig	2024-06-03 15:20:28 UTC
++++ cmake/FindFFmpeg.cmake
+@@ -253,7 +253,7 @@ function(__ffmpeg_internal_set_dependencies _component
+ # and adds them to the target library.
+ function(__ffmpeg_internal_set_dependencies _component)
+   string(TOLOWER ${_component} lib)
+-  set(PC_FILE ${${_component}_LIBRARY_DIR}/pkgconfig/lib${lib}.pc)
++  set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc)
+   if(EXISTS ${PC_FILE})
+     file(READ ${PC_FILE} pcfile)
+ 
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt
new file mode 100644
index 000000000000..d8399f5e1ab1
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/multimedia/CMakeLists.txt.orig	2024-06-08 01:28:28 UTC
++++ src/multimedia/CMakeLists.txt
+@@ -109,7 +109,7 @@ qt_internal_extend_target(Multimedia
+ )
+ 
+ qt_internal_extend_target(Multimedia
+-    CONDITION LINUX OR ANDROID
++    CONDITION UNIX OR ANDROID
+     SOURCES qsymbolsresolveutils.cpp qsymbolsresolveutils_p.h)
+ 
+ qt_internal_add_simd_part(Multimedia SIMD sse2
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
index 6dc30b473b06..73e33bafa6ef 100644
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
@@ -1,6 +1,6 @@
---- src/multimedia/configure.cmake.orig	2024-03-19 05:09:26 UTC
+--- src/multimedia/configure.cmake.orig	2024-06-08 01:28:28 UTC
 +++ src/multimedia/configure.cmake
-@@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE
+@@ -80,7 +80,7 @@ qt_feature("ffmpeg" PRIVATE
      LABEL "FFmpeg"
      ENABLE INPUT_ffmpeg STREQUAL 'yes'
      DISABLE INPUT_ffmpeg STREQUAL 'no'
@@ -9,12 +9,3 @@
  )
  qt_feature("alsa" PUBLIC PRIVATE
      LABEL "ALSA (experimental)"
-@@ -101,7 +101,7 @@ qt_feature("gstreamer_1_0" PRIVATE
- )
- qt_feature("gstreamer_1_0" PRIVATE
-     LABEL "GStreamer 1.0"
--    CONDITION ( LINUX AND GStreamer_FOUND )
-+    CONDITION GStreamer_FOUND
-     ENABLE INPUT_gstreamer STREQUAL 'yes'
-     DISABLE INPUT_gstreamer STREQUAL 'no'
- )
diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt
new file mode 100644
index 000000000000..b0d7b6d77a7d
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig	2024-06-08 01:28:28 UTC
++++ src/plugins/multimedia/ffmpeg/CMakeLists.txt
+@@ -82,7 +82,7 @@ qt_internal_add_plugin(QFFmpegMediaPlugin
+         Qt::CorePrivate
+ )
+ 
+-if (LINUX OR ANDROID)
++if (UNIX OR ANDROID)
+     # We have 2 options: link shared stubs to QFFmpegMediaPlugin vs
+     # static compilation of the needed stubs to the FFmpeg plugin.
+     # Currently, we chose the second option so that user could trivially
diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_cmake_QtAddFFmpegStubs.cmake b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_cmake_QtAddFFmpegStubs.cmake
new file mode 100644
index 000000000000..34b4040433e4
--- /dev/null
+++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_cmake_QtAddFFmpegStubs.cmake
@@ -0,0 +1,11 @@
+--- src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake.orig	2024-06-03 15:20:28 UTC
++++ src/plugins/multimedia/ffmpeg/cmake/QtAddFFmpegStubs.cmake
+@@ -17,7 +17,7 @@ function(qt_internal_multimedia_check_ffmpeg_stubs_con
+ endfunction()
+ 
+ function(qt_internal_multimedia_check_ffmpeg_stubs_configuration)
+-    if (NOT LINUX AND NOT ANDROID)
++    if (NOT UNIX AND NOT ANDROID)
+         message(FATAL_ERROR "Currently, stubs are supported on Linux and Android")
+     endif()
+ 
diff --git a/multimedia/qt6-multimedia/pkg-help b/multimedia/qt6-multimedia/pkg-help
new file mode 100644
index 000000000000..c6f087279d66
--- /dev/null
+++ b/multimedia/qt6-multimedia/pkg-help
@@ -0,0 +1,2 @@
+The X11 option should only be enabled if the FFMPEG option is also
+enabled and devel/qt6-base has been built with the X11 option enabled.
diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist
index 6e320bc0920e..20f2ee0920f8 100644
--- a/multimedia/qt6-multimedia/pkg-plist
+++ b/multimedia/qt6-multimedia/pkg-plist
@@ -3,6 +3,7 @@
 %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosink_p.h
 %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosource_p.h
 %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsamediadevices_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodecoder_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevice_p.h
 %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h
@@ -13,7 +14,10 @@
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcameradevice_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qerrorinfo_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamer_platformspecificinterface_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmaybe_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacapturesession_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h
@@ -43,9 +47,9 @@
 %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiosource_p.h
 %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulsehelpers_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsymbolsresolveutils_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
-%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtvideo_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconverter_p.h
@@ -81,6 +85,7 @@
 %%QT_INCDIR%%/QtMultimedia/QVideoSink
 %%QT_INCDIR%%/QtMultimedia/QWaveDecoder
 %%QT_INCDIR%%/QtMultimedia/QWindowCapture
+%%QT_INCDIR%%/QtMultimedia/QtAudio
 %%QT_INCDIR%%/QtMultimedia/QtMultimedia
 %%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends
 %%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion
@@ -107,11 +112,12 @@
 %%QT_INCDIR%%/QtMultimedia/qmediatimerange.h
 %%QT_INCDIR%%/QtMultimedia/qscreencapture.h
 %%QT_INCDIR%%/QtMultimedia/qsoundeffect.h
+%%QT_INCDIR%%/QtMultimedia/qtaudio.h
 %%QT_INCDIR%%/QtMultimedia/qtmultimedia-config.h
-%%QT_INCDIR%%/QtMultimedia/qtmultimediadefs.h
 %%QT_INCDIR%%/QtMultimedia/qtmultimediaexports.h
 %%QT_INCDIR%%/QtMultimedia/qtmultimediaglobal.h
 %%QT_INCDIR%%/QtMultimedia/qtmultimediaversion.h
+%%QT_INCDIR%%/QtMultimedia/qtvideo.h
 %%QT_INCDIR%%/QtMultimedia/qvideoframe.h
 %%QT_INCDIR%%/QtMultimedia/qvideoframeformat.h
 %%QT_INCDIR%%/QtMultimedia/qvideosink.h
@@ -139,11 +145,42 @@
 %%QT_INCDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsDepends
 %%QT_INCDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsVersion
 %%QT_INCDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.h
-%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetdefs.h
 %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsexports.h
 %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsglobal.h
 %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h
 %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidget.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qglist_helper_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_debug_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_handle_types_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstappsource_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstpipeline_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiodecoder_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiodevice_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudioinput_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiooutput_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerbufferprobe_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamercamera_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerformatinfo_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerimagecapture_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerintegration_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediacapture_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediaencoder_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediaplayer_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermessage_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermetadata_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideodevices_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideooutput_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideooverlay_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideosink_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstsubtitlesink_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstutils_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstvideobuffer_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstvideorenderersink_p.h
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPlugin
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPluginDepends
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPluginVersion
+%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/qtqgstreamermediapluginversion.h
 %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3dambientsound_p.h
 %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudioengine_p.h
 %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudiolistener_p.h
@@ -232,6 +269,14 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsDependencies.cmake
 lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake
 lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateAdditionalTargetInfo.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfig.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfigVersion.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfigVersionImpl.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateDependencies.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateTargets.cmake
+%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateVersionlessTargets.cmake
 %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake
 %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake
 %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake
@@ -273,6 +318,8 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
 %%QT_LIBDIR%%/libQt6MultimediaWidgets.so
 %%QT_LIBDIR%%/libQt6MultimediaWidgets.so.6
 %%QT_LIBDIR%%/libQt6MultimediaWidgets.so.%%FULLVER%%
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt6QGstreamerMediaPlugin.a
+%%GSTREAMER%%%%QT_LIBDIR%%/libQt6QGstreamerMediaPlugin.prl
 %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.prl
 %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so
 %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so.6
@@ -284,6 +331,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6multimedia_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6multimediaquickprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6multimediawidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
+%%GSTREAMER%%%%QT_LIBDIR%%/metatypes/qt6qgstreamermediapluginprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%Q3D%%%%QT_LIBDIR%%/metatypes/qt6quick3dspatialaudioprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6spatialaudio_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri
@@ -291,6 +339,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_multimediaquick_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri
+%%GSTREAMER%%%%QT_MKSPECDIR%%/modules/qt_lib_qgstreamermediaplugin_private.pri
 %%Q3D%%%%QT_MKSPECDIR%%/modules/qt_lib_quick3dspatialaudio_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio_private.pri
@@ -309,5 +358,6 @@ libdata/pkgconfig/Qt6SpatialAudio.pc
 %%QT_DATADIR%%/modules/Multimedia.json
 %%QT_DATADIR%%/modules/MultimediaQuickPrivate.json
 %%QT_DATADIR%%/modules/MultimediaWidgets.json
+%%GSTREAMER%%%%QT_DATADIR%%/modules/QGstreamerMediaPluginPrivate.json
 %%Q3D%%%%QT_DATADIR%%/modules/Quick3DSpatialAudioPrivate.json
 %%QT_DATADIR%%/modules/SpatialAudio.json
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index 48150a37f61e..28ebdac7afc1 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1698027802
+TIMESTAMP = 1716010198
 SHA256 (x265-3.5.tar.gz) = 8a5fcfddb3e2db520b637e475a507fb00117d554bdb3204c5828626d888c306a
 SIZE (x265-3.5.tar.gz) = 1538610
-SHA256 (x265-asm-warnings.patch) = 0faa3278887a47ed8c968c994e4cc71a2921aac38f5d560dae898124f806871d
+SHA256 (x265-asm-warnings.patch) = 3bde0e0553498fa569e3472e6a12ec7110743e9e0c43e1b14c499d62608393bf
 SIZE (x265-asm-warnings.patch) = 4526
diff --git a/net-im/conduit/Makefile b/net-im/conduit/Makefile
index 4a594a6313b6..514f1aac5f82 100644
--- a/net-im/conduit/Makefile
+++ b/net-im/conduit/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	conduit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
-PORTREVISION=	6
+DISTVERSION=	0.8.0
 CATEGORIES=	net-im
 PKGNAMEPREFIX=	matrix-
 
@@ -15,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_powerpc64le=	compilation failure: called `Option::unwrap()` on a `None` value in ring-0.16.20/build.rs: # see https://gitlab.com/famedly/conduit/-/issues/416
 
 BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT}
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		cargo gmake
 USE_RC_SUBR=	${PORTNAME}
@@ -31,7 +31,7 @@ DBDIR=		/var/db/${PORTNAME}
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	famedly
-GL_TAGNAME=	0c2cfda3ae923d9e922d5edf379e4d8976a52d4e
+GL_TAGNAME=	7a5b8930134cf7ea5ff9880e6fa468b2b3e05c98
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/conduit.toml,${PREFIX}/etc/conduit.toml,' \
@@ -40,6 +40,8 @@ post-patch:
 		${WRKSRC}/conduit-example.toml
 
 post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/conduit-example.toml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.toml.sample
 	@${MKDIR} ${STAGEDIR}${DBDIR}
 
diff --git a/net-im/conduit/Makefile.crates b/net-im/conduit/Makefile.crates
index 3ca29504bddc..3becf165fd41 100644
--- a/net-im/conduit/Makefile.crates
+++ b/net-im/conduit/Makefile.crates
@@ -1,356 +1,367 @@
-CARGO_CRATES=	adler-1.0.2 \
-		ahash-0.8.3 \
-		aho-corasick-1.0.2 \
-		allocator-api2-0.2.15 \
-		anstyle-1.0.1 \
-		arc-swap-1.6.0 \
+CARGO_CRATES=	addr2line-0.22.0 \
+		adler-1.0.2 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.3 \
+		anstyle-1.0.7 \
+		anyhow-1.0.86 \
+		arc-swap-1.7.1 \
 		arrayref-0.3.7 \
 		arrayvec-0.7.4 \
+		as_variant-1.2.0 \
 		assign-1.1.1 \
-		async-trait-0.1.68 \
-		atomic-0.5.3 \
-		autocfg-1.1.0 \
-		axum-0.6.18 \
+		async-stream-0.3.5 \
+		async-stream-impl-0.3.5 \
+		async-trait-0.1.80 \
+		atomic-0.6.0 \
+		atomic-waker-1.1.2 \
+		autocfg-1.3.0 \
+		axum-0.6.20 \
+		axum-0.7.5 \
 		axum-core-0.3.4 \
-		axum-server-0.5.1 \
-		base64-0.13.1 \
-		base64-0.21.2 \
+		axum-core-0.4.3 \
+		axum-extra-0.9.3 \
+		axum-server-0.6.0 \
+		backtrace-0.3.72 \
+		base64-0.21.7 \
+		base64-0.22.1 \
 		base64ct-1.6.0 \
-		bincode-1.3.3 \
-		bindgen-0.65.1 \
+		bindgen-0.69.4 \
 		bitflags-1.3.2 \
-		bitflags-2.3.2 \
-		blake2b_simd-1.0.1 \
-		block-buffer-0.9.0 \
+		bitflags-2.5.0 \
+		blake2b_simd-1.0.2 \
 		block-buffer-0.10.4 \
-		bumpalo-3.13.0 \
-		bytemuck-1.13.1 \
-		byteorder-1.4.3 \
-		bytes-1.4.0 \
+		bumpalo-3.16.0 \
+		bytemuck-1.16.0 \
+		byteorder-1.5.0 \
+		bytes-1.6.0 \
 		bzip2-sys-0.1.11+1.0.8 \
-		cc-1.0.79 \
+		cc-1.0.98 \
 		cexpr-0.6.0 \
 		cfg-if-1.0.0 \
-		clang-sys-1.6.1 \
-		clap-4.3.8 \
-		clap_builder-4.3.8 \
-		clap_derive-4.3.2 \
-		clap_lex-0.5.0 \
+		cfg_aliases-0.1.1 \
+		clang-sys-1.8.1 \
+		clap-4.5.4 \
+		clap_builder-4.5.2 \
+		clap_derive-4.5.4 \
+		clap_lex-0.7.0 \
 		color_quant-1.1.0 \
-		const-oid-0.9.2 \
+		const-oid-0.9.6 \
 		const_panic-0.2.8 \
-		constant_time_eq-0.1.5 \
-		constant_time_eq-0.2.6 \
-		core-foundation-0.9.3 \
-		core-foundation-sys-0.8.4 \
-		cpufeatures-0.2.8 \
-		crc-3.0.1 \
-		crc-catalog-2.2.0 \
-		crc32fast-1.3.2 \
-		crossbeam-0.8.2 \
-		crossbeam-channel-0.5.8 \
-		crossbeam-deque-0.8.3 \
-		crossbeam-epoch-0.9.15 \
-		crossbeam-queue-0.3.8 \
-		crossbeam-utils-0.8.16 \
+		constant_time_eq-0.3.0 \
+		core-foundation-0.9.4 \
+		core-foundation-sys-0.8.6 \
+		cpufeatures-0.2.12 \
+		crc-3.2.1 \
+		crc-catalog-2.4.0 \
+		crc32fast-1.4.2 \
+		crossbeam-channel-0.5.13 \
+		crossbeam-utils-0.8.20 \
 		crypto-common-0.1.6 \
-		curve25519-dalek-3.2.0 \
-		dashmap-5.4.0 \
-		data-encoding-2.4.0 \
-		der-0.6.1 \
-		digest-0.9.0 \
+		curve25519-dalek-4.1.2 \
+		curve25519-dalek-derive-0.1.1 \
+		data-encoding-2.6.0 \
+		date_header-1.0.5 \
+		der-0.7.9 \
+		deranged-0.3.11 \
 		digest-0.10.7 \
-		directories-4.0.1 \
-		dirs-sys-0.3.7 \
-		ed25519-1.5.3 \
-		ed25519-dalek-1.0.1 \
-		either-1.8.1 \
-		encoding_rs-0.8.32 \
-		enum-as-inner-0.5.1 \
-		equivalent-1.0.0 \
-		fallible-iterator-0.2.0 \
+		directories-5.0.1 \
+		dirs-sys-0.4.1 \
+		ed25519-2.2.3 \
+		ed25519-dalek-2.1.1 \
+		either-1.12.0 \
+		enum-as-inner-0.6.0 \
+		equivalent-1.0.1 \
+		fallible-iterator-0.3.0 \
 		fallible-streaming-iterator-0.1.9 \
-		fdeflate-0.3.0 \
-		figment-0.10.10 \
-		flate2-1.0.26 \
+		fdeflate-0.3.4 \
+		fiat-crypto-0.2.9 \
+		figment-0.10.19 \
+		flate2-1.0.30 \
 		fnv-1.0.7 \
-		form_urlencoded-1.2.0 \
+		form_urlencoded-1.2.1 \
 		fs2-0.4.3 \
-		futures-0.3.28 \
-		futures-channel-0.3.28 \
-		futures-core-0.3.28 \
-		futures-executor-0.3.28 \
-		futures-io-0.3.28 \
-		futures-macro-0.3.28 \
-		futures-sink-0.3.28 \
-		futures-task-0.3.28 \
-		futures-util-0.3.28 \
+		futures-channel-0.3.30 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-io-0.3.30 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-util-0.3.30 \
 		generic-array-0.14.7 \
-		getrandom-0.1.16 \
-		getrandom-0.2.10 \
-		gif-0.12.0 \
+		getrandom-0.2.15 \
+		gif-0.13.1 \
+		gimli-0.29.0 \
 		glob-0.3.1 \
-		h2-0.3.19 \
+		h2-0.3.26 \
+		h2-0.4.5 \
 		hashbrown-0.12.3 \
-		hashbrown-0.14.0 \
-		hashlink-0.8.3 \
-		headers-0.3.8 \
-		headers-core-0.2.0 \
+		hashbrown-0.14.5 \
+		hashlink-0.9.1 \
+		headers-0.4.0 \
+		headers-core-0.3.0 \
 		heck-0.4.1 \
-		hermit-abi-0.2.6 \
+		heck-0.5.0 \
+		hermit-abi-0.3.9 \
+		hickory-proto-0.24.1 \
+		hickory-resolver-0.24.1 \
 		hmac-0.12.1 \
 		hostname-0.3.1 \
-		http-0.2.9 \
-		http-body-0.4.5 \
-		http-range-header-0.3.0 \
+		http-0.2.12 \
+		http-1.1.0 \
+		http-body-0.4.6 \
+		http-body-1.0.0 \
+		http-body-util-0.1.1 \
 		httparse-1.8.0 \
-		httpdate-1.0.2 \
-		hyper-0.14.26 \
-		hyper-rustls-0.23.2 \
-		idna-0.2.3 \
+		httpdate-1.0.3 \
+		hyper-0.14.29 \
+		hyper-1.3.1 \
+		hyper-rustls-0.26.0 \
+		hyper-timeout-0.4.1 \
+		hyper-util-0.1.5 \
 		idna-0.4.0 \
-		image-0.24.6 \
+		idna-0.5.0 \
+		image-0.25.1 \
 		indexmap-1.9.3 \
-		indexmap-2.0.0 \
+		indexmap-2.2.6 \
 		inlinable_string-0.1.15 \
-		integer-encoding-3.0.4 \
 		ipconfig-0.3.2 \
-		ipnet-2.7.2 \
-		itertools-0.11.0 \
-		itoa-1.0.6 \
-		jobserver-0.1.26 \
-		jpeg-decoder-0.3.0 \
-		js-sys-0.3.64 \
+		ipnet-2.9.0 \
+		itertools-0.12.1 \
+		itoa-1.0.11 \
+		jobserver-0.1.31 \
+		js-sys-0.3.69 \
 		js_int-0.2.2 \
 		js_option-0.1.1 \
-		jsonwebtoken-8.3.0 \
-		konst-0.3.5 \
-		konst_kernel-0.3.5 \
+		jsonwebtoken-9.3.0 \
+		konst-0.3.9 \
+		konst_kernel-0.3.9 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
-		libc-0.2.146 \
-		libloading-0.7.4 \
-		librocksdb-sys-0.11.0+8.1.1 \
-		libsqlite3-sys-0.26.0 \
-		libz-sys-1.1.9 \
+		libc-0.2.155 \
+		libloading-0.8.3 \
+		libredox-0.1.3 \
+		libsqlite3-sys-0.28.0 \
+		libz-sys-1.1.18 \
 		linked-hash-map-0.5.6 \
-		lmdb-rkv-sys-0.11.2 \
-		lock_api-0.4.10 \
-		log-0.4.19 \
+		lock_api-0.4.12 \
+		log-0.4.21 \
 		lru-cache-0.1.2 \
 		lz4-sys-1.9.4 \
 		maplit-1.0.2 \
 		match_cfg-0.1.0 \
 		matchers-0.1.0 \
-		matches-0.1.10 \
-		matchit-0.7.0 \
-		memchr-2.5.0 \
-		memoffset-0.7.1 \
-		memoffset-0.9.0 \
+		matchit-0.7.3 \
+		memchr-2.7.2 \
 		mime-0.3.17 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.7.1 \
-		mio-0.8.8 \
-		nix-0.26.2 \
+		miniz_oxide-0.7.3 \
+		mio-0.8.11 \
+		nix-0.28.0 \
 		nom-7.1.3 \
 		nu-ansi-term-0.46.0 \
-		num-bigint-0.4.3 \
-		num-integer-0.1.45 \
-		num-rational-0.4.1 \
-		num-traits-0.2.15 \
-		num_cpus-1.15.0 \
-		once_cell-1.18.0 \
-		opaque-debug-0.3.0 \
+		num-bigint-0.4.5 \
+		num-conv-0.1.0 \
+		num-integer-0.1.46 \
+		num-traits-0.2.19 \
+		num_cpus-1.16.0 \
+		object-0.35.0 \
+		once_cell-1.19.0 \
 		openssl-probe-0.1.5 \
-		opentelemetry-0.18.0 \
-		opentelemetry-jaeger-0.17.0 \
-		opentelemetry-semantic-conventions-0.10.0 \
-		opentelemetry_api-0.18.0 \
-		opentelemetry_sdk-0.18.0 \
-		ordered-float-1.1.1 \
+		opentelemetry-0.22.0 \
+		opentelemetry-jaeger-propagator-0.1.0 \
+		opentelemetry-otlp-0.15.0 \
+		opentelemetry-proto-0.5.0 \
+		opentelemetry-semantic-conventions-0.14.0 \
+		opentelemetry_sdk-0.22.1 \
+		option-ext-0.2.0 \
+		ordered-float-4.2.0 \
 		overload-0.1.1 \
-		page_size-0.4.2 \
-		parking_lot-0.12.1 \
-		parking_lot_core-0.9.8 \
-		paste-1.0.12 \
-		pear-0.2.4 \
-		pear_codegen-0.2.4 \
-		peeking_take_while-0.1.2 \
-		pem-1.1.1 \
-		percent-encoding-2.3.0 \
-		persy-1.4.4 \
-		pin-project-1.1.0 \
-		pin-project-internal-1.1.0 \
-		pin-project-lite-0.2.9 \
+		parking_lot-0.12.3 \
+		parking_lot_core-0.9.10 \
+		pear-0.2.9 \
+		pear_codegen-0.2.9 \
+		pem-3.0.4 \
+		percent-encoding-2.3.1 \
+		persy-1.5.0 \
+		pin-project-1.1.5 \
+		pin-project-internal-1.1.5 \
+		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
-		pkcs8-0.9.0 \
-		pkg-config-0.3.27 \
-		png-0.17.9 \
+		pkcs8-0.10.2 \
+		pkg-config-0.3.30 \
+		platforms-3.4.0 \
+		png-0.17.13 \
+		powerfmt-0.2.0 \
 		ppv-lite86-0.2.17 \
-		prettyplease-0.2.9 \
-		proc-macro-crate-1.3.1 \
-		proc-macro2-1.0.61 \
-		proc-macro2-diagnostics-0.10.0 \
+		proc-macro-crate-3.1.0 \
+		proc-macro2-1.0.85 \
+		proc-macro2-diagnostics-0.10.1 \
+		prost-0.12.6 \
+		prost-derive-0.12.6 \
 		quick-error-1.2.3 \
-		quote-1.0.28 \
-		rand-0.7.3 \
+		quote-1.0.36 \
 		rand-0.8.5 \
-		rand_chacha-0.2.2 \
 		rand_chacha-0.3.1 \
-		rand_core-0.5.1 \
 		rand_core-0.6.4 \
-		rand_hc-0.2.0 \
-		redox_syscall-0.2.16 \
-		redox_syscall-0.3.5 \
-		redox_users-0.4.3 \
-		regex-1.8.4 \
+		redox_syscall-0.5.1 \
+		redox_users-0.4.5 \
+		regex-1.10.4 \
 		regex-automata-0.1.10 \
+		regex-automata-0.4.6 \
 		regex-syntax-0.6.29 \
-		regex-syntax-0.7.2 \
+		regex-syntax-0.8.3 \
+		reqwest-0.12.4 \
 		resolv-conf-0.7.0 \
-		ring-0.16.20 \
-		rocksdb-0.21.0 \
-		rusqlite-0.29.0 \
-		rust-argon2-1.0.0 \
+		ring-0.17.8 \
+		rusqlite-0.31.0 \
+		rust-argon2-2.1.0 \
+		rust-librocksdb-sys-0.21.0+9.1.1 \
+		rust-rocksdb-0.25.0 \
+		rustc-demangle-0.1.24 \
 		rustc-hash-1.1.0 \
-		rustls-0.20.8 \
-		rustls-0.21.2 \
-		rustls-native-certs-0.6.3 \
-		rustls-pemfile-0.2.1 \
-		rustls-pemfile-1.0.2 \
-		rustls-webpki-0.100.1 \
-		rustversion-1.0.12 \
-		ryu-1.0.13 \
-		schannel-0.1.21 \
-		scopeguard-1.1.0 \
-		sct-0.7.0 \
+		rustc_version-0.4.0 \
+		rustls-0.21.12 \
+		rustls-0.22.4 \
+		rustls-native-certs-0.7.0 \
+		rustls-pemfile-2.1.2 \
+		rustls-pki-types-1.7.0 \
+		rustls-webpki-0.101.7 \
+		rustls-webpki-0.102.4 \
+		rustversion-1.0.17 \
+		ryu-1.0.18 \
+		schannel-0.1.23 \
+		scopeguard-1.2.0 \
+		sct-0.7.1 \
 		sd-notify-0.4.1 \
-		security-framework-2.9.1 \
-		security-framework-sys-2.9.0 \
-		serde-1.0.164 \
-		serde_derive-1.0.164 \
-		serde_html_form-0.2.0 \
-		serde_json-1.0.99 \
-		serde_path_to_error-0.1.11 \
-		serde_spanned-0.6.3 \
+		security-framework-2.11.0 \
+		security-framework-sys-2.11.0 \
+		semver-1.0.23 \
+		serde-1.0.203 \
+		serde_derive-1.0.203 \
+		serde_html_form-0.2.6 \
+		serde_json-1.0.117 \
+		serde_path_to_error-0.1.16 \
+		serde_spanned-0.6.6 \
 		serde_urlencoded-0.7.1 \
-		serde_yaml-0.9.22 \
+		serde_yaml-0.9.34+deprecated \
 		sha-1-0.10.1 \
-		sha1-0.10.5 \
-		sha2-0.9.9 \
-		sha2-0.10.7 \
-		sharded-slab-0.1.4 \
-		shlex-1.1.0 \
-		signal-hook-registry-1.4.1 \
-		signature-1.6.4 \
-		simd-adler32-0.3.5 \
+		sha1-0.10.6 \
+		sha2-0.10.8 \
+		sharded-slab-0.1.7 \
+		shlex-1.3.0 \
+		signal-hook-registry-1.4.2 \
+		signature-2.2.0 \
+		simd-adler32-0.3.7 \
 		simple_asn1-0.6.2 \
-		slab-0.4.8 \
-		smallvec-1.10.0 \
-		socket2-0.4.9 \
-		socket2-0.5.3 \
-		spin-0.5.2 \
-		spki-0.6.0 \
-		static_assertions-1.1.0 \
+		slab-0.4.9 \
+		smallvec-1.13.2 \
+		socket2-0.5.7 \
+		spin-0.9.8 \
+		spki-0.7.3 \
 		subslice-0.2.3 \
 		subtle-2.5.0 \
-		syn-1.0.109 \
-		syn-2.0.21 \
+		syn-2.0.66 \
 		sync_wrapper-0.1.2 \
-		synchronoise-1.0.1 \
-		thiserror-1.0.40 \
-		thiserror-impl-1.0.40 \
-		thread_local-1.1.7 \
+		sync_wrapper-1.0.1 \
+		thiserror-1.0.61 \
+		thiserror-impl-1.0.61 \
+		thread_local-1.1.8 \
 		threadpool-1.8.1 \
-		thrift-0.16.0 \
-		tikv-jemalloc-ctl-0.5.0 \
-		tikv-jemalloc-sys-0.5.3+5.3.0-patched \
-		tikv-jemallocator-0.5.0 \
-		time-0.3.22 \
-		time-core-0.1.1 \
-		time-macros-0.2.9 \
+		tikv-jemalloc-sys-0.5.4+5.3.0-patched \
+		tikv-jemallocator-0.5.4 \
+		time-0.3.36 \
+		time-core-0.1.2 \
+		time-macros-0.2.18 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
-		tokio-1.28.2 \
-		tokio-macros-2.1.0 \
-		tokio-rustls-0.23.4 \
+		tokio-1.38.0 \
+		tokio-io-timeout-1.2.0 \
+		tokio-macros-2.3.0 \
 		tokio-rustls-0.24.1 \
+		tokio-rustls-0.25.0 \
 		tokio-socks-0.5.1 \
-		tokio-stream-0.1.14 \
-		tokio-util-0.7.8 \
-		toml-0.7.5 \
-		toml_datetime-0.6.3 \
-		toml_edit-0.19.11 \
+		tokio-stream-0.1.15 \
+		tokio-util-0.7.11 \
+		toml-0.8.14 \
+		toml_datetime-0.6.6 \
+		toml_edit-0.21.1 \
+		toml_edit-0.22.14 \
+		tonic-0.11.0 \
 		tower-0.4.13 \
-		tower-http-0.4.1 \
+		tower-http-0.5.2 \
 		tower-layer-0.3.2 \
 		tower-service-0.3.2 \
-		tracing-0.1.37 \
-		tracing-attributes-0.1.26 \
-		tracing-core-0.1.31 \
+		tracing-0.1.40 \
+		tracing-attributes-0.1.27 \
+		tracing-core-0.1.32 \
 		tracing-flame-0.2.0 \
-		tracing-log-0.1.3 \
-		tracing-opentelemetry-0.18.0 \
-		tracing-subscriber-0.3.17 \
-		trust-dns-proto-0.22.0 \
-		trust-dns-resolver-0.22.0 \
-		try-lock-0.2.4 \
-		typenum-1.16.0 \
-		typewit-1.4.0 \
-		uncased-0.9.9 \
-		unicode-bidi-0.3.13 \
-		unicode-ident-1.0.9 \
-		unicode-normalization-0.1.22 \
-		unsafe-libyaml-0.2.8 \
-		unsigned-varint-0.7.1 \
-		untrusted-0.7.1 \
-		url-2.4.0 \
-		uuid-1.3.4 \
+		tracing-log-0.2.0 \
+		tracing-opentelemetry-0.23.0 \
+		tracing-subscriber-0.3.18 \
+		try-lock-0.2.5 \
+		typenum-1.17.0 \
+		typewit-1.9.0 \
+		typewit_proc_macros-1.8.1 \
+		uncased-0.9.10 \
+		unicode-bidi-0.3.15 \
+		unicode-ident-1.0.12 \
+		unicode-normalization-0.1.23 \
+		unsafe-libyaml-0.2.11 \
+		unsigned-varint-0.8.0 \
+		untrusted-0.9.0 \
+		url-2.5.0 \
+		urlencoding-2.1.3 \
+		uuid-1.8.0 \
 		valuable-0.1.0 \
 		vcpkg-0.2.15 \
 		version_check-0.9.4 \
 		want-0.3.1 \
-		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.87 \
-		wasm-bindgen-backend-0.2.87 \
-		wasm-bindgen-futures-0.4.37 \
-		wasm-bindgen-macro-0.2.87 \
-		wasm-bindgen-macro-support-0.2.87 \
-		wasm-bindgen-shared-0.2.87 \
-		web-sys-0.3.64 \
-		webpki-0.22.0 \
-		weezl-0.1.7 \
-		widestring-1.0.2 \
-		wildmatch-2.1.1 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-futures-0.4.42 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
+		web-sys-0.3.69 \
+		web-time-1.1.0 \
+		weezl-0.1.8 \
+		widestring-1.1.0 \
+		wildmatch-2.3.4 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.42.0 \
 		windows-sys-0.48.0 \
-		windows-targets-0.48.0 \
-		windows_aarch64_gnullvm-0.42.2 \
-		windows_aarch64_gnullvm-0.48.0 \
-		windows_aarch64_msvc-0.42.2 \
-		windows_aarch64_msvc-0.48.0 \
-		windows_i686_gnu-0.42.2 \
-		windows_i686_gnu-0.48.0 \
-		windows_i686_msvc-0.42.2 \
-		windows_i686_msvc-0.48.0 \
-		windows_x86_64_gnu-0.42.2 \
-		windows_x86_64_gnu-0.48.0 \
-		windows_x86_64_gnullvm-0.42.2 \
-		windows_x86_64_gnullvm-0.48.0 \
-		windows_x86_64_msvc-0.42.2 \
-		windows_x86_64_msvc-0.48.0 \
-		winnow-0.4.7 \
-		winreg-0.7.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.48.5 \
+		windows-targets-0.52.5 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_gnullvm-0.52.5 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_aarch64_msvc-0.52.5 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
+		windows_i686_msvc-0.48.5 \
+		windows_i686_msvc-0.52.5 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnu-0.52.5 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_gnullvm-0.52.5 \
+		windows_x86_64_msvc-0.48.5 \
+		windows_x86_64_msvc-0.52.5 \
+		winnow-0.5.40 \
+		winnow-0.6.11 \
 		winreg-0.50.0 \
-		yansi-0.5.1 \
-		zeroize-1.6.0 \
-		zeroize_derive-1.4.2 \
+		winreg-0.52.0 \
+		yansi-1.0.1 \
+		yap-0.12.0 \
+		zerocopy-0.7.34 \
+		zerocopy-derive-0.7.34 \
+		zeroize-1.8.1 \
 		zigzag-0.1.0 \
-		zstd-sys-2.0.8+zstd.1.5.5 \
-		heed,heed-traits,heed-types@git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d\#f6f825da7fb2c758867e05ad973ef800a6fe1d5d \
-		reqwest@git+https://github.com/timokoesters/reqwest?rev=57b7cf4feb921573dfafad7d34b9ac6e44ead0bd\#57b7cf4feb921573dfafad7d34b9ac6e44ead0bd \
-		ruma,ruma-appservice-api,ruma-client-api,ruma-common,ruma-federation-api,ruma-identifiers-validation,ruma-identity-service-api,ruma-macros,ruma-push-gateway-api,ruma-signatures,ruma-state-res@git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54\#3bd58e3c899457c2d55c45268dcb8a65ae682d54
+		zstd-sys-2.0.10+zstd.1.5.6 \
+		zune-core-0.4.12 \
+		zune-jpeg-0.4.11 \
+		ruma,ruma-appservice-api,ruma-client-api,ruma-common,ruma-events,ruma-federation-api,ruma-identifiers-validation,ruma-identity-service-api,ruma-macros,ruma-push-gateway-api,ruma-server-util,ruma-signatures,ruma-state-res@git+https://github.com/ruma/ruma\#ef40b184b7410a93e933b4ad719a72aea1bdd20e
diff --git a/net-im/conduit/distinfo b/net-im/conduit/distinfo
index e7afd900f77d..563e39c84d1c 100644
--- a/net-im/conduit/distinfo
+++ b/net-im/conduit/distinfo
@@ -1,282 +1,300 @@
-TIMESTAMP = 1691697885
+TIMESTAMP = 1718350733
+SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678
+SIZE (rust/crates/addr2line-0.22.0.crate) = 39156
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
-SHA256 (rust/crates/ahash-0.8.3.crate) = 2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f
-SIZE (rust/crates/ahash-0.8.3.crate) = 42416
-SHA256 (rust/crates/aho-corasick-1.0.2.crate) = 43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41
-SIZE (rust/crates/aho-corasick-1.0.2.crate) = 167694
-SHA256 (rust/crates/allocator-api2-0.2.15.crate) = 56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9
-SIZE (rust/crates/allocator-api2-0.2.15.crate) = 58998
-SHA256 (rust/crates/anstyle-1.0.1.crate) = 3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd
-SIZE (rust/crates/anstyle-1.0.1.crate) = 13977
-SHA256 (rust/crates/arc-swap-1.6.0.crate) = bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6
-SIZE (rust/crates/arc-swap-1.6.0.crate) = 67342
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
+SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
+SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
+SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
+SHA256 (rust/crates/arc-swap-1.7.1.crate) = 69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457
+SIZE (rust/crates/arc-swap-1.7.1.crate) = 68512
 SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545
 SIZE (rust/crates/arrayref-0.3.7.crate) = 9620
 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
+SHA256 (rust/crates/as_variant-1.2.0.crate) = f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f
+SIZE (rust/crates/as_variant-1.2.0.crate) = 7881
 SHA256 (rust/crates/assign-1.1.1.crate) = 5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002
 SIZE (rust/crates/assign-1.1.1.crate) = 4335
-SHA256 (rust/crates/async-trait-0.1.68.crate) = b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842
-SIZE (rust/crates/async-trait-0.1.68.crate) = 28625
-SHA256 (rust/crates/atomic-0.5.3.crate) = c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba
-SIZE (rust/crates/atomic-0.5.3.crate) = 12801
-SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
-SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/axum-0.6.18.crate) = f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39
-SIZE (rust/crates/axum-0.6.18.crate) = 143358
+SHA256 (rust/crates/async-stream-0.3.5.crate) = cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51
+SIZE (rust/crates/async-stream-0.3.5.crate) = 11916
+SHA256 (rust/crates/async-stream-impl-0.3.5.crate) = 16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193
+SIZE (rust/crates/async-stream-impl-0.3.5.crate) = 4173
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
+SHA256 (rust/crates/atomic-0.6.0.crate) = 8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994
+SIZE (rust/crates/atomic-0.6.0.crate) = 12919
+SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
+SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
+SIZE (rust/crates/axum-0.6.20.crate) = 146227
+SHA256 (rust/crates/axum-0.7.5.crate) = 3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf
+SIZE (rust/crates/axum-0.7.5.crate) = 151429
 SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c
 SIZE (rust/crates/axum-core-0.3.4.crate) = 21088
-SHA256 (rust/crates/axum-server-0.5.1.crate) = 447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063
-SIZE (rust/crates/axum-server-0.5.1.crate) = 37642
-SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
-SIZE (rust/crates/base64-0.13.1.crate) = 61002
-SHA256 (rust/crates/base64-0.21.2.crate) = 604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d
-SIZE (rust/crates/base64-0.21.2.crate) = 76389
+SHA256 (rust/crates/axum-core-0.4.3.crate) = a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3
+SIZE (rust/crates/axum-core-0.4.3.crate) = 21877
+SHA256 (rust/crates/axum-extra-0.9.3.crate) = 0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733
+SIZE (rust/crates/axum-extra-0.9.3.crate) = 42641
+SHA256 (rust/crates/axum-server-0.6.0.crate) = c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036
+SIZE (rust/crates/axum-server-0.6.0.crate) = 36772
+SHA256 (rust/crates/backtrace-0.3.72.crate) = 17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11
+SIZE (rust/crates/backtrace-0.3.72.crate) = 87877
+SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
+SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6
+SIZE (rust/crates/base64-0.22.1.crate) = 81597
 SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
 SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
-SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
-SIZE (rust/crates/bincode-1.3.3.crate) = 28958
-SHA256 (rust/crates/bindgen-0.65.1.crate) = cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5
-SIZE (rust/crates/bindgen-0.65.1.crate) = 213479
+SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
+SIZE (rust/crates/bindgen-0.69.4.crate) = 221092
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.3.2.crate) = 6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded
-SIZE (rust/crates/bitflags-2.3.2.crate) = 39637
-SHA256 (rust/crates/blake2b_simd-1.0.1.crate) = 3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc
-SIZE (rust/crates/blake2b_simd-1.0.1.crate) = 34167
-SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
-SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
+SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
+SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
+SHA256 (rust/crates/blake2b_simd-1.0.2.crate) = 23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780
+SIZE (rust/crates/blake2b_simd-1.0.2.crate) = 34165
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
-SHA256 (rust/crates/bumpalo-3.13.0.crate) = a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1
-SIZE (rust/crates/bumpalo-3.13.0.crate) = 82114
-SHA256 (rust/crates/bytemuck-1.13.1.crate) = 17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea
-SIZE (rust/crates/bytemuck-1.13.1.crate) = 42309
-SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
-SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
-SHA256 (rust/crates/bytes-1.4.0.crate) = 89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be
-SIZE (rust/crates/bytes-1.4.0.crate) = 58080
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytemuck-1.16.0.crate) = 78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5
+SIZE (rust/crates/bytemuck-1.16.0.crate) = 48015
+SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
+SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
+SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
+SIZE (rust/crates/bytes-1.6.0.crate) = 60605
 SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
 SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
-SHA256 (rust/crates/cc-1.0.79.crate) = 50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f
-SIZE (rust/crates/cc-1.0.79.crate) = 62624
+SHA256 (rust/crates/cc-1.0.98.crate) = 41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f
+SIZE (rust/crates/cc-1.0.98.crate) = 76780
 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/clang-sys-1.6.1.crate) = c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f
-SIZE (rust/crates/clang-sys-1.6.1.crate) = 41346
-SHA256 (rust/crates/clap-4.3.8.crate) = d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211
-SIZE (rust/crates/clap-4.3.8.crate) = 54806
-SHA256 (rust/crates/clap_builder-4.3.8.crate) = 9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717
-SIZE (rust/crates/clap_builder-4.3.8.crate) = 162239
-SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f
-SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053
-SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b
-SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792
+SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
+SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
+SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
+SHA256 (rust/crates/clap-4.5.4.crate) = 90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0
+SIZE (rust/crates/clap-4.5.4.crate) = 55401
+SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
+SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
+SHA256 (rust/crates/clap_derive-4.5.4.crate) = 528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64
+SIZE (rust/crates/clap_derive-4.5.4.crate) = 29159
+SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
+SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
 SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b
 SIZE (rust/crates/color_quant-1.1.0.crate) = 6649
-SHA256 (rust/crates/const-oid-0.9.2.crate) = 520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913
-SIZE (rust/crates/const-oid-0.9.2.crate) = 44606
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
 SHA256 (rust/crates/const_panic-0.2.8.crate) = 6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b
 SIZE (rust/crates/const_panic-0.2.8.crate) = 48077
-SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
-SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936
-SHA256 (rust/crates/constant_time_eq-0.2.6.crate) = 21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6
-SIZE (rust/crates/constant_time_eq-0.2.6.crate) = 10936
-SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146
-SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059
-SHA256 (rust/crates/core-foundation-sys-0.8.4.crate) = e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa
-SIZE (rust/crates/core-foundation-sys-0.8.4.crate) = 17725
-SHA256 (rust/crates/cpufeatures-0.2.8.crate) = 03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c
-SIZE (rust/crates/cpufeatures-0.2.8.crate) = 11840
-SHA256 (rust/crates/crc-3.0.1.crate) = 86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe
-SIZE (rust/crates/crc-3.0.1.crate) = 9950
-SHA256 (rust/crates/crc-catalog-2.2.0.crate) = 9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484
-SIZE (rust/crates/crc-catalog-2.2.0.crate) = 9931
-SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
-SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
-SHA256 (rust/crates/crossbeam-0.8.2.crate) = 2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c
-SIZE (rust/crates/crossbeam-0.8.2.crate) = 10502
-SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200
-SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455
-SHA256 (rust/crates/crossbeam-deque-0.8.3.crate) = ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef
-SIZE (rust/crates/crossbeam-deque-0.8.3.crate) = 21746
-SHA256 (rust/crates/crossbeam-epoch-0.9.15.crate) = ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7
-SIZE (rust/crates/crossbeam-epoch-0.9.15.crate) = 48553
-SHA256 (rust/crates/crossbeam-queue-0.3.8.crate) = d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add
-SIZE (rust/crates/crossbeam-queue-0.3.8.crate) = 16731
-SHA256 (rust/crates/crossbeam-utils-0.8.16.crate) = 5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294
-SIZE (rust/crates/crossbeam-utils-0.8.16.crate) = 42508
+SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
+SIZE (rust/crates/constant_time_eq-0.3.0.crate) = 11369
+SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
+SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
+SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/crc-3.2.1.crate) = 69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636
+SIZE (rust/crates/crc-3.2.1.crate) = 15070
+SHA256 (rust/crates/crc-catalog-2.4.0.crate) = 19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5
+SIZE (rust/crates/crc-catalog-2.4.0.crate) = 10155
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
+SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
+SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
+SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
+SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/curve25519-dalek-3.2.0.crate) = 0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61
-SIZE (rust/crates/curve25519-dalek-3.2.0.crate) = 517530
-SHA256 (rust/crates/dashmap-5.4.0.crate) = 907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc
-SIZE (rust/crates/dashmap-5.4.0.crate) = 22862
-SHA256 (rust/crates/data-encoding-2.4.0.crate) = c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308
-SIZE (rust/crates/data-encoding-2.4.0.crate) = 19165
-SHA256 (rust/crates/der-0.6.1.crate) = f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de
-SIZE (rust/crates/der-0.6.1.crate) = 74205
-SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
-SIZE (rust/crates/digest-0.9.0.crate) = 13247
+SHA256 (rust/crates/curve25519-dalek-4.1.2.crate) = 0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348
+SIZE (rust/crates/curve25519-dalek-4.1.2.crate) = 305477
+SHA256 (rust/crates/curve25519-dalek-derive-0.1.1.crate) = f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3
+SIZE (rust/crates/curve25519-dalek-derive-0.1.1.crate) = 11723
+SHA256 (rust/crates/data-encoding-2.6.0.crate) = e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2
+SIZE (rust/crates/data-encoding-2.6.0.crate) = 20769
+SHA256 (rust/crates/date_header-1.0.5.crate) = 0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d
+SIZE (rust/crates/date_header-1.0.5.crate) = 12001
+SHA256 (rust/crates/der-0.7.9.crate) = f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0
+SIZE (rust/crates/der-0.7.9.crate) = 85173
+SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
+SIZE (rust/crates/deranged-0.3.11.crate) = 18043
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
-SHA256 (rust/crates/directories-4.0.1.crate) = f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210
-SIZE (rust/crates/directories-4.0.1.crate) = 16040
-SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6
-SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597
-SHA256 (rust/crates/ed25519-1.5.3.crate) = 91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7
-SIZE (rust/crates/ed25519-1.5.3.crate) = 17118
-SHA256 (rust/crates/ed25519-dalek-1.0.1.crate) = c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d
-SIZE (rust/crates/ed25519-dalek-1.0.1.crate) = 29460
-SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91
-SIZE (rust/crates/either-1.8.1.crate) = 16027
-SHA256 (rust/crates/encoding_rs-0.8.32.crate) = 071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394
-SIZE (rust/crates/encoding_rs-0.8.32.crate) = 1370046
-SHA256 (rust/crates/enum-as-inner-0.5.1.crate) = c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116
-SIZE (rust/crates/enum-as-inner-0.5.1.crate) = 11707
-SHA256 (rust/crates/equivalent-1.0.0.crate) = 88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1
-SIZE (rust/crates/equivalent-1.0.0.crate) = 6621
-SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
-SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/directories-5.0.1.crate) = 9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35
+SIZE (rust/crates/directories-5.0.1.crate) = 15833
+SHA256 (rust/crates/dirs-sys-0.4.1.crate) = 520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c
+SIZE (rust/crates/dirs-sys-0.4.1.crate) = 10719
+SHA256 (rust/crates/ed25519-2.2.3.crate) = 115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53
+SIZE (rust/crates/ed25519-2.2.3.crate) = 17802
+SHA256 (rust/crates/ed25519-dalek-2.1.1.crate) = 4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871
+SIZE (rust/crates/ed25519-dalek-2.1.1.crate) = 85736
+SHA256 (rust/crates/either-1.12.0.crate) = 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b
+SIZE (rust/crates/either-1.12.0.crate) = 18974
+SHA256 (rust/crates/enum-as-inner-0.6.0.crate) = 5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a
+SIZE (rust/crates/enum-as-inner-0.6.0.crate) = 12079
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/fallible-iterator-0.3.0.crate) = 2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649
+SIZE (rust/crates/fallible-iterator-0.3.0.crate) = 19639
 SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
 SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
-SHA256 (rust/crates/fdeflate-0.3.0.crate) = d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10
-SIZE (rust/crates/fdeflate-0.3.0.crate) = 21790
-SHA256 (rust/crates/figment-0.10.10.crate) = 4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5
-SIZE (rust/crates/figment-0.10.10.crate) = 64594
-SHA256 (rust/crates/flate2-1.0.26.crate) = 3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743
-SIZE (rust/crates/flate2-1.0.26.crate) = 70832
+SHA256 (rust/crates/fdeflate-0.3.4.crate) = 4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645
+SIZE (rust/crates/fdeflate-0.3.4.crate) = 25001
+SHA256 (rust/crates/fiat-crypto-0.2.9.crate) = 28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d
+SIZE (rust/crates/fiat-crypto-0.2.9.crate) = 495390
+SHA256 (rust/crates/figment-0.10.19.crate) = 8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3
+SIZE (rust/crates/figment-0.10.19.crate) = 70111
+SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
+SIZE (rust/crates/flate2-1.0.30.crate) = 75511
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
-SHA256 (rust/crates/form_urlencoded-1.2.0.crate) = a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652
-SIZE (rust/crates/form_urlencoded-1.2.0.crate) = 8923
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
 SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213
 SIZE (rust/crates/fs2-0.4.3.crate) = 13138
-SHA256 (rust/crates/futures-0.3.28.crate) = 23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40
-SIZE (rust/crates/futures-0.3.28.crate) = 53229
-SHA256 (rust/crates/futures-channel-0.3.28.crate) = 955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2
-SIZE (rust/crates/futures-channel-0.3.28.crate) = 32281
-SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c
-SIZE (rust/crates/futures-core-0.3.28.crate) = 14780
-SHA256 (rust/crates/futures-executor-0.3.28.crate) = ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0
-SIZE (rust/crates/futures-executor-0.3.28.crate) = 17743
-SHA256 (rust/crates/futures-io-0.3.28.crate) = 4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964
-SIZE (rust/crates/futures-io-0.3.28.crate) = 8910
-SHA256 (rust/crates/futures-macro-0.3.28.crate) = 89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72
-SIZE (rust/crates/futures-macro-0.3.28.crate) = 11272
-SHA256 (rust/crates/futures-sink-0.3.28.crate) = f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e
-SIZE (rust/crates/futures-sink-0.3.28.crate) = 7852
-SHA256 (rust/crates/futures-task-0.3.28.crate) = 76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65
-SIZE (rust/crates/futures-task-0.3.28.crate) = 11848
-SHA256 (rust/crates/futures-util-0.3.28.crate) = 26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533
-SIZE (rust/crates/futures-util-0.3.28.crate) = 158510
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
-SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
-SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
-SHA256 (rust/crates/getrandom-0.2.10.crate) = be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427
-SIZE (rust/crates/getrandom-0.2.10.crate) = 34955
-SHA256 (rust/crates/gif-0.12.0.crate) = 80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045
-SIZE (rust/crates/gif-0.12.0.crate) = 634734
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/gif-0.13.1.crate) = 3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2
+SIZE (rust/crates/gif-0.13.1.crate) = 36408
+SHA256 (rust/crates/gimli-0.29.0.crate) = 40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd
+SIZE (rust/crates/gimli-0.29.0.crate) = 275756
 SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
 SIZE (rust/crates/glob-0.3.1.crate) = 18880
-SHA256 (rust/crates/h2-0.3.19.crate) = d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782
-SIZE (rust/crates/h2-0.3.19.crate) = 164681
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
+SHA256 (rust/crates/h2-0.4.5.crate) = fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab
+SIZE (rust/crates/h2-0.4.5.crate) = 174166
 SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
 SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
-SHA256 (rust/crates/hashbrown-0.14.0.crate) = 2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a
-SIZE (rust/crates/hashbrown-0.14.0.crate) = 116103
-SHA256 (rust/crates/hashlink-0.8.3.crate) = 312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f
-SIZE (rust/crates/hashlink-0.8.3.crate) = 26438
-SHA256 (rust/crates/headers-0.3.8.crate) = f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584
-SIZE (rust/crates/headers-0.3.8.crate) = 67904
-SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
-SIZE (rust/crates/headers-core-0.2.0.crate) = 2380
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
+SHA256 (rust/crates/hashlink-0.9.1.crate) = 6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af
+SIZE (rust/crates/hashlink-0.9.1.crate) = 28928
+SHA256 (rust/crates/headers-0.4.0.crate) = 322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9
+SIZE (rust/crates/headers-0.4.0.crate) = 68864
+SHA256 (rust/crates/headers-core-0.3.0.crate) = 54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4
+SIZE (rust/crates/headers-core-0.3.0.crate) = 2333
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
-SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7
-SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hickory-proto-0.24.1.crate) = 07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512
+SIZE (rust/crates/hickory-proto-0.24.1.crate) = 374410
+SHA256 (rust/crates/hickory-resolver-0.24.1.crate) = 28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243
+SIZE (rust/crates/hickory-resolver-0.24.1.crate) = 91134
 SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
 SIZE (rust/crates/hmac-0.12.1.crate) = 42657
 SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
 SIZE (rust/crates/hostname-0.3.1.crate) = 9272
-SHA256 (rust/crates/http-0.2.9.crate) = bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482
-SIZE (rust/crates/http-0.2.9.crate) = 100146
-SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1
-SIZE (rust/crates/http-body-0.4.5.crate) = 9242
-SHA256 (rust/crates/http-range-header-0.3.0.crate) = 0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29
-SIZE (rust/crates/http-range-header-0.3.0.crate) = 7120
+SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
+SIZE (rust/crates/http-0.2.12.crate) = 101964
+SHA256 (rust/crates/http-1.1.0.crate) = 21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258
+SIZE (rust/crates/http-1.1.0.crate) = 103144
+SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
+SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-body-1.0.0.crate) = 1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643
+SIZE (rust/crates/http-body-1.0.0.crate) = 5411
+SHA256 (rust/crates/http-body-util-0.1.1.crate) = 0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d
+SIZE (rust/crates/http-body-util-0.1.1.crate) = 11930
 SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
 SIZE (rust/crates/httparse-1.8.0.crate) = 29954
-SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421
-SIZE (rust/crates/httpdate-1.0.2.crate) = 10673
-SHA256 (rust/crates/hyper-0.14.26.crate) = ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4
-SIZE (rust/crates/hyper-0.14.26.crate) = 195570
-SHA256 (rust/crates/hyper-rustls-0.23.2.crate) = 1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c
-SIZE (rust/crates/hyper-rustls-0.23.2.crate) = 30993
-SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
-SIZE (rust/crates/idna-0.2.3.crate) = 271023
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/hyper-0.14.29.crate) = f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33
+SIZE (rust/crates/hyper-0.14.29.crate) = 198107
+SHA256 (rust/crates/hyper-1.3.1.crate) = fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d
+SIZE (rust/crates/hyper-1.3.1.crate) = 148763
+SHA256 (rust/crates/hyper-rustls-0.26.0.crate) = a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c
+SIZE (rust/crates/hyper-rustls-0.26.0.crate) = 29538
+SHA256 (rust/crates/hyper-timeout-0.4.1.crate) = bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1
+SIZE (rust/crates/hyper-timeout-0.4.1.crate) = 13805
+SHA256 (rust/crates/hyper-util-0.1.5.crate) = 7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56
+SIZE (rust/crates/hyper-util-0.1.5.crate) = 69740
 SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c
 SIZE (rust/crates/idna-0.4.0.crate) = 271429
-SHA256 (rust/crates/image-0.24.6.crate) = 527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a
-SIZE (rust/crates/image-0.24.6.crate) = 273618
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/image-0.25.1.crate) = fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11
+SIZE (rust/crates/image-0.25.1.crate) = 9176733
 SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
 SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
-SHA256 (rust/crates/indexmap-2.0.0.crate) = d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d
-SIZE (rust/crates/indexmap-2.0.0.crate) = 64038
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
 SHA256 (rust/crates/inlinable_string-0.1.15.crate) = c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb
 SIZE (rust/crates/inlinable_string-0.1.15.crate) = 19290
-SHA256 (rust/crates/integer-encoding-3.0.4.crate) = 8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02
-SIZE (rust/crates/integer-encoding-3.0.4.crate) = 12446
 SHA256 (rust/crates/ipconfig-0.3.2.crate) = b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f
 SIZE (rust/crates/ipconfig-0.3.2.crate) = 24468
-SHA256 (rust/crates/ipnet-2.7.2.crate) = 12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f
-SIZE (rust/crates/ipnet-2.7.2.crate) = 27044
-SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
-SIZE (rust/crates/itertools-0.11.0.crate) = 125074
-SHA256 (rust/crates/itoa-1.0.6.crate) = 453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6
-SIZE (rust/crates/itoa-1.0.6.crate) = 10410
-SHA256 (rust/crates/jobserver-0.1.26.crate) = 936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2
-SIZE (rust/crates/jobserver-0.1.26.crate) = 22645
-SHA256 (rust/crates/jpeg-decoder-0.3.0.crate) = bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e
-SIZE (rust/crates/jpeg-decoder-0.3.0.crate) = 742671
-SHA256 (rust/crates/js-sys-0.3.64.crate) = c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a
-SIZE (rust/crates/js-sys-0.3.64.crate) = 80313
+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
+SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
+SIZE (rust/crates/itertools-0.12.1.crate) = 137761
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
+SHA256 (rust/crates/jobserver-0.1.31.crate) = d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e
+SIZE (rust/crates/jobserver-0.1.31.crate) = 27306
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
 SHA256 (rust/crates/js_int-0.2.2.crate) = d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a
 SIZE (rust/crates/js_int-0.2.2.crate) = 11634
 SHA256 (rust/crates/js_option-0.1.1.crate) = 68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c
 SIZE (rust/crates/js_option-0.1.1.crate) = 3624
-SHA256 (rust/crates/jsonwebtoken-8.3.0.crate) = 6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378
-SIZE (rust/crates/jsonwebtoken-8.3.0.crate) = 45747
-SHA256 (rust/crates/konst-0.3.5.crate) = 1d9a8bb6c7c71d151b25936b03e012a4c00daea99e3a3797c6ead66b0a0d55e2
-SIZE (rust/crates/konst-0.3.5.crate) = 77365
-SHA256 (rust/crates/konst_kernel-0.3.5.crate) = 55d2ab266022e7309df89ed712bddc753e3a3c395c3ced1bb2e4470ec2a8146d
-SIZE (rust/crates/konst_kernel-0.3.5.crate) = 21917
+SHA256 (rust/crates/jsonwebtoken-9.3.0.crate) = b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f
+SIZE (rust/crates/jsonwebtoken-9.3.0.crate) = 48987
+SHA256 (rust/crates/konst-0.3.9.crate) = 50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9
+SIZE (rust/crates/konst-0.3.9.crate) = 80192
+SHA256 (rust/crates/konst_kernel-0.3.9.crate) = be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b
+SIZE (rust/crates/konst_kernel-0.3.9.crate) = 22239
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
 SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
 SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
-SHA256 (rust/crates/libc-0.2.146.crate) = f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b
-SIZE (rust/crates/libc-0.2.146.crate) = 684707
-SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
-SIZE (rust/crates/libloading-0.7.4.crate) = 27580
-SHA256 (rust/crates/librocksdb-sys-0.11.0+8.1.1.crate) = d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e
-SIZE (rust/crates/librocksdb-sys-0.11.0+8.1.1.crate) = 6270227
-SHA256 (rust/crates/libsqlite3-sys-0.26.0.crate) = afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326
-SIZE (rust/crates/libsqlite3-sys-0.26.0.crate) = 4840390
-SHA256 (rust/crates/libz-sys-1.1.9.crate) = 56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db
-SIZE (rust/crates/libz-sys-1.1.9.crate) = 2404387
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
+SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
+SIZE (rust/crates/libloading-0.8.3.crate) = 28480
+SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
+SIZE (rust/crates/libredox-0.1.3.crate) = 6068
+SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f
+SIZE (rust/crates/libsqlite3-sys-0.28.0.crate) = 4975624
+SHA256 (rust/crates/libz-sys-1.1.18.crate) = c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e
+SIZE (rust/crates/libz-sys-1.1.18.crate) = 817891
 SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
 SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
-SHA256 (rust/crates/lmdb-rkv-sys-0.11.2.crate) = 61b9ce6b3be08acefa3003c57b7565377432a89ec24476bbe72e11d101f852fe
-SIZE (rust/crates/lmdb-rkv-sys-0.11.2.crate) = 164681
-SHA256 (rust/crates/lock_api-0.4.10.crate) = c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16
-SIZE (rust/crates/lock_api-0.4.10.crate) = 26713
-SHA256 (rust/crates/log-0.4.19.crate) = b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4
-SIZE (rust/crates/log-0.4.19.crate) = 38073
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
 SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
 SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
 SHA256 (rust/crates/lz4-sys-1.9.4.crate) = 57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900
@@ -287,334 +305,330 @@ SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7
 SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
-SHA256 (rust/crates/matches-0.1.10.crate) = 2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5
-SIZE (rust/crates/matches-0.1.10.crate) = 2592
-SHA256 (rust/crates/matchit-0.7.0.crate) = b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40
-SIZE (rust/crates/matchit-0.7.0.crate) = 19113
-SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
-SIZE (rust/crates/memchr-2.5.0.crate) = 65812
-SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
-SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
-SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
-SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/matchit-0.7.3.crate) = 0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94
+SIZE (rust/crates/matchit-0.7.3.crate) = 30372
+SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
+SIZE (rust/crates/memchr-2.7.2.crate) = 96220
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
 SIZE (rust/crates/mime-0.3.17.crate) = 15712
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7
-SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
-SHA256 (rust/crates/mio-0.8.8.crate) = 927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2
-SIZE (rust/crates/mio-0.8.8.crate) = 94264
-SHA256 (rust/crates/nix-0.26.2.crate) = bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a
-SIZE (rust/crates/nix-0.26.2.crate) = 277973
+SHA256 (rust/crates/miniz_oxide-0.7.3.crate) = 87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae
+SIZE (rust/crates/miniz_oxide-0.7.3.crate) = 55774
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
+SHA256 (rust/crates/nix-0.28.0.crate) = ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4
+SIZE (rust/crates/nix-0.28.0.crate) = 311086
 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
 SIZE (rust/crates/nom-7.1.3.crate) = 117570
 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
-SHA256 (rust/crates/num-bigint-0.4.3.crate) = f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f
-SIZE (rust/crates/num-bigint-0.4.3.crate) = 97799
-SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
-SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
-SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0
-SIZE (rust/crates/num-rational-0.4.1.crate) = 27889
-SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
-SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
-SHA256 (rust/crates/num_cpus-1.15.0.crate) = 0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b
-SIZE (rust/crates/num_cpus-1.15.0.crate) = 15680
-SHA256 (rust/crates/once_cell-1.18.0.crate) = dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d
-SIZE (rust/crates/once_cell-1.18.0.crate) = 32969
-SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
-SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/num-bigint-0.4.5.crate) = c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7
+SIZE (rust/crates/num-bigint-0.4.5.crate) = 102281
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/object-0.35.0.crate) = b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e
+SIZE (rust/crates/object-0.35.0.crate) = 317792
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
 SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
 SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
-SHA256 (rust/crates/opentelemetry-0.18.0.crate) = 69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e
-SIZE (rust/crates/opentelemetry-0.18.0.crate) = 15120
-SHA256 (rust/crates/opentelemetry-jaeger-0.17.0.crate) = 1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a
-SIZE (rust/crates/opentelemetry-jaeger-0.17.0.crate) = 133860
-SHA256 (rust/crates/opentelemetry-semantic-conventions-0.10.0.crate) = 9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb
-SIZE (rust/crates/opentelemetry-semantic-conventions-0.10.0.crate) = 23544
-SHA256 (rust/crates/opentelemetry_api-0.18.0.crate) = c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22
-SIZE (rust/crates/opentelemetry_api-0.18.0.crate) = 53945
-SHA256 (rust/crates/opentelemetry_sdk-0.18.0.crate) = 1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113
-SIZE (rust/crates/opentelemetry_sdk-0.18.0.crate) = 95038
-SHA256 (rust/crates/ordered-float-1.1.1.crate) = 3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7
-SIZE (rust/crates/ordered-float-1.1.1.crate) = 9983
+SHA256 (rust/crates/opentelemetry-0.22.0.crate) = 900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf
+SIZE (rust/crates/opentelemetry-0.22.0.crate) = 67855
+SHA256 (rust/crates/opentelemetry-jaeger-propagator-0.1.0.crate) = beb4ec62efc537b60aaa89b92624f986f2523d3a609079f3511cc8ee73490826
+SIZE (rust/crates/opentelemetry-jaeger-propagator-0.1.0.crate) = 11368
+SHA256 (rust/crates/opentelemetry-otlp-0.15.0.crate) = 1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb
+SIZE (rust/crates/opentelemetry-otlp-0.15.0.crate) = 29315
+SHA256 (rust/crates/opentelemetry-proto-0.5.0.crate) = 3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4
+SIZE (rust/crates/opentelemetry-proto-0.5.0.crate) = 151331
+SHA256 (rust/crates/opentelemetry-semantic-conventions-0.14.0.crate) = f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910
+SIZE (rust/crates/opentelemetry-semantic-conventions-0.14.0.crate) = 32064
+SHA256 (rust/crates/opentelemetry_sdk-0.22.1.crate) = 9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e
+SIZE (rust/crates/opentelemetry_sdk-0.22.1.crate) = 128633
+SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
+SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
+SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
+SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
-SHA256 (rust/crates/page_size-0.4.2.crate) = eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd
-SIZE (rust/crates/page_size-0.4.2.crate) = 8386
-SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
-SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
-SHA256 (rust/crates/parking_lot_core-0.9.8.crate) = 93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447
-SIZE (rust/crates/parking_lot_core-0.9.8.crate) = 32383
-SHA256 (rust/crates/paste-1.0.12.crate) = 9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79
-SIZE (rust/crates/paste-1.0.12.crate) = 18156
-SHA256 (rust/crates/pear-0.2.4.crate) = 0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8
-SIZE (rust/crates/pear-0.2.4.crate) = 19087
-SHA256 (rust/crates/pear_codegen-0.2.4.crate) = 9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c
-SIZE (rust/crates/pear_codegen-0.2.4.crate) = 7176
-SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
-SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
-SHA256 (rust/crates/pem-1.1.1.crate) = a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8
-SIZE (rust/crates/pem-1.1.1.crate) = 11352
-SHA256 (rust/crates/percent-encoding-2.3.0.crate) = 9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94
-SIZE (rust/crates/percent-encoding-2.3.0.crate) = 10196
-SHA256 (rust/crates/persy-1.4.4.crate) = 3712821f12453814409ec149071bd4832a8ec458e648579c104aee30ed70b300
-SIZE (rust/crates/persy-1.4.4.crate) = 125929
-SHA256 (rust/crates/pin-project-1.1.0.crate) = c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead
-SIZE (rust/crates/pin-project-1.1.0.crate) = 57895
-SHA256 (rust/crates/pin-project-internal-1.1.0.crate) = 39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07
-SIZE (rust/crates/pin-project-internal-1.1.0.crate) = 27855
-SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
-SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/pear-0.2.9.crate) = bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467
+SIZE (rust/crates/pear-0.2.9.crate) = 19083
+SHA256 (rust/crates/pear_codegen-0.2.9.crate) = 4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147
+SIZE (rust/crates/pear_codegen-0.2.9.crate) = 7250
+SHA256 (rust/crates/pem-3.0.4.crate) = 8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae
+SIZE (rust/crates/pem-3.0.4.crate) = 13040
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/persy-1.5.0.crate) = 9ef4b7250ab3a90ded0e284b2633469c23ef01ea868fe7cbb64e2f0a7d6f6d02
+SIZE (rust/crates/persy-1.5.0.crate) = 146143
+SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3
+SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
+SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
+SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
-SHA256 (rust/crates/pkcs8-0.9.0.crate) = 9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba
-SIZE (rust/crates/pkcs8-0.9.0.crate) = 26214
-SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964
-SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838
-SHA256 (rust/crates/png-0.17.9.crate) = 59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11
-SIZE (rust/crates/png-0.17.9.crate) = 88839
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
+SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
+SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/platforms-3.4.0.crate) = db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7
+SIZE (rust/crates/platforms-3.4.0.crate) = 29298
+SHA256 (rust/crates/png-0.17.13.crate) = 06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1
+SIZE (rust/crates/png-0.17.13.crate) = 103176
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
-SHA256 (rust/crates/prettyplease-0.2.9.crate) = 9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282
-SIZE (rust/crates/prettyplease-0.2.9.crate) = 56487
-SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
-SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
-SHA256 (rust/crates/proc-macro2-1.0.61.crate) = 363a6f739a0c0addeaf6ed75150b95743aa18643a3c6f40409ed7b6db3a6911f
-SIZE (rust/crates/proc-macro2-1.0.61.crate) = 44363
-SHA256 (rust/crates/proc-macro2-diagnostics-0.10.0.crate) = 606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b
-SIZE (rust/crates/proc-macro2-diagnostics-0.10.0.crate) = 12316
+SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
+SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
+SHA256 (rust/crates/proc-macro2-1.0.85.crate) = 22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23
+SIZE (rust/crates/proc-macro2-1.0.85.crate) = 48988
+SHA256 (rust/crates/proc-macro2-diagnostics-0.10.1.crate) = af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8
+SIZE (rust/crates/proc-macro2-diagnostics-0.10.1.crate) = 12219
+SHA256 (rust/crates/prost-0.12.6.crate) = deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29
+SIZE (rust/crates/prost-0.12.6.crate) = 21552
+SHA256 (rust/crates/prost-derive-0.12.6.crate) = 81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1
+SIZE (rust/crates/prost-derive-0.12.6.crate) = 19556
 SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
 SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
-SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488
-SIZE (rust/crates/quote-1.0.28.crate) = 28382
-SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
-SIZE (rust/crates/rand-0.7.3.crate) = 112246
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
-SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
-SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
 SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
-SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
-SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
 SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
-SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
-SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
-SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
-SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
-SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
-SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
-SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
-SIZE (rust/crates/redox_users-0.4.3.crate) = 15353
-SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f
-SIZE (rust/crates/regex-1.8.4.crate) = 249562
+SHA256 (rust/crates/redox_syscall-0.5.1.crate) = 469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e
+SIZE (rust/crates/redox_syscall-0.5.1.crate) = 22536
+SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
+SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
+SIZE (rust/crates/regex-1.10.4.crate) = 253191
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
+SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
-SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78
-SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778
+SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
+SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/reqwest-0.12.4.crate) = 566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10
+SIZE (rust/crates/reqwest-0.12.4.crate) = 170627
 SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
 SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
-SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
-SIZE (rust/crates/ring-0.16.20.crate) = 5082615
-SHA256 (rust/crates/rocksdb-0.21.0.crate) = bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe
-SIZE (rust/crates/rocksdb-0.21.0.crate) = 125106
-SHA256 (rust/crates/rusqlite-0.29.0.crate) = 549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2
-SIZE (rust/crates/rusqlite-0.29.0.crate) = 137156
-SHA256 (rust/crates/rust-argon2-1.0.0.crate) = b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9
-SIZE (rust/crates/rust-argon2-1.0.0.crate) = 27428
+SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d
+SIZE (rust/crates/ring-0.17.8.crate) = 4188554
+SHA256 (rust/crates/rusqlite-0.31.0.crate) = b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae
+SIZE (rust/crates/rusqlite-0.31.0.crate) = 152252
+SHA256 (rust/crates/rust-argon2-2.1.0.crate) = 9d9848531d60c9cbbcf9d166c885316c24bc0e2a9d3eba0956bb6cbbd79bc6e8
+SIZE (rust/crates/rust-argon2-2.1.0.crate) = 26904
+SHA256 (rust/crates/rust-librocksdb-sys-0.21.0+9.1.1.crate) = 75cb7b9cd5ce3b3ce0757ceab2240f7471826780b8700845c0cfd418cb7e398d
+SIZE (rust/crates/rust-librocksdb-sys-0.21.0+9.1.1.crate) = 5494424
+SHA256 (rust/crates/rust-rocksdb-0.25.0.crate) = 2bcfb31b5bf2e3274686ebfdf9a946e9a327a3bc54adc7e5cda9f4fdcc4b55f1
+SIZE (rust/crates/rust-rocksdb-0.25.0.crate) = 145910
+SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
+SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
-SHA256 (rust/crates/rustls-0.20.8.crate) = fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f
-SIZE (rust/crates/rustls-0.20.8.crate) = 270142
-SHA256 (rust/crates/rustls-0.21.2.crate) = e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f
-SIZE (rust/crates/rustls-0.21.2.crate) = 279135
-SHA256 (rust/crates/rustls-native-certs-0.6.3.crate) = a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00
-SIZE (rust/crates/rustls-native-certs-0.6.3.crate) = 24438
-SHA256 (rust/crates/rustls-pemfile-0.2.1.crate) = 5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9
-SIZE (rust/crates/rustls-pemfile-0.2.1.crate) = 14278
-SHA256 (rust/crates/rustls-pemfile-1.0.2.crate) = d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b
-SIZE (rust/crates/rustls-pemfile-1.0.2.crate) = 19347
-SHA256 (rust/crates/rustls-webpki-0.100.1.crate) = d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b
-SIZE (rust/crates/rustls-webpki-0.100.1.crate) = 70719
-SHA256 (rust/crates/rustversion-1.0.12.crate) = 4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06
-SIZE (rust/crates/rustversion-1.0.12.crate) = 17278
-SHA256 (rust/crates/ryu-1.0.13.crate) = f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041
-SIZE (rust/crates/ryu-1.0.13.crate) = 46823
-SHA256 (rust/crates/schannel-0.1.21.crate) = 713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3
-SIZE (rust/crates/schannel-0.1.21.crate) = 41719
-SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
-SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
-SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4
-SIZE (rust/crates/sct-0.7.0.crate) = 27502
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustls-0.21.12.crate) = 3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e
+SIZE (rust/crates/rustls-0.21.12.crate) = 285674
+SHA256 (rust/crates/rustls-0.22.4.crate) = bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432
+SIZE (rust/crates/rustls-0.22.4.crate) = 333681
+SHA256 (rust/crates/rustls-native-certs-0.7.0.crate) = 8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792
+SIZE (rust/crates/rustls-native-certs-0.7.0.crate) = 25071
+SHA256 (rust/crates/rustls-pemfile-2.1.2.crate) = 29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d
+SIZE (rust/crates/rustls-pemfile-2.1.2.crate) = 25928
+SHA256 (rust/crates/rustls-pki-types-1.7.0.crate) = 976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d
+SIZE (rust/crates/rustls-pki-types-1.7.0.crate) = 29555
+SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
+SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustls-webpki-0.102.4.crate) = ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e
+SIZE (rust/crates/rustls-webpki-0.102.4.crate) = 200657
+SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
+SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
+SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
+SIZE (rust/crates/schannel-0.1.23.crate) = 41667
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
+SIZE (rust/crates/sct-0.7.1.crate) = 27501
 SHA256 (rust/crates/sd-notify-0.4.1.crate) = 621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32
 SIZE (rust/crates/sd-notify-0.4.1.crate) = 10085
-SHA256 (rust/crates/security-framework-2.9.1.crate) = 1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8
-SIZE (rust/crates/security-framework-2.9.1.crate) = 78844
-SHA256 (rust/crates/security-framework-sys-2.9.0.crate) = f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7
-SIZE (rust/crates/security-framework-sys-2.9.0.crate) = 18197
-SHA256 (rust/crates/serde-1.0.164.crate) = 9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d
-SIZE (rust/crates/serde-1.0.164.crate) = 77057
-SHA256 (rust/crates/serde_derive-1.0.164.crate) = d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68
-SIZE (rust/crates/serde_derive-1.0.164.crate) = 54789
-SHA256 (rust/crates/serde_html_form-0.2.0.crate) = 53192e38d5c88564b924dbe9b60865ecbb71b81d38c4e61c817cffd3e36ef696
-SIZE (rust/crates/serde_html_form-0.2.0.crate) = 12305
-SHA256 (rust/crates/serde_json-1.0.99.crate) = 46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3
-SIZE (rust/crates/serde_json-1.0.99.crate) = 145102
-SHA256 (rust/crates/serde_path_to_error-0.1.11.crate) = f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0
-SIZE (rust/crates/serde_path_to_error-0.1.11.crate) = 16485
-SHA256 (rust/crates/serde_spanned-0.6.3.crate) = 96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186
-SIZE (rust/crates/serde_spanned-0.6.3.crate) = 7737
+SHA256 (rust/crates/security-framework-2.11.0.crate) = c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0
+SIZE (rust/crates/security-framework-2.11.0.crate) = 80191
+SHA256 (rust/crates/security-framework-sys-2.11.0.crate) = 317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7
+SIZE (rust/crates/security-framework-sys-2.11.0.crate) = 18718
+SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b
+SIZE (rust/crates/semver-1.0.23.crate) = 30622
+SHA256 (rust/crates/serde-1.0.203.crate) = 7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094
+SIZE (rust/crates/serde-1.0.203.crate) = 77935
+SHA256 (rust/crates/serde_derive-1.0.203.crate) = 500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba
+SIZE (rust/crates/serde_derive-1.0.203.crate) = 55867
+SHA256 (rust/crates/serde_html_form-0.2.6.crate) = 8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5
+SIZE (rust/crates/serde_html_form-0.2.6.crate) = 14480
+SHA256 (rust/crates/serde_json-1.0.117.crate) = 455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3
+SIZE (rust/crates/serde_json-1.0.117.crate) = 146921
+SHA256 (rust/crates/serde_path_to_error-0.1.16.crate) = af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6
+SIZE (rust/crates/serde_path_to_error-0.1.16.crate) = 16657
+SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
+SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
 SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
 SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
-SHA256 (rust/crates/serde_yaml-0.9.22.crate) = 452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85
-SIZE (rust/crates/serde_yaml-0.9.22.crate) = 64206
+SHA256 (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47
+SIZE (rust/crates/serde_yaml-0.9.34+deprecated.crate) = 65290
 SHA256 (rust/crates/sha-1-0.10.1.crate) = f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c
 SIZE (rust/crates/sha-1-0.10.1.crate) = 12018
-SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3
-SIZE (rust/crates/sha1-0.10.5.crate) = 12146
-SHA256 (rust/crates/sha2-0.9.9.crate) = 4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800
-SIZE (rust/crates/sha2-0.9.9.crate) = 22247
-SHA256 (rust/crates/sha2-0.10.7.crate) = 479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8
-SIZE (rust/crates/sha2-0.10.7.crate) = 22541
-SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31
-SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479
-SHA256 (rust/crates/shlex-1.1.0.crate) = 43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3
-SIZE (rust/crates/shlex-1.1.0.crate) = 5199
-SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
-SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
-SHA256 (rust/crates/signature-1.6.4.crate) = 74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c
-SIZE (rust/crates/signature-1.6.4.crate) = 16012
-SHA256 (rust/crates/simd-adler32-0.3.5.crate) = 238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f
-SIZE (rust/crates/simd-adler32-0.3.5.crate) = 12132
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
+SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
+SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
+SIZE (rust/crates/signature-2.2.0.crate) = 15531
+SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
+SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
 SHA256 (rust/crates/simple_asn1-0.6.2.crate) = adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085
 SIZE (rust/crates/simple_asn1-0.6.2.crate) = 15992
-SHA256 (rust/crates/slab-0.4.8.crate) = 6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d
-SIZE (rust/crates/slab-0.4.8.crate) = 16928
-SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
-SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
-SHA256 (rust/crates/socket2-0.4.9.crate) = 64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662
-SIZE (rust/crates/socket2-0.4.9.crate) = 45421
-SHA256 (rust/crates/socket2-0.5.3.crate) = 2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877
-SIZE (rust/crates/socket2-0.5.3.crate) = 52588
-SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
-SIZE (rust/crates/spin-0.5.2.crate) = 12004
-SHA256 (rust/crates/spki-0.6.0.crate) = 67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b
-SIZE (rust/crates/spki-0.6.0.crate) = 14791
-SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
-SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/socket2-0.5.7.crate) = ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c
+SIZE (rust/crates/socket2-0.5.7.crate) = 55758
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
 SHA256 (rust/crates/subslice-0.2.3.crate) = e0a8e4809a3bb02de01f1f7faf1ba01a83af9e8eabcd4d31dd6e413d14d56aae
 SIZE (rust/crates/subslice-0.2.3.crate) = 25975
 SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
 SIZE (rust/crates/subtle-2.5.0.crate) = 13909
-SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
-SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.21.crate) = 1182caafaab7018eaea9b404afa8184c0baf42a04d5e10ae4f4843c2029c8aab
-SIZE (rust/crates/syn-2.0.21.crate) = 241193
+SHA256 (rust/crates/syn-2.0.66.crate) = c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5
+SIZE (rust/crates/syn-2.0.66.crate) = 264855
 SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
 SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
-SHA256 (rust/crates/synchronoise-1.0.1.crate) = 3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2
-SIZE (rust/crates/synchronoise-1.0.1.crate) = 15084
-SHA256 (rust/crates/thiserror-1.0.40.crate) = 978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac
-SIZE (rust/crates/thiserror-1.0.40.crate) = 18709
-SHA256 (rust/crates/thiserror-impl-1.0.40.crate) = f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f
-SIZE (rust/crates/thiserror-impl-1.0.40.crate) = 15138
-SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152
-SIZE (rust/crates/thread_local-1.1.7.crate) = 13585
+SHA256 (rust/crates/sync_wrapper-1.0.1.crate) = a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394
+SIZE (rust/crates/sync_wrapper-1.0.1.crate) = 6939
+SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
+SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
+SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
+SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
+SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
+SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
 SHA256 (rust/crates/threadpool-1.8.1.crate) = d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa
 SIZE (rust/crates/threadpool-1.8.1.crate) = 14408
-SHA256 (rust/crates/thrift-0.16.0.crate) = 09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0
-SIZE (rust/crates/thrift-0.16.0.crate) = 44431
-SHA256 (rust/crates/tikv-jemalloc-ctl-0.5.0.crate) = e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1
-SIZE (rust/crates/tikv-jemalloc-ctl-0.5.0.crate) = 19183
-SHA256 (rust/crates/tikv-jemalloc-sys-0.5.3+5.3.0-patched.crate) = a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8
-SIZE (rust/crates/tikv-jemalloc-sys-0.5.3+5.3.0-patched.crate) = 884399
-SHA256 (rust/crates/tikv-jemallocator-0.5.0.crate) = 20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979
-SIZE (rust/crates/tikv-jemallocator-0.5.0.crate) = 9382
-SHA256 (rust/crates/time-0.3.22.crate) = ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd
-SIZE (rust/crates/time-0.3.22.crate) = 113792
-SHA256 (rust/crates/time-core-0.1.1.crate) = 7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb
-SIZE (rust/crates/time-core-0.1.1.crate) = 7197
-SHA256 (rust/crates/time-macros-0.2.9.crate) = 372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b
-SIZE (rust/crates/time-macros-0.2.9.crate) = 23684
+SHA256 (rust/crates/tikv-jemalloc-sys-0.5.4+5.3.0-patched.crate) = 9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1
+SIZE (rust/crates/tikv-jemalloc-sys-0.5.4+5.3.0-patched.crate) = 884765
+SHA256 (rust/crates/tikv-jemallocator-0.5.4.crate) = 965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca
+SIZE (rust/crates/tikv-jemallocator-0.5.4.crate) = 13101
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
+SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/tokio-1.28.2.crate) = 94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2
-SIZE (rust/crates/tokio-1.28.2.crate) = 660565
-SHA256 (rust/crates/tokio-macros-2.1.0.crate) = 630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e
-SIZE (rust/crates/tokio-macros-2.1.0.crate) = 11472
-SHA256 (rust/crates/tokio-rustls-0.23.4.crate) = c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59
-SIZE (rust/crates/tokio-rustls-0.23.4.crate) = 27024
+SHA256 (rust/crates/tokio-1.38.0.crate) = ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a
+SIZE (rust/crates/tokio-1.38.0.crate) = 774094
+SHA256 (rust/crates/tokio-io-timeout-1.2.0.crate) = 30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf
+SIZE (rust/crates/tokio-io-timeout-1.2.0.crate) = 8993
+SHA256 (rust/crates/tokio-macros-2.3.0.crate) = 5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a
+SIZE (rust/crates/tokio-macros-2.3.0.crate) = 11753
 SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
 SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-rustls-0.25.0.crate) = 775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f
+SIZE (rust/crates/tokio-rustls-0.25.0.crate) = 30541
 SHA256 (rust/crates/tokio-socks-0.5.1.crate) = 51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0
 SIZE (rust/crates/tokio-socks-0.5.1.crate) = 16137
-SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
-SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881
-SHA256 (rust/crates/tokio-util-0.7.8.crate) = 806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d
-SIZE (rust/crates/tokio-util-0.7.8.crate) = 101644
-SHA256 (rust/crates/toml-0.7.5.crate) = 1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240
-SIZE (rust/crates/toml-0.7.5.crate) = 49069
-SHA256 (rust/crates/toml_datetime-0.6.3.crate) = 7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b
-SIZE (rust/crates/toml_datetime-0.6.3.crate) = 10770
-SHA256 (rust/crates/toml_edit-0.19.11.crate) = 266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7
-SIZE (rust/crates/toml_edit-0.19.11.crate) = 95642
+SHA256 (rust/crates/tokio-stream-0.1.15.crate) = 267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af
+SIZE (rust/crates/tokio-stream-0.1.15.crate) = 36284
+SHA256 (rust/crates/tokio-util-0.7.11.crate) = 9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1
+SIZE (rust/crates/tokio-util-0.7.11.crate) = 113421
+SHA256 (rust/crates/toml-0.8.14.crate) = 6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335
+SIZE (rust/crates/toml-0.8.14.crate) = 50645
+SHA256 (rust/crates/toml_datetime-0.6.6.crate) = 4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf
+SIZE (rust/crates/toml_datetime-0.6.6.crate) = 11698
+SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
+SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/toml_edit-0.22.14.crate) = f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38
+SIZE (rust/crates/toml_edit-0.22.14.crate) = 103761
+SHA256 (rust/crates/tonic-0.11.0.crate) = 76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13
+SIZE (rust/crates/tonic-0.11.0.crate) = 92841
 SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
 SIZE (rust/crates/tower-0.4.13.crate) = 106906
-SHA256 (rust/crates/tower-http-0.4.1.crate) = a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c
-SIZE (rust/crates/tower-http-0.4.1.crate) = 114242
+SHA256 (rust/crates/tower-http-0.5.2.crate) = 1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5
+SIZE (rust/crates/tower-http-0.5.2.crate) = 118675
 SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
 SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
 SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
 SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
-SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8
-SIZE (rust/crates/tracing-0.1.37.crate) = 73888
-SHA256 (rust/crates/tracing-attributes-0.1.26.crate) = 5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab
-SIZE (rust/crates/tracing-attributes-0.1.26.crate) = 32060
-SHA256 (rust/crates/tracing-core-0.1.31.crate) = 0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a
-SIZE (rust/crates/tracing-core-0.1.31.crate) = 61263
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
+SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
 SHA256 (rust/crates/tracing-flame-0.2.0.crate) = 0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9
 SIZE (rust/crates/tracing-flame-0.2.0.crate) = 9062
-SHA256 (rust/crates/tracing-log-0.1.3.crate) = 78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922
-SIZE (rust/crates/tracing-log-0.1.3.crate) = 20549
-SHA256 (rust/crates/tracing-opentelemetry-0.18.0.crate) = 21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de
-SIZE (rust/crates/tracing-opentelemetry-0.18.0.crate) = 109052
-SHA256 (rust/crates/tracing-subscriber-0.3.17.crate) = 30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77
-SIZE (rust/crates/tracing-subscriber-0.3.17.crate) = 191711
-SHA256 (rust/crates/trust-dns-proto-0.22.0.crate) = 4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26
-SIZE (rust/crates/trust-dns-proto-0.22.0.crate) = 301568
-SHA256 (rust/crates/trust-dns-resolver-0.22.0.crate) = aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe
-SIZE (rust/crates/trust-dns-resolver-0.22.0.crate) = 82505
-SHA256 (rust/crates/try-lock-0.2.4.crate) = 3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed
-SIZE (rust/crates/try-lock-0.2.4.crate) = 4467
-SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba
-SIZE (rust/crates/typenum-1.16.0.crate) = 42477
-SHA256 (rust/crates/typewit-1.4.0.crate) = 4061a10d4d8f3081a8ccc025182afd8434302d8d4b4503ec6d8510d09df08c2d
-SIZE (rust/crates/typewit-1.4.0.crate) = 27887
-SHA256 (rust/crates/uncased-0.9.9.crate) = 9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68
-SIZE (rust/crates/uncased-0.9.9.crate) = 10614
-SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460
-SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477
-SHA256 (rust/crates/unicode-ident-1.0.9.crate) = b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0
-SIZE (rust/crates/unicode-ident-1.0.9.crate) = 41978
-SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
-SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
-SHA256 (rust/crates/unsafe-libyaml-0.2.8.crate) = 1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6
-SIZE (rust/crates/unsafe-libyaml-0.2.8.crate) = 61459
-SHA256 (rust/crates/unsigned-varint-0.7.1.crate) = d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836
-SIZE (rust/crates/unsigned-varint-0.7.1.crate) = 15682
-SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
-SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
-SHA256 (rust/crates/url-2.4.0.crate) = 50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb
-SIZE (rust/crates/url-2.4.0.crate) = 75670
-SHA256 (rust/crates/uuid-1.3.4.crate) = 0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81
-SIZE (rust/crates/uuid-1.3.4.crate) = 53874
+SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3
+SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
+SHA256 (rust/crates/tracing-opentelemetry-0.23.0.crate) = a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284
+SIZE (rust/crates/tracing-opentelemetry-0.23.0.crate) = 138411
+SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
+SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
+SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
+SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/typewit-1.9.0.crate) = c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24
+SIZE (rust/crates/typewit-1.9.0.crate) = 61521
+SHA256 (rust/crates/typewit_proc_macros-1.8.1.crate) = e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6
+SIZE (rust/crates/typewit_proc_macros-1.8.1.crate) = 1944
+SHA256 (rust/crates/uncased-0.9.10.crate) = e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697
+SIZE (rust/crates/uncased-0.9.10.crate) = 10872
+SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
+SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
+SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
+SHA256 (rust/crates/unsafe-libyaml-0.2.11.crate) = 673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861
+SIZE (rust/crates/unsafe-libyaml-0.2.11.crate) = 62101
+SHA256 (rust/crates/unsigned-varint-0.8.0.crate) = eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06
+SIZE (rust/crates/unsigned-varint-0.8.0.crate) = 15955
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da
+SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538
+SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
+SIZE (rust/crates/uuid-1.8.0.crate) = 44043
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
 SIZE (rust/crates/valuable-0.1.0.crate) = 27718
 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
@@ -623,93 +637,101 @@ SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
 SIZE (rust/crates/want-0.3.1.crate) = 6398
-SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
-SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.87.crate) = 7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342
-SIZE (rust/crates/wasm-bindgen-0.2.87.crate) = 175052
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd
-SIZE (rust/crates/wasm-bindgen-backend-0.2.87.crate) = 26821
-SHA256 (rust/crates/wasm-bindgen-futures-0.4.37.crate) = c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03
-SIZE (rust/crates/wasm-bindgen-futures-0.4.37.crate) = 15193
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.87.crate) = dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d
-SIZE (rust/crates/wasm-bindgen-macro-0.2.87.crate) = 13897
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.87.crate) = 20006
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.87.crate) = ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1
-SIZE (rust/crates/wasm-bindgen-shared-0.2.87.crate) = 7248
-SHA256 (rust/crates/web-sys-0.3.64.crate) = 9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b
-SIZE (rust/crates/web-sys-0.3.64.crate) = 725584
-SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd
-SIZE (rust/crates/webpki-0.22.0.crate) = 58663
-SHA256 (rust/crates/weezl-0.1.7.crate) = 9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb
-SIZE (rust/crates/weezl-0.1.7.crate) = 42166
-SHA256 (rust/crates/widestring-1.0.2.crate) = 653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8
-SIZE (rust/crates/widestring-1.0.2.crate) = 79706
-SHA256 (rust/crates/wildmatch-2.1.1.crate) = ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86
-SIZE (rust/crates/wildmatch-2.1.1.crate) = 6481
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0
+SIZE (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 15380
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
+SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
+SIZE (rust/crates/web-time-1.1.0.crate) = 18026
+SHA256 (rust/crates/weezl-0.1.8.crate) = 53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082
+SIZE (rust/crates/weezl-0.1.8.crate) = 42175
+SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
+SIZE (rust/crates/widestring-1.1.0.crate) = 85046
+SHA256 (rust/crates/wildmatch-2.3.4.crate) = 3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19
+SIZE (rust/crates/wildmatch-2.3.4.crate) = 7216
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
-SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
 SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
-SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5
-SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
-SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc
-SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543
-SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
-SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
-SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3
-SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479
-SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
-SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
-SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241
-SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490
-SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
-SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
-SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00
-SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056
-SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
-SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
-SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1
-SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
-SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953
-SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536
-SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
-SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
-SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a
-SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422
-SHA256 (rust/crates/winnow-0.4.7.crate) = ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448
-SIZE (rust/crates/winnow-0.4.7.crate) = 142640
-SHA256 (rust/crates/winreg-0.7.0.crate) = 0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69
-SIZE (rust/crates/winreg-0.7.0.crate) = 21225
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
+SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
+SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/winnow-0.6.11.crate) = 56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d
+SIZE (rust/crates/winnow-0.6.11.crate) = 160331
 SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
 SIZE (rust/crates/winreg-0.50.0.crate) = 29703
-SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec
-SIZE (rust/crates/yansi-0.5.1.crate) = 16525
-SHA256 (rust/crates/zeroize-1.6.0.crate) = 2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9
-SIZE (rust/crates/zeroize-1.6.0.crate) = 19049
-SHA256 (rust/crates/zeroize_derive-1.4.2.crate) = ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69
-SIZE (rust/crates/zeroize_derive-1.4.2.crate) = 11141
+SHA256 (rust/crates/winreg-0.52.0.crate) = a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5
+SIZE (rust/crates/winreg-0.52.0.crate) = 30148
+SHA256 (rust/crates/yansi-1.0.1.crate) = cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049
+SIZE (rust/crates/yansi-1.0.1.crate) = 75497
+SHA256 (rust/crates/yap-0.12.0.crate) = bfe269e7b803a5e8e20cbd97860e136529cd83bf2c9c6d37b142467e7e1f051f
+SIZE (rust/crates/yap-0.12.0.crate) = 23743
+SHA256 (rust/crates/zerocopy-0.7.34.crate) = ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087
+SIZE (rust/crates/zerocopy-0.7.34.crate) = 151177
+SHA256 (rust/crates/zerocopy-derive-0.7.34.crate) = 15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b
+SIZE (rust/crates/zerocopy-derive-0.7.34.crate) = 37907
+SHA256 (rust/crates/zeroize-1.8.1.crate) = ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde
+SIZE (rust/crates/zeroize-1.8.1.crate) = 20029
 SHA256 (rust/crates/zigzag-0.1.0.crate) = 70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf
 SIZE (rust/crates/zigzag-0.1.0.crate) = 2085
-SHA256 (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c
-SIZE (rust/crates/zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270
-SHA256 (timokoesters-heed-f6f825da7fb2c758867e05ad973ef800a6fe1d5d_GH0.tar.gz) = 7d8a4ee322b8ca4f91d1be6a50ba328623ea0024d159da9d53fb0a106a92df1b
-SIZE (timokoesters-heed-f6f825da7fb2c758867e05ad973ef800a6fe1d5d_GH0.tar.gz) = 34435
-SHA256 (timokoesters-reqwest-57b7cf4feb921573dfafad7d34b9ac6e44ead0bd_GH0.tar.gz) = 67a776a75935cba67dd69bcd496b6a26f21ef0175cdf806b53e3982653523124
-SIZE (timokoesters-reqwest-57b7cf4feb921573dfafad7d34b9ac6e44ead0bd_GH0.tar.gz) = 186730
-SHA256 (ruma-ruma-3bd58e3c899457c2d55c45268dcb8a65ae682d54_GH0.tar.gz) = 34fc133cd5cbf4b263ba8098ac330997fb1b930c5bf161f29548bb2ba94cb141
-SIZE (ruma-ruma-3bd58e3c899457c2d55c45268dcb8a65ae682d54_GH0.tar.gz) = 608879
-SHA256 (famedly-conduit-0c2cfda3ae923d9e922d5edf379e4d8976a52d4e_GL0.tar.gz) = 40600c454bb8aff6d0ad37f38de77ba88ba3f2b1abfc09eba9986f818a09bd2b
-SIZE (famedly-conduit-0c2cfda3ae923d9e922d5edf379e4d8976a52d4e_GL0.tar.gz) = 285190
+SHA256 (rust/crates/zstd-sys-2.0.10+zstd.1.5.6.crate) = c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa
+SIZE (rust/crates/zstd-sys-2.0.10+zstd.1.5.6.crate) = 749088
+SHA256 (rust/crates/zune-core-0.4.12.crate) = 3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a
+SIZE (rust/crates/zune-core-0.4.12.crate) = 17355
+SHA256 (rust/crates/zune-jpeg-0.4.11.crate) = ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448
+SIZE (rust/crates/zune-jpeg-0.4.11.crate) = 61815
+SHA256 (ruma-ruma-ef40b184b7410a93e933b4ad719a72aea1bdd20e_GH0.tar.gz) = 7ec4afd3304474ae33765e7d30c7e30ace52d6dcfba5b3be29d7893509135d0e
+SIZE (ruma-ruma-ef40b184b7410a93e933b4ad719a72aea1bdd20e_GH0.tar.gz) = 674406
+SHA256 (famedly-conduit-7a5b8930134cf7ea5ff9880e6fa468b2b3e05c98_GL0.tar.gz) = ee3d27deffadd49bc2be3e41be0d3ac851d3348bc6d4d9d98337cc9796a87633
+SIZE (famedly-conduit-7a5b8930134cf7ea5ff9880e6fa468b2b3e05c98_GL0.tar.gz) = 305459
diff --git a/net-im/conduit/pkg-plist b/net-im/conduit/pkg-plist
index 6651805602d8..9862c95b3a9c 100644
--- a/net-im/conduit/pkg-plist
+++ b/net-im/conduit/pkg-plist
@@ -1,3 +1,17 @@
 bin/%%PORTNAME%%
 @sample etc/conduit.toml.sample
+%%DOCSDIR%%/SUMMARY.md
+%%DOCSDIR%%/appservices.md
+%%DOCSDIR%%/configuration.md
+%%DOCSDIR%%/deploying.md
+%%DOCSDIR%%/deploying/debian.md
+%%DOCSDIR%%/deploying/docker-compose.for-traefik.yml
+%%DOCSDIR%%/deploying/docker-compose.override.yml
+%%DOCSDIR%%/deploying/docker-compose.with-traefik.yml
+%%DOCSDIR%%/deploying/docker-compose.yml
+%%DOCSDIR%%/deploying/docker.md
+%%DOCSDIR%%/deploying/generic.md
+%%DOCSDIR%%/deploying/nixos.md
+%%DOCSDIR%%/introduction.md
+%%DOCSDIR%%/turn.md
 @dir %%DBDIR%%
diff --git a/net-im/coyim/Makefile b/net-im/coyim/Makefile
index 78c1101880fb..4f0acc42c22b 100644
--- a/net-im/coyim/Makefile
+++ b/net-im/coyim/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	coyim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.11
-PORTREVISION=	24
+PORTREVISION=	26
 CATEGORIES=	net-im
 
 MAINTAINER=	fox@FreeBSD.org
diff --git a/net-im/dendrite/Makefile b/net-im/dendrite/Makefile
index 7fbec90fe733..8b2cc08255ff 100644
--- a/net-im/dendrite/Makefile
+++ b/net-im/dendrite/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dendrite
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-im
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/net-im/discordo/Makefile b/net-im/discordo/Makefile
index f04ebc27662b..a8b8cc62f6d5 100644
--- a/net-im/discordo/Makefile
+++ b/net-im/discordo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	discordo
 DISTVERSION=	g20220909
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	net-im
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/net-im/dissent/Makefile b/net-im/dissent/Makefile
index f1ce4ae3330a..5d4f971fdb23 100644
--- a/net-im/dissent/Makefile
+++ b/net-im/dissent/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	dissent
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.24
+DISTVERSION=	0.0.25
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -21,13 +22,14 @@ GH_TUPLE=	KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab
 		alessio:shellescape:v1.4.2:alessio_shellescape/vendor/github.com/alessio/shellescape \
 		danieljoos:wincred:v1.2.1:danieljoos_wincred/vendor/github.com/danieljoos/wincred \
 		diamondburned:adaptive:fa139be203a8:diamondburned_adaptive/vendor/github.com/diamondburned/adaptive \
-		diamondburned:arikawa:5aaffc368786:diamondburned_arikawa_v3/vendor/github.com/diamondburned/arikawa/v3 \
-		diamondburned:chatkit:4b8acdf0f84b:diamondburned_chatkit/vendor/github.com/diamondburned/chatkit \
+		diamondburned:arikawa:v3.3.6:diamondburned_arikawa_v3/vendor/github.com/diamondburned/arikawa/v3 \
+		diamondburned:chatkit:5788b19145bc:diamondburned_chatkit/vendor/github.com/diamondburned/chatkit \
 		diamondburned:ctxt:2db38a5d3c12:diamondburned_ctxt/vendor/libdb.so/ctxt \
+		diamondburned:go-emoji:39776eee41ac:diamondburned_go_emoji/vendor/libdb.so/go-emoji \
 		diamondburned:gotk4-adwaita:5f283b5d35bc:diamondburned_gotk4_adwaita_pkg/vendor/github.com/diamondburned/gotk4-adwaita \
-		diamondburned:gotk4:v0.2.2:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
-		diamondburned:gotkit:6094a5dcd206:diamondburned_gotkit/vendor/github.com/diamondburned/gotkit \
-		diamondburned:ningen:ddbaae4f3f84:diamondburned_ningen_v3/vendor/github.com/diamondburned/ningen/v3 \
+		diamondburned:gotk4:e395a91f5db3:diamondburned_gotk4_pkg/vendor/github.com/diamondburned/gotk4 \
+		diamondburned:gotkit:6aaca1acc990:diamondburned_gotkit/vendor/github.com/diamondburned/gotkit \
+		diamondburned:ningen:96fcee660001:diamondburned_ningen_v3/vendor/github.com/diamondburned/ningen/v3 \
 		dlclark:regexp2:v1.11.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
 		dustin:go-humanize:v1.0.1:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		enescakir:emoji:v1.0.0:enescakir_emoji/vendor/github.com/enescakir/emoji \
@@ -39,6 +41,7 @@ GH_TUPLE=	KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab
 		golang:net:v0.24.0:golang_net/vendor/golang.org/x/net \
 		golang:sync:v0.7.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.19.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.15.0:golang_text/vendor/golang.org/x/text \
 		golang:time:v0.5.0:golang_time/vendor/golang.org/x/time \
 		gorilla:schema:v1.3.0:gorilla_schema/vendor/github.com/gorilla/schema \
 		gorilla:websocket:v1.5.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
@@ -47,6 +50,7 @@ GH_TUPLE=	KarpelesLab:weak:v0.1.1:karpeleslab_weak/vendor/github.com/KarpelesLab
 		lmittmann:tint:v1.0.4:lmittmann_tint/vendor/github.com/lmittmann/tint \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		puzpuzpuz:xsync:v3.1.0:puzpuzpuz_xsync_v3/vendor/github.com/puzpuzpuz/xsync/v3 \
 		sahilm:fuzzy:v0.1.1:sahilm_fuzzy/vendor/github.com/sahilm/fuzzy \
 		twmb:murmur3:v1.1.8:twmb_murmur3/vendor/github.com/twmb/murmur3 \
 		yalue:merged_fs:v1.3.0:yalue_merged_fs/vendor/github.com/yalue/merged_fs \
diff --git a/net-im/dissent/distinfo b/net-im/dissent/distinfo
index 07f46ec9416a..85875ae6b32e 100644
--- a/net-im/dissent/distinfo
+++ b/net-im/dissent/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1713939731
-SHA256 (diamondburned-dissent-v0.0.24_GH0.tar.gz) = 65537bbc947acfc53fdd7bf0ab98e083fb78af73507b27deec9ba92c1bc783cc
-SIZE (diamondburned-dissent-v0.0.24_GH0.tar.gz) = 4033159
+TIMESTAMP = 1718400682
+SHA256 (diamondburned-dissent-v0.0.25_GH0.tar.gz) = 286b1b1409f55950ded8e02fdea4ef0f1a5d27f552c04ec70bd52fdfa7a94cee
+SIZE (diamondburned-dissent-v0.0.25_GH0.tar.gz) = 4037923
 SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe
 SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484
 SHA256 (alecthomas-chroma-v0.10.0_GH0.tar.gz) = 98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56
@@ -11,20 +11,22 @@ SHA256 (danieljoos-wincred-v1.2.1_GH0.tar.gz) = 572e2318744c658b520c7c676c7638a9
 SIZE (danieljoos-wincred-v1.2.1_GH0.tar.gz) = 10253
 SHA256 (diamondburned-adaptive-fa139be203a8_GH0.tar.gz) = 72fb26ba28d2ee4528f626a9e496f676dce7f452204f81f04768eece441bba3f
 SIZE (diamondburned-adaptive-fa139be203a8_GH0.tar.gz) = 18557
-SHA256 (diamondburned-arikawa-5aaffc368786_GH0.tar.gz) = e0d28bbf5d4a34415aa910f4a92f1a330bb8b8cab525b17869334bcc0c28aab4
-SIZE (diamondburned-arikawa-5aaffc368786_GH0.tar.gz) = 264315
-SHA256 (diamondburned-chatkit-4b8acdf0f84b_GH0.tar.gz) = 4ae1f9093411da9f6adcf0177bb6dbb76da2ef792928cf68cce2f4b967feac9a
-SIZE (diamondburned-chatkit-4b8acdf0f84b_GH0.tar.gz) = 60735
+SHA256 (diamondburned-arikawa-v3.3.6_GH0.tar.gz) = d72b6bd479a45d9fd18572dba48297dd6022e5ccd9f39ee8f997c743708a1058
+SIZE (diamondburned-arikawa-v3.3.6_GH0.tar.gz) = 264294
+SHA256 (diamondburned-chatkit-5788b19145bc_GH0.tar.gz) = 92f6c0bbb61537cd72014f30e4f1751604d617405ddbce4040ccd45cf75ebf20
+SIZE (diamondburned-chatkit-5788b19145bc_GH0.tar.gz) = 61420
 SHA256 (diamondburned-ctxt-2db38a5d3c12_GH0.tar.gz) = e326eae196ce8f25bf12e45d57c08011c3c3673a2e5da805235ee423f105e2b1
 SIZE (diamondburned-ctxt-2db38a5d3c12_GH0.tar.gz) = 3561
+SHA256 (diamondburned-go-emoji-39776eee41ac_GH0.tar.gz) = 3159ca9f8a77340f1f4605ac3b8f54201ff2217bc9681dbe6c733de859b5a295
+SIZE (diamondburned-go-emoji-39776eee41ac_GH0.tar.gz) = 374906
 SHA256 (diamondburned-gotk4-adwaita-5f283b5d35bc_GH0.tar.gz) = c688c660c07720f6dd44c96a067c2fa717ea29f9f4e7520e42299d869120ce37
 SIZE (diamondburned-gotk4-adwaita-5f283b5d35bc_GH0.tar.gz) = 158650
-SHA256 (diamondburned-gotk4-v0.2.2_GH0.tar.gz) = 8292b0b89ef1caa44075ed0826fdebf3842f88e5d69ba8a3a2b36968cc801e3c
-SIZE (diamondburned-gotk4-v0.2.2_GH0.tar.gz) = 3146830
-SHA256 (diamondburned-gotkit-6094a5dcd206_GH0.tar.gz) = bfb983acff466afa21d52d513129f623e07f67ad1c9a1d165a2a11d35c093010
-SIZE (diamondburned-gotkit-6094a5dcd206_GH0.tar.gz) = 72394
-SHA256 (diamondburned-ningen-ddbaae4f3f84_GH0.tar.gz) = a0148926b5cc40032d34893a097d032c37843905e8f7c46bec948713befdcf7a
-SIZE (diamondburned-ningen-ddbaae4f3f84_GH0.tar.gz) = 46271
+SHA256 (diamondburned-gotk4-e395a91f5db3_GH0.tar.gz) = 22aab6e9ba57ac8f2a9192385f70bc1da53712a92252155834585ca53780db7a
+SIZE (diamondburned-gotk4-e395a91f5db3_GH0.tar.gz) = 3150134
+SHA256 (diamondburned-gotkit-6aaca1acc990_GH0.tar.gz) = cc6ecfb72786f54e226642c58758ab0997dd7c8febae1176d381db62e35c0e0f
+SIZE (diamondburned-gotkit-6aaca1acc990_GH0.tar.gz) = 72619
+SHA256 (diamondburned-ningen-96fcee660001_GH0.tar.gz) = 97aa5ae693e6ef7a28cd8ff3e592abc75928b549023ab6a44752d292b2f3fbe8
+SIZE (diamondburned-ningen-96fcee660001_GH0.tar.gz) = 46252
 SHA256 (dlclark-regexp2-v1.11.0_GH0.tar.gz) = c380209bd67b67859014f9bfd155aec4bfc4beb65f4a6aec37683b80186b18f7
 SIZE (dlclark-regexp2-v1.11.0_GH0.tar.gz) = 212532
 SHA256 (dustin-go-humanize-v1.0.1_GH0.tar.gz) = ac3a0d8d0eef07c75d12eddce775a8e8306dfb9783a45312597c34ff643793d8
@@ -47,6 +49,8 @@ SHA256 (golang-sync-v0.7.0_GH0.tar.gz) = 39bf56d2dc04d16baabbf5eb5d847a2ad68762b
 SIZE (golang-sync-v0.7.0_GH0.tar.gz) = 18181
 SHA256 (golang-sys-v0.19.0_GH0.tar.gz) = da82f3d99abd964483ec5d622ddf620e2492ec0a18c154475f35d938c4240c7b
 SIZE (golang-sys-v0.19.0_GH0.tar.gz) = 1449493
+SHA256 (golang-text-v0.15.0_GH0.tar.gz) = 6b3893012ab61dacc64efc47574b2554e4cfbeb5e453a3b39e500713614cd63d
+SIZE (golang-text-v0.15.0_GH0.tar.gz) = 8974475
 SHA256 (golang-time-v0.5.0_GH0.tar.gz) = bb876812abbce995ed8c8523b55c5c5518e594f0570cf372a5d1213a5423d95f
 SIZE (golang-time-v0.5.0_GH0.tar.gz) = 12219
 SHA256 (gorilla-schema-v1.3.0_GH0.tar.gz) = 3bcd80f5b5a69fa1ac194763109d55863492216ea55a4828afeb963c1e43a01b
@@ -63,6 +67,8 @@ SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88
 SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (puzpuzpuz-xsync-v3.1.0_GH0.tar.gz) = 92f87513b2d240e5c562a00e222e1aae42cc685cd5292a8b70e1b77c993da059
+SIZE (puzpuzpuz-xsync-v3.1.0_GH0.tar.gz) = 37965
 SHA256 (sahilm-fuzzy-v0.1.1_GH0.tar.gz) = 3242679be224552ef8934524cb08bb5d355644084a3476509bedd4dba57af408
 SIZE (sahilm-fuzzy-v0.1.1_GH0.tar.gz) = 3353368
 SHA256 (twmb-murmur3-v1.1.8_GH0.tar.gz) = afa51249308db62b5a2d4610b7c30cd41dc4906777211d8d8b09250875a668aa
diff --git a/net-im/gomuks/Makefile b/net-im/gomuks/Makefile
index 3a0f97d6673c..c00c3678fe77 100644
--- a/net-im/gomuks/Makefile
+++ b/net-im/gomuks/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gomuks
 PORTVERSION=	0.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	net-im
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net-im/gotktrix/Makefile b/net-im/gotktrix/Makefile
index d324dc54254f..ca6f1f0ff081 100644
--- a/net-im/gotktrix/Makefile
+++ b/net-im/gotktrix/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gotktrix
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.4
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	net-im
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile
index 01990d140b66..a2eee2ca1863 100644
--- a/net-im/gotosocial/Makefile
+++ b/net-im/gotosocial/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gotosocial
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES?=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web
 DISTFILES?=	${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web
diff --git a/net-im/matterbridge/Makefile b/net-im/matterbridge/Makefile
index 46bbc0202c10..dbf2068dca42 100644
--- a/net-im/matterbridge/Makefile
+++ b/net-im/matterbridge/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	matterbridge
 PORTVERSION=	1.26.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net-im
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net-im/matterircd/Makefile b/net-im/matterircd/Makefile
index 9cef0dddcf78..02c2e5e60ea0 100644
--- a/net-im/matterircd/Makefile
+++ b/net-im/matterircd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	matterircd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.28.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net-im irc
 
 MAINTAINER=	chalpin@cs.wisc.edu
diff --git a/net-im/nextcloud-spreed-signaling/Makefile b/net-im/nextcloud-spreed-signaling/Makefile
index 42373a1e8580..c5f05f9dec76 100644
--- a/net-im/nextcloud-spreed-signaling/Makefile
+++ b/net-im/nextcloud-spreed-signaling/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nextcloud-spreed-signaling
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.3
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net-im
 
 MAINTAINER=	jsm@FreeBSD.org
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 07cb94968f20..8b19ce817bdc 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openfire
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.7.5
+DISTVERSION=	4.8.0
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 
@@ -21,7 +21,6 @@ USE_GITHUB=	YES
 GH_ACCOUNT=	igniterealtime
 GH_PROJECT=	Openfire
 USE_JAVA=	yes
-JAVA_VERSION=	8+
 
 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
@@ -37,8 +36,9 @@ PLIST_SUB+=	VARDB=${VARDB} \
 		VARLOG=${VARLOG}
 
 OPTIONS_DEFINE=		DOCS TEST
-OPTIONS_DEFAULT=	MAVEN_LOCAL
-OPTIONS_SINGLE=		MAVEN
+OPTIONS_DEFAULT=	MAVEN_LOCAL OPENJDK11
+OPTIONS_SINGLE=		MAVEN JAVA
+OPTIONS_SINGLE_JAVA=	OPENJDK11 OPENJDK17
 OPTIONS_SINGLE_MAVEN=	MAVEN_LOCAL MAVEN_ONLINE
 
 MAVEN_DESC=		Source of Maven build plugins
@@ -52,6 +52,14 @@ MVN_TARGET=	package
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MOPENJDK11}
+JAVA_VERSION=	11
+.endif
+
+.if ${PORT_OPTIONS:MOPENJDK17}
+JAVA_VERSION=	17
+.endif
+
 .if ${PORT_OPTIONS:MTEST}
 MVN_OPTS=	-DskipTests=false
 .else
@@ -67,8 +75,8 @@ MVN_OPTS+=	-U
 .endif
 
 do-build:
-	${ECHO_CMD} "cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET}"
-	@(cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET})
+	${ECHO_CMD} "cd ${WRKSRC &&} JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET}"
+	@(cd ${WRKSRC} && JAVA_VERSION=${JAVA_VERSION} ${MVN} ${MVN_OPTS} ${MVN_TARGET})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index 859276e97d61..64b780d57bda 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1686316122
-SHA256 (igniterealtime-Openfire-v4.7.5_GH0.tar.gz) = 7c2c4cad2879606404d966a6183c33c77ecf885b814b45845e64aea4f0aaa305
-SIZE (igniterealtime-Openfire-v4.7.5_GH0.tar.gz) = 7423544
-SHA256 (FreeBSD-openfire-4.7.5-maven-repository.tar.gz) = 012f3bafc66d726de7a6b8ec4030eed23cca393a3433befeed352a4d2d828cde
-SIZE (FreeBSD-openfire-4.7.5-maven-repository.tar.gz) = 258158024
+TIMESTAMP = 1707929810
+SHA256 (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 20d919a9eec6a530189ba75b859501b3d99845df0e18b9e12ed3e646e67dd568
+SIZE (igniterealtime-Openfire-v4.8.0_GH0.tar.gz) = 8836109
+SHA256 (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 55b1c50a7c62092af476ef6ce75b9937df5098e1aee13906445e95c72dd0ca5b
+SIZE (FreeBSD-openfire-4.8.0-maven-repository.tar.gz) = 289799753
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 69706846645c..ba9e322be7fd 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -9,9 +9,19 @@
 @mode
 @dir %%DATADIR%%
 @dir %%DATADIR%%/plugins
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-mellium.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-moxxmpp.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-smack.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-stanzajs.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-stropejs.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-twistedwords.html
+%%PORTDOCS%%%%DOCSDIR%%/client-minimal-working-example-xmppdotnet.html
 %%PORTDOCS%%%%DOCSDIR%%/database-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/database.html
+%%PORTDOCS%%%%DOCSDIR%%/db-clustering-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/db-integration-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/diagrams/netty-message-handling.md
+%%PORTDOCS%%%%DOCSDIR%%/diagrams/netty-server-bootstrap.md
 %%PORTDOCS%%%%DOCSDIR%%/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/ide-vscode-setup.html
 %%PORTDOCS%%%%DOCSDIR%%/images/VSCode-1.png
@@ -26,16 +36,36 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/active_directory.png
 %%PORTDOCS%%%%DOCSDIR%%/images/header_logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/launcher.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-in-openfire.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-message-handling.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-overview.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-pipelines.png
+%%PORTDOCS%%%%DOCSDIR%%/images/netty-server-bootstrap.png
+%%PORTDOCS%%%%DOCSDIR%%/images/network-dns-override.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/network-hub-and-spoke.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/network-mesh.svg
+%%PORTDOCS%%%%DOCSDIR%%/images/one-time-access-token-login.png
 %%PORTDOCS%%%%DOCSDIR%%/images/setup_ldap.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_enable_clustering.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_install_hazelcast.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_jdbc.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_recovery.png
+%%PORTDOCS%%%%DOCSDIR%%/images/setup_pgcluster_second_primary.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sitemesh.png
 %%PORTDOCS%%%%DOCSDIR%%/images/spark_debug.png
 %%PORTDOCS%%%%DOCSDIR%%/images/windows_service.png
+%%PORTDOCS%%%%DOCSDIR%%/implementing-authprovider-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/implementing-groupprovider-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/implementing-userprovider-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/internal-networking.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-dom4j.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-jaxen.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LICENSE-xpp3.txt
+%%PORTDOCS%%%%DOCSDIR%%/load-balancing.html
+%%PORTDOCS%%%%DOCSDIR%%/one-time-access-token-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/openfire.doap
 %%PORTDOCS%%%%DOCSDIR%%/overlay.html
 %%PORTDOCS%%%%DOCSDIR%%/pluggable-roster-support-guide.html
@@ -46,6 +76,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/ssl-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/trunking-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-ent-3_2_0-upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
@@ -53,19 +84,18 @@
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/lib/activation-1.1.jar
-%%DATADIR%%/lib/apache-el-8.5.54.jar
-%%DATADIR%%/lib/apache-jsp-8.5.54.jar
-%%DATADIR%%/lib/apache-jsp-9.4.43.v20210629.jar
-%%DATADIR%%/lib/asm-9.1.jar
-%%DATADIR%%/lib/asm-analysis-9.1.jar
-%%DATADIR%%/lib/asm-commons-9.1.jar
-%%DATADIR%%/lib/asm-tree-9.1.jar
-%%DATADIR%%/lib/bcpg-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcpkix-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcprov-jdk15on-1.70.jar
-%%DATADIR%%/lib/bcutil-jdk15on-1.70.jar
+%%DATADIR%%/lib/apache-el-9.0.52.jar
+%%DATADIR%%/lib/apache-jsp-10.0.18.jar
+%%DATADIR%%/lib/apache-jsp-9.0.52.jar
+%%DATADIR%%/lib/asm-9.6.jar
+%%DATADIR%%/lib/asm-commons-9.6.jar
+%%DATADIR%%/lib/asm-tree-9.6.jar
+%%DATADIR%%/lib/bcpg-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcpkix-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcprov-jdk18on-1.76.jar
+%%DATADIR%%/lib/bcutil-jdk18on-1.76.jar
 %%DATADIR%%/lib/caffeine-2.7.0.jar
-%%DATADIR%%/lib/checker-qual-3.5.0.jar
+%%DATADIR%%/lib/checker-qual-3.31.0.jar
 %%DATADIR%%/lib/common-image-3.9.4.jar
 %%DATADIR%%/lib/common-io-3.9.4.jar
 %%DATADIR%%/lib/common-lang-3.9.4.jar
@@ -73,100 +103,124 @@
 %%DATADIR%%/lib/commons-dbcp2-2.9.0.jar
 %%DATADIR%%/lib/commons-fileupload-1.5.jar
 %%DATADIR%%/lib/commons-io-2.11.0.jar
+%%DATADIR%%/lib/commons-ip-math-1.32.jar
 %%DATADIR%%/lib/commons-lang3-3.9.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/commons-pool2-2.9.0.jar
 %%DATADIR%%/lib/commons-text-1.10.0.jar
-%%DATADIR%%/lib/dom4j-2.1.3.jar
+%%DATADIR%%/lib/dom4j-2.1.4.jar
 %%DATADIR%%/lib/dwr-3.0.2-RELEASE.jar
-%%DATADIR%%/lib/ecj-3.19.0.jar
-%%DATADIR%%/lib/error_prone_annotations-2.3.4.jar
+%%DATADIR%%/lib/ecj-3.26.0.jar
+%%DATADIR%%/lib/error_prone_annotations-2.18.0.jar
 %%DATADIR%%/lib/failureaccess-1.0.1.jar
-%%DATADIR%%/lib/guava-30.1-jre.jar
-%%DATADIR%%/lib/hsqldb-2.4.1.jar
+%%DATADIR%%/lib/guava-32.0.1-jre.jar
+%%DATADIR%%/lib/hsqldb-2.7.1.jar
 %%DATADIR%%/lib/httpclient-4.5.13.jar
 %%DATADIR%%/lib/httpcore-4.4.13.jar
-%%DATADIR%%/lib/i18n-4.7.5.jar
+%%DATADIR%%/lib/i18n-4.8.0.jar
 %%DATADIR%%/lib/imageio-bmp-3.9.4.jar
 %%DATADIR%%/lib/imageio-core-3.9.4.jar
 %%DATADIR%%/lib/istack-commons-runtime-3.0.11.jar
-%%DATADIR%%/lib/j2objc-annotations-1.3.jar
+%%DATADIR%%/lib/j2objc-annotations-2.8.jar
 %%DATADIR%%/lib/jakarta.activation-1.2.2.jar
+%%DATADIR%%/lib/jakarta.annotation-api-1.3.5.jar
+%%DATADIR%%/lib/jakarta.transaction-api-1.3.3.jar
 %%DATADIR%%/lib/jakarta.xml.bind-api-2.3.3.jar
 %%DATADIR%%/lib/jansi-1.18.jar
-%%DATADIR%%/lib/javassist-3.24.1-GA.jar
 %%DATADIR%%/lib/javax.activation-api-1.2.0.jar
-%%DATADIR%%/lib/javax.annotation-api-1.3.2.jar
 %%DATADIR%%/lib/javax.mail-1.6.2.jar
-%%DATADIR%%/lib/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/lib/jaxb-api-2.3.1.jar
 %%DATADIR%%/lib/jaxb-runtime-2.3.3.jar
 %%DATADIR%%/lib/jaxen-1.2.0.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.36.jar
-%%DATADIR%%/lib/jdom2-2.0.6.jar
-%%DATADIR%%/lib/jetty-annotations-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-client-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-continuation-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-http-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-io-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-jmx-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-jndi-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-plus-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-schemas-3.1.2.jar
-%%DATADIR%%/lib/jetty-security-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-server-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-servlets-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-util-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-util-ajax-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-webapp-9.4.43.v20210629.jar
-%%DATADIR%%/lib/jetty-xml-9.4.43.v20210629.jar
+%%DATADIR%%/lib/jcl-over-slf4j-2.0.9.jar
+%%DATADIR%%/lib/jetty-annotations-10.0.18.jar
+%%DATADIR%%/lib/jetty-http-10.0.18.jar
+%%DATADIR%%/lib/jetty-io-10.0.18.jar
+%%DATADIR%%/lib/jetty-jmx-10.0.18.jar
+%%DATADIR%%/lib/jetty-jndi-10.0.18.jar
+%%DATADIR%%/lib/jetty-plus-10.0.18.jar
+%%DATADIR%%/lib/jetty-schemas-4.0.3.jar
+%%DATADIR%%/lib/jetty-security-10.0.18.jar
+%%DATADIR%%/lib/jetty-server-10.0.18.jar
+%%DATADIR%%/lib/jetty-servlet-10.0.18.jar
+%%DATADIR%%/lib/jetty-servlet-api-4.0.6.jar
+%%DATADIR%%/lib/jetty-servlets-10.0.18.jar
+%%DATADIR%%/lib/jetty-util-10.0.18.jar
+%%DATADIR%%/lib/jetty-webapp-10.0.18.jar
+%%DATADIR%%/lib/jetty-xml-10.0.18.jar
 %%DATADIR%%/lib/jmdns-1.0.jar
 %%DATADIR%%/lib/jsmpp-2.3.10.jar
+%%DATADIR%%/lib/json-20231013.jar
 %%DATADIR%%/lib/jsr305-3.0.2.jar
 %%DATADIR%%/lib/jtds-1.3.1.jar
 %%DATADIR%%/lib/jzlib-1.1.3.jar
 %%DATADIR%%/lib/libidn-1.35.jar
 %%DATADIR%%/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-%%DATADIR%%/lib/log4j-api-2.17.1.jar
-%%DATADIR%%/lib/log4j-core-2.17.1.jar
-%%DATADIR%%/lib/log4j-slf4j-impl-2.17.1.jar
+%%DATADIR%%/lib/log4j-api-2.20.0.jar
+%%DATADIR%%/lib/log4j-core-2.20.0.jar
+%%DATADIR%%/lib/log4j-slf4j2-impl-2.20.0.jar
 %%DATADIR%%/lib/log4j2.xml
-%%DATADIR%%/lib/mina-core-2.1.3.jar
-%%DATADIR%%/lib/mina-filter-compression-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-beans-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-jmx-2.1.3.jar
-%%DATADIR%%/lib/mina-integration-ognl-2.1.3.jar
-%%DATADIR%%/lib/mssql-jdbc-9.4.1.jre8.jar
-%%DATADIR%%/lib/mysql-connector-j-8.0.32.jar
-%%DATADIR%%/lib/ognl-3.2.10.jar
-%%DATADIR%%/lib/postgresql-42.4.1.jar
-%%DATADIR%%/lib/rome-1.15.0.jar
-%%DATADIR%%/lib/rome-utils-1.15.0.jar
+%%DATADIR%%/lib/mssql-jdbc-9.4.1.jre11.jar
+%%DATADIR%%/lib/mysql-connector-j-8.2.0.jar
+%%DATADIR%%/lib/netty-all-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-buffer-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-dns-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-haproxy-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-http-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-http2-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-memcache-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-mqtt-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-redis-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-smtp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-socks-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-stomp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-codec-xml-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-common-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-proxy-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-handler-ssl-ocsp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-classes-macos-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-resolver-dns-native-macos-4.1.100.Final-osx-aarch_64.jar
+%%DATADIR%%/lib/netty-resolver-dns-native-macos-4.1.100.Final-osx-x86_64.jar
+%%DATADIR%%/lib/netty-transport-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-classes-epoll-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-classes-kqueue-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
+%%DATADIR%%/lib/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+%%DATADIR%%/lib/netty-transport-native-kqueue-4.1.100.Final-osx-aarch_64.jar
+%%DATADIR%%/lib/netty-transport-native-kqueue-4.1.100.Final-osx-x86_64.jar
+%%DATADIR%%/lib/netty-transport-native-unix-common-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-rxtx-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-sctp-4.1.100.Final.jar
+%%DATADIR%%/lib/netty-transport-udt-4.1.100.Final.jar
+%%DATADIR%%/lib/postgresql-42.6.0.jar
 %%DATADIR%%/lib/shaj-0.5.jar
 %%DATADIR%%/lib/sitemesh-2.4.2.jar
-%%DATADIR%%/lib/slf4j-api-1.7.36.jar
+%%DATADIR%%/lib/slf4j-api-2.0.9.jar
 %%DATADIR%%/lib/startup.jar
 %%DATADIR%%/lib/taglibs-standard-impl-1.2.5.jar
 %%DATADIR%%/lib/taglibs-standard-spec-1.2.5.jar
 %%DATADIR%%/lib/tinder-2.0.0.jar
 %%DATADIR%%/lib/txw2-2.3.3.jar
-%%DATADIR%%/lib/websocket-api-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-client-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-common-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-server-9.4.43.v20210629.jar
-%%DATADIR%%/lib/websocket-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/lib/xmppserver-4.7.5.jar
+%%DATADIR%%/lib/websocket-core-common-10.0.18.jar
+%%DATADIR%%/lib/websocket-core-server-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-api-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-common-10.0.18.jar
+%%DATADIR%%/lib/websocket-jetty-server-10.0.18.jar
+%%DATADIR%%/lib/websocket-servlet-10.0.18.jar
+%%DATADIR%%/lib/xmppserver-4.8.0.jar
 %%DATADIR%%/lib/xpp3-1.1.4c.jar
 %%DATADIR%%/logs
 %%DATADIR%%/plugins/admin/plugin.xml
-%%DATADIR%%/plugins/admin/webapp/META-INF/admin.tld
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/contentBox.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/infoBox.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/security/identityStoreConfig.tagx
-%%DATADIR%%/plugins/admin/webapp/META-INF/tags/admin/security/trustStoreConfig.tagx
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/admin.tld
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/contentBox.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/infoBox.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/security/identityStoreConfig.tagx
+%%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/META-INF/tags/admin/security/trustStoreConfig.tagx
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/classes/openfire_init.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
 %%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
@@ -300,26 +354,8 @@
 %%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
 %%DATADIR%%/plugins/admin/webapp/index.html
 %%DATADIR%%/plugins/admin/webapp/js/behaviour.js
-%%DATADIR%%/plugins/admin/webapp/js/builder.js
-%%DATADIR%%/plugins/admin/webapp/js/controls.js
 %%DATADIR%%/plugins/admin/webapp/js/cookies.js
-%%DATADIR%%/plugins/admin/webapp/js/dragdrop.js
-%%DATADIR%%/plugins/admin/webapp/js/effects.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-setup.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-cold-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar.js
-%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
-%%DATADIR%%/plugins/admin/webapp/js/pngfix.js
-%%DATADIR%%/plugins/admin/webapp/js/prototype.js
-%%DATADIR%%/plugins/admin/webapp/js/scriptaculous.js
 %%DATADIR%%/plugins/admin/webapp/js/setup.js
-%%DATADIR%%/plugins/admin/webapp/js/slider.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domLib.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT_drag.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
-%%DATADIR%%/plugins/admin/webapp/js/unittest.js
 %%DATADIR%%/plugins/admin/webapp/setup/setup-style.css
 %%DATADIR%%/plugins/admin/webapp/style/framework/css/bootstrap.min.css
 %%DATADIR%%/plugins/admin/webapp/style/framework/css/font-awesome.min.css
@@ -331,7 +367,6 @@
 %%DATADIR%%/plugins/admin/webapp/style/framework/fonts/fontawesome-webfontd41d.eot
 %%DATADIR%%/plugins/admin/webapp/style/global.css
 %%DATADIR%%/plugins/admin/webapp/style/ldap.css
-%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
 %%DATADIR%%/plugins/admin/webapp/style/login.css
 %%DATADIR%%/plugins/admin/webapp/style/setup.css
 %%DATADIR%%/resources/database/openfire_db2.sql
diff --git a/net-im/purple-gowhatsapp/Makefile b/net-im/purple-gowhatsapp/Makefile
index 3620f6870724..01bc2f3896e4 100644
--- a/net-im/purple-gowhatsapp/Makefile
+++ b/net-im/purple-gowhatsapp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	purple-gowhatsapp
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.13.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-im
 
 MAINTAINER=	mi@aldan.algebra.com
diff --git a/net-im/slack-term/Makefile b/net-im/slack-term/Makefile
index d2827b5d3e91..a09d8e9275c6 100644
--- a/net-im/slack-term/Makefile
+++ b/net-im/slack-term/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	slack-term
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-im
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/net-im/ssh-chat/Makefile b/net-im/ssh-chat/Makefile
index dc8803a69399..8edd623b9690 100644
--- a/net-im/ssh-chat/Makefile
+++ b/net-im/ssh-chat/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ssh-chat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.10.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-im
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index c2ff759bf739..126a5e17b246 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	telegram-desktop
 DISTVERSION=	4.16.4
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
diff --git a/net-im/teleirc/Makefile b/net-im/teleirc/Makefile
index 697a4a01f01a..665713ded981 100644
--- a/net-im/teleirc/Makefile
+++ b/net-im/teleirc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	teleirc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net-im
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
index 01fd17291629..2175f87e9a04 100644
--- a/net-im/xmpp-client/Makefile
+++ b/net-im/xmpp-client/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xmpp-client
 PORTVERSION=	20170324
-PORTREVISION=	22
+PORTREVISION=	24
 CATEGORIES=	net-im
 
 MAINTAINER=	cs@FreeBSD.org
diff --git a/net-mgmt/adguard-exporter/Makefile b/net-mgmt/adguard-exporter/Makefile
index ceb4c3b9a529..f74f36ab2f06 100644
--- a/net-mgmt/adguard-exporter/Makefile
+++ b/net-mgmt/adguard-exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		adguard-exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.14
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		net-mgmt
 
 MAINTAINER=		christer.edwards@gmail.com
diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile
index 19b91f507b59..7417add0b257 100644
--- a/net-mgmt/alertmanager/Makefile
+++ b/net-mgmt/alertmanager/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	alertmanager
 PORTVERSION=	0.26.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	michal@hanu.la
diff --git a/net-mgmt/bind_exporter/Makefile b/net-mgmt/bind_exporter/Makefile
index 31ef443edfa4..6df07cdd029c 100644
--- a/net-mgmt/bind_exporter/Makefile
+++ b/net-mgmt/bind_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bind_exporter
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.7.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net-mgmt dns
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile
index db6258c31df6..b07a7af153c8 100644
--- a/net-mgmt/blackbox_exporter/Makefile
+++ b/net-mgmt/blackbox_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	blackbox_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/net-mgmt/bosun/Makefile b/net-mgmt/bosun/Makefile
index 978e8619078e..6c0e0a8a819e 100644
--- a/net-mgmt/bosun/Makefile
+++ b/net-mgmt/bosun/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bosun
 DISTVERSION=	0.9.0
 DISTVERSIONSUFFIX=	-preview
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	langer.markus@gmail.com
diff --git a/net-mgmt/carbon-relay-ng/Makefile b/net-mgmt/carbon-relay-ng/Makefile
index f7c16f780db0..58cfbf5c3efd 100644
--- a/net-mgmt/carbon-relay-ng/Makefile
+++ b/net-mgmt/carbon-relay-ng/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		carbon-relay-ng
 DISTVERSION=		0.10.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=		net-mgmt
 
 MAINTAINER=		a.andersson.thn@gmail.com
diff --git a/net-mgmt/carbonzipper/Makefile b/net-mgmt/carbonzipper/Makefile
index 19cde92d8c46..b57c58d6c7b0 100644
--- a/net-mgmt/carbonzipper/Makefile
+++ b/net-mgmt/carbonzipper/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		carbonzipper
 DISTVERSION=		0.74
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		net-mgmt
 
 MAINTAINER=		a.andersson.thn@gmail.com
diff --git a/net-mgmt/grok_exporter/Makefile b/net-mgmt/grok_exporter/Makefile
index f29d724eeec3..dfa0d875924c 100644
--- a/net-mgmt/grok_exporter/Makefile
+++ b/net-mgmt/grok_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grok_exporter
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.0.0.RC4
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	gasol.wu@gmail.com
diff --git a/net-mgmt/icingadb/Makefile b/net-mgmt/icingadb/Makefile
index 20680e9611ec..1c5a27cd4407 100644
--- a/net-mgmt/icingadb/Makefile
+++ b/net-mgmt/icingadb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	icingadb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.1
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dvl@FreeBSD.org
diff --git a/net-mgmt/intel-snap/Makefile b/net-mgmt/intel-snap/Makefile
index 56e54d3474f2..b73bc27b8c6d 100644
--- a/net-mgmt/intel-snap/Makefile
+++ b/net-mgmt/intel-snap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	intel-snap
 PORTVERSION=	0.0.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile
index 16cd4ca3c2d9..670ee36d9d22 100644
--- a/net-mgmt/kapacitor/Makefile
+++ b/net-mgmt/kapacitor/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kapacitor
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	cheffo@freebsd-bg.org
diff --git a/net-mgmt/mqtt2prometheus/Makefile b/net-mgmt/mqtt2prometheus/Makefile
index b731e0ca3f62..519523b09e16 100644
--- a/net-mgmt/mqtt2prometheus/Makefile
+++ b/net-mgmt/mqtt2prometheus/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		mqtt2prometheus
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.1.6
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		net-mgmt
 
 MAINTAINER=	manu@FreeBSD.org
diff --git a/net-mgmt/mysqld_exporter/Makefile b/net-mgmt/mysqld_exporter/Makefile
index c1fa8cf044a0..c34f186c32ac 100644
--- a/net-mgmt/mysqld_exporter/Makefile
+++ b/net-mgmt/mysqld_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mysqld_exporter
 PORTVERSION=	0.12.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	mr.deadlystorm@gmail.com
diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile
index bbdc071808dc..0239c3c47d49 100644
--- a/net-mgmt/netbox/Makefile
+++ b/net-mgmt/netbox/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	netbox
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.7.7
+DISTVERSION=	3.7.8
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	kai@FreeBSD.org
@@ -46,7 +46,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django42>=4.2.11<4.3:www/py-django42@${PY_FL
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.3<4:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.5.2<3.7:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocs-material>=9.5.18<10:textproc/py-mkdocs-material@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.25.0<1:textproc/py-mkdocstrings@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mkdocstrings>=0.25.1<1:textproc/py-mkdocstrings@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mkdocstrings-python-legacy>0:textproc/py-mkdocstrings-python-legacy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>=1.2.1<2:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \
diff --git a/net-mgmt/netbox/distinfo b/net-mgmt/netbox/distinfo
index 9ce1528ee8a3..a8e759d64639 100644
--- a/net-mgmt/netbox/distinfo
+++ b/net-mgmt/netbox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714600073
-SHA256 (netbox-community-netbox-v3.7.7_GH0.tar.gz) = edaac4de4b496cd284d21156d61d11ab25e7cadfe72427778c1d6c33ef876ccf
-SIZE (netbox-community-netbox-v3.7.7_GH0.tar.gz) = 9325767
+TIMESTAMP = 1715019574
+SHA256 (netbox-community-netbox-v3.7.8_GH0.tar.gz) = 1da9a5090fe134647fd0d2b820200d05cca6d713c0392b0bb0a663afbb541e21
+SIZE (netbox-community-netbox-v3.7.8_GH0.tar.gz) = 9328178
diff --git a/net-mgmt/netdata-go/Makefile b/net-mgmt/netdata-go/Makefile
index 22f8f7910394..184c673e239e 100644
--- a/net-mgmt/netdata-go/Makefile
+++ b/net-mgmt/netdata-go/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	netdata-go
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.58.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/net-mgmt/nsd_exporter/Makefile b/net-mgmt/nsd_exporter/Makefile
index fb88c4d9adcc..c40acdc8cba6 100644
--- a/net-mgmt/nsd_exporter/Makefile
+++ b/net-mgmt/nsd_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nsd_exporter
 PORTVERSION=	0.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile
index 7900061b8d96..54621bf85eb3 100644
--- a/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile
+++ b/net-mgmt/nvidia_gpu_prometheus_exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nvidia_gpu_prometheus_exporter
 DISTVERSION=	g20181028
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/net-mgmt/php-fpm_exporter/Makefile b/net-mgmt/php-fpm_exporter/Makefile
index de8005cec717..0c89a36a8dbd 100644
--- a/net-mgmt/php-fpm_exporter/Makefile
+++ b/net-mgmt/php-fpm_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	php-fpm_exporter
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.2.0
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	freebsd.org@neant.ro
diff --git a/net-mgmt/phpfpm_exporter/Makefile b/net-mgmt/phpfpm_exporter/Makefile
index 313688079edf..1400fa39422f 100644
--- a/net-mgmt/phpfpm_exporter/Makefile
+++ b/net-mgmt/phpfpm_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	phpfpm_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	gasol.wu@gmail.com
diff --git a/net-mgmt/ping_exporter/Makefile b/net-mgmt/ping_exporter/Makefile
index d1198362b298..ee406cf74c57 100644
--- a/net-mgmt/ping_exporter/Makefile
+++ b/net-mgmt/ping_exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ping_exporter
 DISTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	jp+ports@supplntr.io
diff --git a/net-mgmt/prometheus-collectd-exporter/Makefile b/net-mgmt/prometheus-collectd-exporter/Makefile
index 83aa89509daf..2c621027b2a2 100644
--- a/net-mgmt/prometheus-collectd-exporter/Makefile
+++ b/net-mgmt/prometheus-collectd-exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prometheus-collectd-exporter
 PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dsp@php.net
diff --git a/net-mgmt/prometheus1/Makefile b/net-mgmt/prometheus1/Makefile
index 1bb84d881a9e..85bca4830de7 100644
--- a/net-mgmt/prometheus1/Makefile
+++ b/net-mgmt/prometheus1/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prometheus
 PORTVERSION=	1.8.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	net-mgmt
 PKGNAMESUFFIX=	1
 
diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile
index 6d9965f37d70..1b214950851a 100644
--- a/net-mgmt/prometheus2/Makefile
+++ b/net-mgmt/prometheus2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	prometheus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.49.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod \
 		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONFULL}/:ui
diff --git a/net-mgmt/promscale/Makefile b/net-mgmt/promscale/Makefile
index a02c665e656f..05dfb381383a 100644
--- a/net-mgmt/promscale/Makefile
+++ b/net-mgmt/promscale/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	promscale
 DISTVERSION=	0.17.0
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	net-mgmt
 MASTER_SITES=   https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=      go.mod:gomod
diff --git a/net-mgmt/pushgateway/Makefile b/net-mgmt/pushgateway/Makefile
index 15c965843c3c..11dbe0b36ed3 100644
--- a/net-mgmt/pushgateway/Makefile
+++ b/net-mgmt/pushgateway/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pushgateway
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/net-mgmt/py-phonebox-plugin/Makefile b/net-mgmt/py-phonebox-plugin/Makefile
index e9bf452de8fd..6280ebcc08f6 100644
--- a/net-mgmt/py-phonebox-plugin/Makefile
+++ b/net-mgmt/py-phonebox-plugin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	phonebox-plugin
-DISTVERSION=	0.0.7b2
+DISTVERSION=	0.0.9
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-mgmt/py-phonebox-plugin/distinfo b/net-mgmt/py-phonebox-plugin/distinfo
index 3cfa67cab819..0364b7226fa5 100644
--- a/net-mgmt/py-phonebox-plugin/distinfo
+++ b/net-mgmt/py-phonebox-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706971037
-SHA256 (phonebox_plugin-0.0.7b2.tar.gz) = 4ea9428e495af071151440ee53fbd793b92c9317a10a70d1a8957d8bd4013e50
-SIZE (phonebox_plugin-0.0.7b2.tar.gz) = 19578
+TIMESTAMP = 1718444870
+SHA256 (phonebox_plugin-0.0.9.tar.gz) = f25988be06d2a707410ebb6baf963a7ad98d44272d3e4fd1a7d8e31e0906dfa0
+SIZE (phonebox_plugin-0.0.9.tar.gz) = 19906
diff --git a/net-mgmt/semaphore/Makefile b/net-mgmt/semaphore/Makefile
index 0df871ccddef..40d6568a0a71 100644
--- a/net-mgmt/semaphore/Makefile
+++ b/net-mgmt/semaphore/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	semaphore
 PORTVERSION=	2.9.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/net-mgmt/smartctl_exporter/Makefile b/net-mgmt/smartctl_exporter/Makefile
index 9d6ba3edb83f..674fc29d7b2f 100644
--- a/net-mgmt/smartctl_exporter/Makefile
+++ b/net-mgmt/smartctl_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		smartctl_exporter
 PORTVERSION=		0.12.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=		net-mgmt
 
 MAINTAINER=		delphij@FreeBSD.org
diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 6021353dd5b3..b6b7021b3176 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	telegraf
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.30.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/net-mgmt/thanos/Makefile b/net-mgmt/thanos/Makefile
index 7d3dc69f4f95..a3718b27561c 100644
--- a/net-mgmt/thanos/Makefile
+++ b/net-mgmt/thanos/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	thanos
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.28.0
-PORTREVISION=	14
+PORTREVISION=	16
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ler@FreeBSD.org
diff --git a/net-mgmt/unbound_exporter/Makefile b/net-mgmt/unbound_exporter/Makefile
index 4da74685654a..9b106dc56cd9 100644
--- a/net-mgmt/unbound_exporter/Makefile
+++ b/net-mgmt/unbound_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		unbound_exporter
 PORTVERSION=		0.4.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=		net-mgmt
 
 MAINTAINER=		aduitsis@cpan.org
diff --git a/net-mgmt/victoria-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile
index 392a8b927663..091bf8500363 100644
--- a/net-mgmt/victoria-metrics/Makefile
+++ b/net-mgmt/victoria-metrics/Makefile
@@ -1,7 +1,7 @@
 PORTNAME?=	victoria-metrics
 PORTVERSION=	1.93.10		# don't forget to update BUILDINFO_TAG
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/net-mgmt/vmutils/Makefile b/net-mgmt/vmutils/Makefile
index 9ba570307aaf..8ee1107ac024 100644
--- a/net-mgmt/vmutils/Makefile
+++ b/net-mgmt/vmutils/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	vmutils
-PORTREVISION=	1
+PORTREVISION=	3
 
 COMMENT=	Ancillary utilities and agent for VictoriaMetrics
 
diff --git a/net-p2p/autoscan/Makefile b/net-p2p/autoscan/Makefile
index f73a81d3c7f5..d464297ba1f3 100644
--- a/net-p2p/autoscan/Makefile
+++ b/net-p2p/autoscan/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	autoscan
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 
 MAINTAINER=	michiel@vanbaak.eu
diff --git a/net-p2p/bitmark-cli/Makefile b/net-p2p/bitmark-cli/Makefile
index 2cf4dbda5f7e..3c8ab1fc288b 100644
--- a/net-p2p/bitmark-cli/Makefile
+++ b/net-p2p/bitmark-cli/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	4
 PKGNAMESUFFIX=	-cli
 
 COMMENT=	Bitmark distributed property system cli
diff --git a/net-p2p/bitmark-daemon/Makefile b/net-p2p/bitmark-daemon/Makefile
index da7c5e76313f..087aa369966d 100644
--- a/net-p2p/bitmark-daemon/Makefile
+++ b/net-p2p/bitmark-daemon/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	4
 PKGNAMESUFFIX=	-daemon
 
 COMMENT=	Bitmark distributed property system daemon
diff --git a/net-p2p/bitmark-recorder/Makefile b/net-p2p/bitmark-recorder/Makefile
index 6831bf61272d..b629a8b7f381 100644
--- a/net-p2p/bitmark-recorder/Makefile
+++ b/net-p2p/bitmark-recorder/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	2
+PORTREVISION=	4
 PKGNAMESUFFIX=	-recorder
 
 COMMENT=	Bitmark distributed property system recorder
diff --git a/net-p2p/bitmark/Makefile b/net-p2p/bitmark/Makefile
index d84446a031aa..548aa05bbe72 100644
--- a/net-p2p/bitmark/Makefile
+++ b/net-p2p/bitmark/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bitmark
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 
 MAINTAINER=	hsw@bitmark.com
diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile
index c7a7738c3142..970d975baf17 100644
--- a/net-p2p/go-ethereum/Makefile
+++ b/net-p2p/go-ethereum/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-ethereum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.2
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net-p2p
 
 MAINTAINER=	me@enriquefynn.com
diff --git a/net-p2p/ogmios/distinfo b/net-p2p/ogmios/distinfo
index 4e877321ea8f..701bd5ccd81f 100644
--- a/net-p2p/ogmios/distinfo
+++ b/net-p2p/ogmios/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1709376686
+TIMESTAMP = 1715112442
 SHA256 (cabal/FailT-0.1.2.0/FailT-0.1.2.0.tar.gz) = f1e3d5714df7e7e134545239bd78927bc9949a9b4760dfa061ff2b35ff0a76c3
 SIZE (cabal/FailT-0.1.2.0/FailT-0.1.2.0.tar.gz) = 10971
 SHA256 (cabal/Glob-0.10.2/Glob-0.10.2.tar.gz) = 6af672ac8427d35cbd42d64142dc288feab266f0be92dae3c696e8860d8173c0
@@ -977,7 +977,7 @@ SHA256 (cabal/typed-process-0.2.11.1/typed-process-0.2.11.1.tar.gz) = d5c5dda091
 SIZE (cabal/typed-process-0.2.11.1/typed-process-0.2.11.1.tar.gz) = 18339
 SHA256 (cabal/typed-protocols-0.1.1.0.tar.gz) = 23feff45c28a15484cdfdbbebd4000f99148748d44f40bbb17df865ba44293ac
 SIZE (cabal/typed-protocols-0.1.1.0.tar.gz) = 24491
-SHA256 (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 3afb8cf577e858150eb2fdc89638c4a88987c1fd0d6332db77b1c69928fd207d
+SHA256 (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 8776c5b773e667290edc2b367bfdd6630c559181c37dd43ed3fd33e8ea9fbaa3
 SIZE (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 1630
 SHA256 (cabal/typed-protocols-cborg-0.1.0.4.tar.gz) = 355a02848edf9447451dc7ca0d43bccc25b50b8cc4eac62216203796a2b223f1
 SIZE (cabal/typed-protocols-cborg-0.1.0.4.tar.gz) = 6287
diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile
index 9dcc8a41a43c..e0969ca86c25 100644
--- a/net/bosh-bootloader/Makefile
+++ b/net/bosh-bootloader/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bosh-bootloader
 PORTVERSION=	7.6.0
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	net sysutils
 
 MAINTAINER=	dumbbell@FreeBSD.org
diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile
index 398cfc9dac19..51b95526738c 100644
--- a/net/bosh-cli/Makefile
+++ b/net/bosh-cli/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bosh-cli
 PORTVERSION=	5.5.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net sysutils
 
 MAINTAINER=	dumbbell@FreeBSD.org
diff --git a/net/cf/Makefile b/net/cf/Makefile
index c758287091b1..487f636171a1 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cf
 PORTVERSION=	6.49.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net
 
 MAINTAINER=	dumbbell@FreeBSD.org
diff --git a/net/clash/Makefile b/net/clash/Makefile
index d65d029c938c..82d148748f1d 100644
--- a/net/clash/Makefile
+++ b/net/clash/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	clash
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.18.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index 5a4445201ced..1eb2fa80794a 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cloudquery
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.32.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	se@FreeBSD.org
diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile
index e07c69b41a37..4d252623051b 100644
--- a/net/concourse-fly/Makefile
+++ b/net/concourse-fly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	concourse
 PORTVERSION=	6.7.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net sysutils
 MASTER_SITES=	LOCAL/dumbbell/concourse/
 PKGNAMESUFFIX=	-fly
diff --git a/net/containernetworking-plugins/Makefile b/net/containernetworking-plugins/Makefile
index 69115b1326a9..1bb51731ca52 100644
--- a/net/containernetworking-plugins/Makefile
+++ b/net/containernetworking-plugins/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	containernetworking-plugins
 DISTVERSIONPREFIX=	freebsd-v
 DISTVERSION=	0.5
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/net/croc/Makefile b/net/croc/Makefile
index d34c4945fe91..d41909be3a92 100644
--- a/net/croc/Makefile
+++ b/net/croc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	croc
 PORTVERSION=	9.6.15
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/net/drive/Makefile b/net/drive/Makefile
index f078d0d66929..a91f588415ac 100644
--- a/net/drive/Makefile
+++ b/net/drive/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	drive
 PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	28
+PORTREVISION=	30
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/net/evans/Makefile b/net/evans/Makefile
index 6d9babca6d1e..93817995fb40 100644
--- a/net/evans/Makefile
+++ b/net/evans/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	evans
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.11
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	net
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/net/frp/Makefile b/net/frp/Makefile
index f22d91a3136e..f0abbe1bf2e8 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	frp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.56.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/gdrive/Makefile b/net/gdrive/Makefile
index f5eaae5b8c4c..b4b12c28ff33 100644
--- a/net/gdrive/Makefile
+++ b/net/gdrive/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gdrive
 DISTVERSION=	2.1.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index ab9aeb830c63..ad4ae80ae7c7 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	geoipupdate
 PORTVERSION=	6.1.0
 PORTREVISION=	3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net geography
 
 MAINTAINER=	adamw@FreeBSD.org
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 3481732b981c..4259634dbe4f 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	16.11.1
+PORTVERSION=	16.11.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 671fc986fe47..f12a8c844aba 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1714054581
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.mod) = 73740cc2454413865622b26264c35ee5cdd7dd701e66e9e9642dc7d30e690b56
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.mod) = 7055
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.zip) = 83d04e4de5edec836135e138cf948c2d06e9c2447626f5f2986ea0f5b6d2ce13
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.1/v16.11.1.zip) = 1255441
+TIMESTAMP = 1715233688
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.mod) = 73740cc2454413865622b26264c35ee5cdd7dd701e66e9e9642dc7d30e690b56
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.mod) = 7055
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.zip) = 102901d9e5671fb6d2486fbdbde3a6296081727602204615f2d6e123f2a074cc
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.zip) = 1256580
diff --git a/net/gmid/Makefile b/net/gmid/Makefile
index 77f762ac6788..69f3787fca5f 100644
--- a/net/gmid/Makefile
+++ b/net/gmid/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gmid
-DISTVERSION=	2.0
-PORTREVISION=	1
+DISTVERSION=	2.0.5
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/omar-polo/${PORTNAME}/releases/download/${DISTVERSION}/ \
 		https://ftp.omarpolo.com/
diff --git a/net/gmid/distinfo b/net/gmid/distinfo
index b2e6a36c737f..f6bbbf5213ab 100644
--- a/net/gmid/distinfo
+++ b/net/gmid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704989207
-SHA256 (gmid-2.0.tar.gz) = b6e0213eea014ce00326e9e0417150632e1988d79eab1d8d044c7dd3ea018f9d
-SIZE (gmid-2.0.tar.gz) = 182861
+TIMESTAMP = 1718094990
+SHA256 (gmid-2.0.5.tar.gz) = 3328ebf277c597e175762089d38767adae13d70b7c2624ede738ec7108272539
+SIZE (gmid-2.0.5.tar.gz) = 192727
diff --git a/net/go-bapu/Makefile b/net/go-bapu/Makefile
index 2991cc36c662..ee0b42146afa 100644
--- a/net/go-bapu/Makefile
+++ b/net/go-bapu/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bapu
 PORTVERSION=	0.3.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net
 MASTER_SITES=	https://bitbucket.org/carlostrub/bapu/get/
 PKGNAMEPREFIX=	go-
diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile
index 403a27c2930c..5118bd16ce91 100644
--- a/net/go-cs/Makefile
+++ b/net/go-cs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-cs
 PORTVERSION=	0.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	net
 
 MAINTAINER=	akosela@andykosela.com
diff --git a/net/go-tcping/Makefile b/net/go-tcping/Makefile
index 152229a467b5..47bf9998b2e4 100644
--- a/net/go-tcping/Makefile
+++ b/net/go-tcping/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tcping
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${PORTNAME}/${DISTVERSIONFULL}/:gomod
 PKGNAMEPREFIX=	go-
diff --git a/net/gobgp/Makefile b/net/gobgp/Makefile
index 89dce68900dc..ea7df3cadb91 100644
--- a/net/gobgp/Makefile
+++ b/net/gobgp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gobgp
 PORTVERSION=	3.25.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 DIST_SUBDIR=	gobgp
 
diff --git a/net/goreplay/Makefile b/net/goreplay/Makefile
index 4dd395db52c3..448f5afcf29b 100644
--- a/net/goreplay/Makefile
+++ b/net/goreplay/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goreplay
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.2
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/net/gorss/Makefile b/net/gorss/Makefile
index 6e008c2a9ed1..ca1ea8f590d4 100644
--- a/net/gorss/Makefile
+++ b/net/gorss/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gorss
 PORTVERSION=	0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net www
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/grpcox/Makefile b/net/grpcox/Makefile
index 256ecd3968d4..47eb1c8d0f35 100644
--- a/net/grpcox/Makefile
+++ b/net/grpcox/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grpcox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/grpcui/Makefile b/net/grpcui/Makefile
index 43b0670dbf6a..205aac8a0d44 100644
--- a/net/grpcui/Makefile
+++ b/net/grpcui/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grpcui
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/grpcurl/Makefile b/net/grpcurl/Makefile
index d8a2d5596e84..44051e0af5bc 100644
--- a/net/grpcurl/Makefile
+++ b/net/grpcurl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grpcurl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.9
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/net/gscloud/Makefile b/net/gscloud/Makefile
index cde46b5b6409..865ebe4c0d9c 100644
--- a/net/gscloud/Makefile
+++ b/net/gscloud/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gscloud
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	net devel
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/net/ipinfo-cli/Makefile b/net/ipinfo-cli/Makefile
index 4bfb6d0f2cd2..e9bd6774f967 100644
--- a/net/ipinfo-cli/Makefile
+++ b/net/ipinfo-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ipinfo
 DISTVERSIONPREFIX=	ipinfo-
 DISTVERSION=	3.3.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/net/k6/Makefile b/net/k6/Makefile
index 24aa118dc95a..d833bd5bee64 100644
--- a/net/k6/Makefile
+++ b/net/k6/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	k6
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.50.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile
index 6a30a9d514f5..4b4efad59101 100644
--- a/net/keycloak/Makefile
+++ b/net/keycloak/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	keycloak
-DISTVERSION=	24.0.2
+DISTVERSION=	24.0.5
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
 
diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo
index 232dfe3dc74e..95079a07ca13 100644
--- a/net/keycloak/distinfo
+++ b/net/keycloak/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711357805
-SHA256 (keycloak-24.0.2.tar.gz) = 8e8f196d8371e4c243b25e48149db242a483fabf2f0a628d31428ead95e52844
-SIZE (keycloak-24.0.2.tar.gz) = 176420732
+TIMESTAMP = 1717488243
+SHA256 (keycloak-24.0.5.tar.gz) = 5a0332a57d7bef07cf79dbde621589bd8e58a323c314649c2b7c495b60385c6c
+SIZE (keycloak-24.0.5.tar.gz) = 176474421
diff --git a/net/keycloak/pkg-plist b/net/keycloak/pkg-plist
index 144f6c1177bf..24ab60a6e3e3 100644
--- a/net/keycloak/pkg-plist
+++ b/net/keycloak/pkg-plist
@@ -12,17 +12,17 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/conf/README.md
 %%JAVASHAREDIR%%/keycloak/lib/app/keycloak.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.github.crac.org-crac-0.1.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-bootstrap-runner-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-development-mode-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-vertx-latebound-mdc-provider-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-constraint-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-cpu-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-expression-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-function-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-io-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-net-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-os-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-ref-2.1.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-bootstrap-runner-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-development-mode-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.quarkus.quarkus-vertx-latebound-mdc-provider-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-constraint-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-cpu-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-expression-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-function-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-io-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-net-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-os-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/boot/io.smallrye.common.smallrye-common-ref-2.2.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/jakarta.json.jakarta.json-api-2.1.3.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.eclipse.parsson.parsson-1.1.5.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/boot/org.jboss.logging.jboss-logging-3.5.3.Final.jar
@@ -31,74 +31,74 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/com.fasterxml.jackson.dataformat.jackson-dataformat-yaml-2.16.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/deployment-class-path.dat
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.mvnpm.importmap-1.0.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.arc.arc-processor-3.8.3.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.arc.arc-processor-3.8.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.gizmo.gizmo-1.7.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-core-5.2.1.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-http-core-5.2.1.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.http.quarkus-http-servlet-5.2.1.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-test-supplement-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-app-model-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-core-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-builder-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-caffeine-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-class-change-agent-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-core-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-credentials-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-utilities-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-validator-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jaxrs-spi-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-h2-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mariadb-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mssql-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mysql-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-oracle-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-postgresql-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jsonp-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-service-binding-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-gelf-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-json-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-registry-prometheus-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-mutiny-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-narayana-jta-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-netty-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-reactive-routes-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-common-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-common-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-jackson-common-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-jackson-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-server-spi-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-spi-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-security-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-openapi-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-undertow-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-dev-ui-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-virtual-threads-deployment-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.qute.qute-core-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-common-processor-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-processor-3.8.3.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-agroal-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-arc-test-supplement-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-app-model-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-bootstrap-core-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-builder-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-caffeine-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-class-change-agent-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-core-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-credentials-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-datasource-deployment-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-devtools-utilities-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-orm-deployment-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-hibernate-validator-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jackson-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jaxrs-spi-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-h2-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mariadb-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mssql-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-mysql-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-oracle-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jdbc-postgresql-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-jsonp-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-service-binding-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-kubernetes-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-gelf-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-logging-json-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-micrometer-registry-prometheus-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-mutiny-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-narayana-jta-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-netty-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-common-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-panache-hibernate-common-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-reactive-routes-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-common-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-common-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-jackson-common-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-jackson-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-server-spi-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-resteasy-reactive-spi-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-security-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-context-propagation-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-health-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-smallrye-openapi-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-undertow-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-deployment-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-vertx-http-dev-ui-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.quarkus-virtual-threads-deployment-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.qute.qute-core-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-common-processor-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.quarkus.resteasy.reactive.resteasy-reactive-processor-3.8.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.jandex-3.1.6.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-health-ui-4.1.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/deployment/io.smallrye.smallrye-open-api-core-3.10.0.jar
@@ -147,75 +147,75 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-core-1.12.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-observation-1.12.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.micrometer.micrometer-registry-prometheus-1.12.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-buffer-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-dns-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-haproxy-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http2-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-socks-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-common-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-proxy-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-dns-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-classes-epoll-4.1.107.Final.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.107.Final-linux-aarch_64.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.107.Final-linux-x86_64.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-unix-common-4.1.107.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-buffer-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-dns-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-haproxy-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-http2-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-codec-socks-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-common-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-handler-proxy-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-resolver-dns-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-classes-epoll-4.1.108.Final.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.108.Final-linux-aarch_64.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-epoll-4.1.108.Final-linux-x86_64.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.netty.netty-transport-native-unix-common-4.1.108.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_common-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_common-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_otel-0.16.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.prometheus.simpleclient_tracer_otel_agent-0.16.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.arc.arc-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-agroal-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-arc-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-caffeine-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-core-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-credentials-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-common-3.8.3.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.arc.arc-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-agroal-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-arc-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-caffeine-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-core-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-credentials-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-datasource-common-3.8.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-fs-util-0.0.10.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-hibernate-orm-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jackson-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-h2-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mariadb-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mssql-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mysql-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-oracle-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-postgresql-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jsonp-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-gelf-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-json-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-registry-prometheus-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-mutiny-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-narayana-jta-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-netty-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-reactive-routes-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-common-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-jackson-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-jackson-common-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-security-runtime-spi-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-context-propagation-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-health-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-transaction-annotations-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-http-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-virtual-threads-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-types-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-jackson-3.8.3.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-vertx-3.8.3.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-hibernate-orm-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jackson-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-h2-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mariadb-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mssql-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-mysql-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-oracle-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jdbc-postgresql-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-jsonp-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-gelf-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-logging-json-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-micrometer-registry-prometheus-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-mutiny-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-narayana-jta-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-netty-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-reactive-routes-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-common-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-jackson-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-resteasy-reactive-jackson-common-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-security-runtime-spi-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-context-propagation-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-smallrye-health-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-transaction-annotations-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-vertx-http-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.quarkus-virtual-threads-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-common-types-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-jackson-3.8.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.resteasy.reactive.resteasy-reactive-vertx-3.8.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.quarkus.security.quarkus-security-2.0.3.Final.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.reactivex.rxjava3.rxjava-3.1.8.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-annotation-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-classloader-2.1.2.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-vertx-context-2.1.2.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-annotation-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-classloader-2.2.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.common.smallrye-common-vertx-context-2.2.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-3.5.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-common-3.5.4.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.config.smallrye-config-core-3.5.4.jar
@@ -223,16 +223,16 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-2.5.8.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-smallrye-context-propagation-2.5.8.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.mutiny-zero-flow-adapters-1.0.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-auth-common-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-bridge-common-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-core-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-runtime-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-uri-template-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-3.10.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-common-3.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-auth-common-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-bridge-common-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-core-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-runtime-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-uri-template-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-3.11.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-mutiny-vertx-web-common-3.11.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-reactive-converter-api-3.0.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.smallrye-reactive-converter-mutiny-3.0.1.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.vertx-mutiny-generator-3.10.0.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.reactive.vertx-mutiny-generator-3.11.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-2.1.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-api-2.1.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-context-propagation-jta-2.1.0.jar
@@ -241,12 +241,12 @@ bin/kcreg
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-4.1.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-api-4.1.0.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/io.smallrye.smallrye-health-provided-checks-4.1.0.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-auth-common-4.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-bridge-common-4.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-codegen-4.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-core-4.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-4.5.4.jar
-%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-common-4.5.4.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-auth-common-4.5.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-bridge-common-4.5.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-codegen-4.5.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-core-4.5.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-4.5.7.jar
+%%JAVASHAREDIR%%/keycloak/lib/lib/main/io.vertx.vertx-web-common-4.5.7.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.activation.jakarta.activation-api-2.1.2.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.annotation.jakarta.annotation-api-2.1.1.jar
 %%JAVASHAREDIR%%/keycloak/lib/lib/main/jakarta.el.jakarta.el-api-5.0.1.jar
diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 8de6fe8a0569..5162e6cfc629 100644
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	knxd
-PORTVERSION=	0.14.59
-PORTREVISION=	1
+PORTVERSION=	0.14.61
 CATEGORIES=	net
 
 # make is compatible with fmt >= 10, https://github.com/knxd/knxd/pull/549
-PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
-PATCHFILES=	797283251470786bffd6586571407337da899d30.patch:-p1
+#PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
+#PATCHFILES=	797283251470786bffd6586571407337da899d30.patch:-p1
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Advanced router/gateway for KNX
diff --git a/net/knxd/distinfo b/net/knxd/distinfo
index 864cdf22667b..e36fcce09ff8 100644
--- a/net/knxd/distinfo
+++ b/net/knxd/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1694957860
-SHA256 (knxd-knxd-0.14.59_GH0.tar.gz) = 8b8314ad4265cd48e9a257a1bcfd162b1084422f765082b45cceabdd70c0c164
-SIZE (knxd-knxd-0.14.59_GH0.tar.gz) = 290029
-SHA256 (797283251470786bffd6586571407337da899d30.patch) = bb6d18da632fca37d4822eb2358e8183394a730aa1547522ec2571bad8e1cd40
-SIZE (797283251470786bffd6586571407337da899d30.patch) = 3741
+TIMESTAMP = 1715574880
+SHA256 (knxd-knxd-0.14.61_GH0.tar.gz) = b5284c89a55a2c53e0ff769ec4f736fc1ad4b55afdd2a18b9258fa95f708d798
+SIZE (knxd-knxd-0.14.61_GH0.tar.gz) = 290641
diff --git a/net/krakend-ce/Makefile b/net/krakend-ce/Makefile
index b1649f6e15cc..083f1d179d56 100644
--- a/net/krakend-ce/Makefile
+++ b/net/krakend-ce/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	krakend-ce
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net
 
 MAINTAINER=	jrm@FreeBSD.org
diff --git a/net/kube-apiserver/Makefile b/net/kube-apiserver/Makefile
index 45524d92b787..17004816e77a 100644
--- a/net/kube-apiserver/Makefile
+++ b/net/kube-apiserver/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kube-apiserver
 PORTVERSION=	1.27.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	loic.blot@unix-experience.fr
diff --git a/net/kube-controller-manager/Makefile b/net/kube-controller-manager/Makefile
index 77fb3ac320e5..d452a87896bb 100644
--- a/net/kube-controller-manager/Makefile
+++ b/net/kube-controller-manager/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kube-controller-manager
 PORTVERSION=	1.27.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	loic.blot@unix-experience.fr
diff --git a/net/kube-scheduler/Makefile b/net/kube-scheduler/Makefile
index c69ccef5309f..0339dac94345 100644
--- a/net/kube-scheduler/Makefile
+++ b/net/kube-scheduler/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kube-scheduler
 PORTVERSION=	1.27.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	loic.blot@unix-experience.fr
diff --git a/net/librespeed-cli/Makefile b/net/librespeed-cli/Makefile
index 2b13fec1ea71..e3895ddc9b46 100644
--- a/net/librespeed-cli/Makefile
+++ b/net/librespeed-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	librespeed-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.10
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	net www
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile
index 0e6015e2fd71..542086382f38 100644
--- a/net/librespeed-go/Makefile
+++ b/net/librespeed-go/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	librespeed-go
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.5
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	net www
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/net/madonctl/Makefile b/net/madonctl/Makefile
index b263f3c830e3..19df6b4ee6bc 100644
--- a/net/madonctl/Makefile
+++ b/net/madonctl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	madonctl
 PORTVERSION=	2.3.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	net
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/net/nats-nkeys/Makefile b/net/nats-nkeys/Makefile
index 48a7ae248924..a60e11bc4681 100644
--- a/net/nats-nkeys/Makefile
+++ b/net/nats-nkeys/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nkeys
 PORTVERSION=	0.4.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net
 PKGNAMEPREFIX=	nats-
 
diff --git a/net/nats-nsc/Makefile b/net/nats-nsc/Makefile
index b8448c0a6a7a..2e4ef3dcdb4c 100644
--- a/net/nats-nsc/Makefile
+++ b/net/nats-nsc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nsc
 PORTVERSION=	2.8.6
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 PKGNAMEPREFIX=	nats-
 
diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index f39b9c5e00b9..4e12076d7bc5 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	nats-server
 PORTVERSION=	2.10.12
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index 554cfcb7d0a7..855ed620f74a 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nats-streaming-server
 PORTVERSION=	0.25.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/net/nats-top/Makefile b/net/nats-top/Makefile
index 82322840e42b..66b840c7a102 100644
--- a/net/nats-top/Makefile
+++ b/net/nats-top/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nats-top
 PORTVERSION=	0.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/net/natscli/Makefile b/net/natscli/Makefile
index 6a8aeb36b199..77977082822a 100644
--- a/net/natscli/Makefile
+++ b/net/natscli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	natscli
 PORTVERSION=	0.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	olgeni@FreeBSD.org
diff --git a/net/nsq/Makefile b/net/nsq/Makefile
index 86480543ddf3..5041bc9d366a 100644
--- a/net/nsq/Makefile
+++ b/net/nsq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nsq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net
 
 MAINTAINER=	jhixson@FreeBSD.org
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index d23d48942465..dce7244f7f6d 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	ntp
-PORTVERSION=	4.2.8p17
-PORTREVISION=	2
+PORTVERSION=	4.2.8p18
 CATEGORIES=	net
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index 4ff912b62a96..d892a22d8d76 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686054066
-SHA256 (ntp-4.2.8p17.tar.gz) = 103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866
-SIZE (ntp-4.2.8p17.tar.gz) = 7120469
+TIMESTAMP = 1716733386
+SHA256 (ntp-4.2.8p18.tar.gz) = cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5
+SIZE (ntp-4.2.8p18.tar.gz) = 7210799
diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c
deleted file mode 100644
index 9cd041eccd42..000000000000
--- a/net/ntp/files/patch-ntpd_ntpd.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- ntpd/ntpd.c.orig	2020-06-23 02:17:48.000000000 -0700
-+++ ntpd/ntpd.c	2022-02-18 12:02:30.547638000 -0800
-@@ -145,17 +145,6 @@
- # include <seccomp.h>
- #endif /* LIBSECCOMP and KERN_SECCOMP */
- 
--#ifdef __FreeBSD__
--#include <sys/procctl.h>
--#ifndef PROC_STACKGAP_CTL
--/*
-- * Even if we compile on an older system we can still run on a newer one.
-- */
--#define	PROC_STACKGAP_CTL	17
--#define	PROC_STACKGAP_DISABLE	0x0002
--#endif
--#endif
--
- #ifdef HAVE_DNSREGISTRATION
- # include <dns_sd.h>
- DNSServiceRef mdns;
-@@ -438,18 +427,6 @@
- 	char *argv[]
- 	)
- {
--#   ifdef __FreeBSD__
--	{
--		/*
--		 * We Must disable ASLR stack gap on FreeBSD to avoid a
--		 * segfault. See PR/241421 and PR/241960.
--		 */
--		int aslr_var = PROC_STACKGAP_DISABLE;
--
--		pid_t my_pid = getpid();
--		procctl(P_PID, my_pid, PROC_STACKGAP_CTL, &aslr_var); 
--	}
--#   endif
- 	return ntpdmain(argc, argv);
- }
- #endif /* !SYS_WINNT */
-@@ -1058,7 +1035,7 @@
- # if defined(HAVE_MLOCKALL)
- #  ifdef HAVE_SETRLIMIT
- 	ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k");
--#   ifdef RLIMIT_MEMLOCK
-+#   if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && DFLT_RLIMIT_MEMLOCK != -1
- 	/*
- 	 * The default RLIMIT_MEMLOCK is very low on Linux systems.
- 	 * Unless we increase this limit malloc calls are likely to
diff --git a/net/ntp/files/patch-scripts_build_checkHtmlFileDates b/net/ntp/files/patch-scripts_build_checkHtmlFileDates
index cf9f4d541e8a..ae3c4e04e08e 100644
--- a/net/ntp/files/patch-scripts_build_checkHtmlFileDates
+++ b/net/ntp/files/patch-scripts_build_checkHtmlFileDates
@@ -1,14 +1,15 @@
---- scripts/build/checkHtmlFileDates.orig	2021-10-15 20:33:38.712582000 -0700
-+++ scripts/build/checkHtmlFileDates	2021-10-15 20:37:19.867441000 -0700
-@@ -1,16 +1,3 @@
- #! /bin/sh
+--- scripts/build/checkHtmlFileDates.orig	2024-05-10 08:05:57.221756000 -0700
++++ scripts/build/checkHtmlFileDates	2024-05-10 08:07:53.965997000 -0700
+@@ -18,17 +18,5 @@
  
--bk version > /dev/null 2>&1 || exit 0
--
--for i in `find * -type f -name '*.html' -print | grep -v SCCS/`
+ # Do nothing if the directory is not a BK repo,
+ # or if BK is not even installed.
+-bk status > /dev/null 2>&1 || exit 0
+ 
+-for i in `echo *.html`
 -do
 -    # echo $i
--    set `bk diffs $i | wc -l`
+-    set `bk diff --normal $i | wc -l`
 -    lines=$1
 -    case "$lines" in
 -     0) ;;
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 4ffe6ef6b5d7..01dab2b771b7 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -21,6 +21,7 @@ sbin/ntptime
 sbin/sntp
 sbin/update-leap
 %%PERL_UTILS%%share/ntp/lib/NTP/Util.pm
+%%PORTDOCS%%%%DOCSDIR%%/.datecheck
 %%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
@@ -118,6 +119,7 @@ sbin/update-leap
 %%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html
 %%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/.datecheck
 %%PORTDOCS%%%%DOCSDIR%%/html/access.html
 %%PORTDOCS%%%%DOCSDIR%%/html/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/html/assoc.html
diff --git a/net/ooni-mini/Makefile b/net/ooni-mini/Makefile
index 0b7fe2d88ecb..c194e027cd4b 100644
--- a/net/ooni-mini/Makefile
+++ b/net/ooni-mini/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		ooni-mini
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.23.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		net www benchmarks
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/net/ooni-probe-cli/Makefile b/net/ooni-probe-cli/Makefile
index d0db026d77e9..fa47bcd5ef97 100644
--- a/net/ooni-probe-cli/Makefile
+++ b/net/ooni-probe-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		ooni-probe-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=		3.15.3
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=		net www benchmarks
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/net/py-qt6-networkauth/Makefile b/net/py-qt6-networkauth/Makefile
index f9c25118f7f1..ad5d0e107f92 100644
--- a/net/py-qt6-networkauth/Makefile
+++ b/net/py-qt6-networkauth/Makefile
@@ -11,11 +11,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for the Qt6 toolkit, QtNetworkAuth module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
-LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
-
 USES=		gl pyqt:6 python qt:6
-USE_GL=		gl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYQT=	sip:build pyqt6 qtbuilder
 USE_PYTHON=	concurrent flavors
 USE_QT=		base networkauth
diff --git a/net/py-qt6-networkauth/distinfo b/net/py-qt6-networkauth/distinfo
index a7675b2301fe..e7358e253955 100644
--- a/net/py-qt6-networkauth/distinfo
+++ b/net/py-qt6-networkauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698901185
-SHA256 (PyQt6_NetworkAuth-6.6.0.tar.gz) = cdfc0bfaea16a9e09f075bdafefb996aa9fdec392052ba4fb3cbac233c1958fb
-SIZE (PyQt6_NetworkAuth-6.6.0.tar.gz) = 20114
+TIMESTAMP = 1714272075
+SHA256 (PyQt6_NetworkAuth-6.7.0.tar.gz) = 974983525437633a0f016c0ffa0dc311847089f253dfe6840b0ec8ce21dc8685
+SIZE (PyQt6_NetworkAuth-6.7.0.tar.gz) = 20275
diff --git a/net/qrcp/Makefile b/net/qrcp/Makefile
index 7ad22b88b1a1..220f32716717 100644
--- a/net/qrcp/Makefile
+++ b/net/qrcp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qrcp
 DISTVERSION=	0.11.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/net/qt5-network/distinfo b/net/qt5-network/distinfo
index 6dd26aff108e..b3c324e7d4e3 100644
--- a/net/qt5-network/distinfo
+++ b/net/qt5-network/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771153
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716930658
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/net/qt5-networkauth/distinfo b/net/qt5-networkauth/distinfo
index ce5eb6b35692..32c8c8025666 100644
--- a/net/qt5-networkauth/distinfo
+++ b/net/qt5-networkauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771154
-SHA256 (KDE/Qt/5.15.13/kde-qtnetworkauth-5.15.13p0.tar.xz) = ff183120c28b0cc211f9e0577e18e03f0c3a6aca12e79fefceb121409a946546
-SIZE (KDE/Qt/5.15.13/kde-qtnetworkauth-5.15.13p0.tar.xz) = 120076
+TIMESTAMP = 1716930659
+SHA256 (KDE/Qt/5.15.14/kde-qtnetworkauth-5.15.14p1.tar.xz) = 786e1dbdbd2160f8e1139855b7ea9030d37d97447a34e1edb9e9e06899b4c309
+SIZE (KDE/Qt/5.15.14/kde-qtnetworkauth-5.15.14p1.tar.xz) = 120152
diff --git a/net/qt6-coap/distinfo b/net/qt6-coap/distinfo
index 7a0dc440ea7e..cf499722cf01 100644
--- a/net/qt6-coap/distinfo
+++ b/net/qt6-coap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663462
-SHA256 (KDE/Qt/6.6.3/qt-qtcoap-v6.6.3_GH0.tar.gz) = ae5b67fc48f13da0a2353527fb0c6e6ac9f56374f0d17a66208116c3f3e1ae71
-SIZE (KDE/Qt/6.6.3/qt-qtcoap-v6.6.3_GH0.tar.gz) = 183074
+TIMESTAMP = 1718779142
+SHA256 (KDE/Qt/6.7.2/qt-qtcoap-v6.7.2_GH0.tar.gz) = 0cd980deb8c3d5a1cd4214f4b72819f77b2ec05d1855dd6e8ebbf3e4ce081624
+SIZE (KDE/Qt/6.7.2/qt-qtcoap-v6.7.2_GH0.tar.gz) = 183937
diff --git a/net/qt6-networkauth/distinfo b/net/qt6-networkauth/distinfo
index 6e823a89607c..a15532ed5abc 100644
--- a/net/qt6-networkauth/distinfo
+++ b/net/qt6-networkauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663464
-SHA256 (KDE/Qt/6.6.3/qtnetworkauth-everywhere-src-6.6.3.tar.xz) = 5db9a30b42d7ff22ce1a0048474c36b3b84e1e55f3af991ba3cc8e0dc9bb7594
-SIZE (KDE/Qt/6.6.3/qtnetworkauth-everywhere-src-6.6.3.tar.xz) = 143676
+TIMESTAMP = 1718779143
+SHA256 (KDE/Qt/6.7.2/qtnetworkauth-everywhere-src-6.7.2.tar.xz) = 7f09824fcfe589eb32260c305ff9a126fe3bf93be218d372e8e9c10e212df470
+SIZE (KDE/Qt/6.7.2/qtnetworkauth-everywhere-src-6.7.2.tar.xz) = 146892
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 69b3707b3d24..9a1611d2b49b 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rclone
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.66.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	tremere@cainites.net
diff --git a/net/revsocks/Makefile b/net/revsocks/Makefile
index a966c52853f9..654844c0e991 100644
--- a/net/revsocks/Makefile
+++ b/net/revsocks/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	revsocks
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.8
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/rosenpass/Makefile b/net/rosenpass/Makefile
index 12bae928634c..375d37af10f1 100644
--- a/net/rosenpass/Makefile
+++ b/net/rosenpass/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	rosenpass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.1
-PORTREVISION=	6
+DISTVERSION=	0.2.2
 CATEGORIES=	net net-vpn security
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/net/rosenpass/distinfo b/net/rosenpass/distinfo
index fd8ad7259a4f..78bd73c58f02 100644
--- a/net/rosenpass/distinfo
+++ b/net/rosenpass/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1701591502
+TIMESTAMP = 1718470305
 SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
 SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -361,5 +361,5 @@ SHA256 (rust/crates/zerocopy-derive-0.7.25.crate) = c2f140bda219a26ccc0cdb03dba5
 SIZE (rust/crates/zerocopy-derive-0.7.25.crate) = 528380
 SHA256 (rust/crates/zip-0.6.6.crate) = 760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261
 SIZE (rust/crates/zip-0.6.6.crate) = 65789
-SHA256 (rosenpass-rosenpass-v0.2.1_GH0.tar.gz) = 09dffa62c9bbf3bfa4b34c7667f4052f3c262195a45da9c21c8123f197e7742a
-SIZE (rosenpass-rosenpass-v0.2.1_GH0.tar.gz) = 4872159
+SHA256 (rosenpass-rosenpass-v0.2.2_GH0.tar.gz) = 0077cca7595a467a638988fab5267f89421d1b7589849d14c2db60636b8f353a
+SIZE (rosenpass-rosenpass-v0.2.2_GH0.tar.gz) = 4872109
diff --git a/net/rospo/Makefile b/net/rospo/Makefile
index 13f92c385967..5e227e469d77 100644
--- a/net/rospo/Makefile
+++ b/net/rospo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rospo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.12.0
-PORTREVISION=	3
+DISTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	net net-vpn sysutils
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/net/rospo/distinfo b/net/rospo/distinfo
index 42ba7acd721b..a04b88f6a535 100644
--- a/net/rospo/distinfo
+++ b/net/rospo/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705579751
-SHA256 (go/net_rospo/rospo-v0.12.0/v0.12.0.mod) = 1e4b5a55c9897363dceea53e5c2d74f16536555552d26ef8b16d0f8d73b6c898
-SIZE (go/net_rospo/rospo-v0.12.0/v0.12.0.mod) = 1039
-SHA256 (go/net_rospo/rospo-v0.12.0/v0.12.0.zip) = 1f656bbb4537e9fb3b8cb77a052bfb28809579c5b6f4926b38a9ac7373cdc3ed
-SIZE (go/net_rospo/rospo-v0.12.0/v0.12.0.zip) = 85512
+TIMESTAMP = 1715505643
+SHA256 (go/net_rospo/rospo-v0.12.1/v0.12.1.mod) = 7acd0b2bf059fbf492445c966098aea5749268910f86206d76865a955d3faba6
+SIZE (go/net_rospo/rospo-v0.12.1/v0.12.1.mod) = 1039
+SHA256 (go/net_rospo/rospo-v0.12.1/v0.12.1.zip) = c933dbdf779ecde5f62e14627cbad120eded9f8cb27fda08e1151ad29b61e17f
+SIZE (go/net_rospo/rospo-v0.12.1/v0.12.1.zip) = 85739
diff --git a/net/rubygem-activestorage61/Makefile b/net/rubygem-activestorage61/Makefile
index 200a94d4a607..db0d2a89411e 100644
--- a/net/rubygem-activestorage61/Makefile
+++ b/net/rubygem-activestorage61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activestorage
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/net/rubygem-activestorage61/distinfo b/net/rubygem-activestorage61/distinfo
index 2e0c3c31a224..dc7dd85aee1f 100644
--- a/net/rubygem-activestorage61/distinfo
+++ b/net/rubygem-activestorage61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391008
-SHA256 (rubygem/activestorage-6.1.7.7.gem) = b3965d8d5bca2c70a7b2056abb53a7ef1a85d0255ed7a3f1c83b903ae818208a
-SIZE (rubygem/activestorage-6.1.7.7.gem) = 58368
+TIMESTAMP = 1717568534
+SHA256 (rubygem/activestorage-6.1.7.8.gem) = 075665cc92c96fe7a589063401f8225182149dde3e3ce45b58ed826777c8db44
+SIZE (rubygem/activestorage-6.1.7.8.gem) = 58368
diff --git a/net/rubygem-activestorage70/Makefile b/net/rubygem-activestorage70/Makefile
index 3139a5b0e880..0ac3ba210c33 100644
--- a/net/rubygem-activestorage70/Makefile
+++ b/net/rubygem-activestorage70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activestorage
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/net/rubygem-activestorage70/distinfo b/net/rubygem-activestorage70/distinfo
index 1dc1c51b0537..d548474ffa0e 100644
--- a/net/rubygem-activestorage70/distinfo
+++ b/net/rubygem-activestorage70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391034
-SHA256 (rubygem/activestorage-7.0.8.1.gem) = 1fd641a93c93a133d016e11998953221db28736a667fe5da2331969850198f38
-SIZE (rubygem/activestorage-7.0.8.1.gem) = 66048
+TIMESTAMP = 1717568560
+SHA256 (rubygem/activestorage-7.0.8.4.gem) = cbfc2d9a708aa47822f1bfc36180c835515d3a22a160b43e8fe74ddc80e8b8e1
+SIZE (rubygem/activestorage-7.0.8.4.gem) = 66560
diff --git a/net/rubygem-activestorage71/Makefile b/net/rubygem-activestorage71/Makefile
index 8699682305e1..16bd7651564a 100644
--- a/net/rubygem-activestorage71/Makefile
+++ b/net/rubygem-activestorage71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	activestorage
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/net/rubygem-activestorage71/distinfo b/net/rubygem-activestorage71/distinfo
index e0d64d513bef..3ad1e6d06235 100644
--- a/net/rubygem-activestorage71/distinfo
+++ b/net/rubygem-activestorage71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391060
-SHA256 (rubygem/activestorage-7.1.3.2.gem) = 283777f15a5ae2519ccf2a573968fa7afaea02d24b90cd6e0c23f77331069727
-SIZE (rubygem/activestorage-7.1.3.2.gem) = 67072
+TIMESTAMP = 1717568586
+SHA256 (rubygem/activestorage-7.1.3.4.gem) = f2020ea0a77e105e480a9a15251c91d615eecb4b28a1a80968d6fb6a5dcb0a2e
+SIZE (rubygem/activestorage-7.1.3.4.gem) = 67072
diff --git a/net/s5cmd/Makefile b/net/s5cmd/Makefile
index 675fe331765b..1bca18c11a23 100644
--- a/net/s5cmd/Makefile
+++ b/net/s5cmd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	s5cmd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	net
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/net/seaweedfs/Makefile b/net/seaweedfs/Makefile
index 39e047c56d81..7c6c22f2baa8 100644
--- a/net/seaweedfs/Makefile
+++ b/net/seaweedfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	seaweedfs
 DISTVERSION=	3.59
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net sysutils
 
 MAINTAINER=	drtr0jan@yandex.ru
diff --git a/net/slackcat/Makefile b/net/slackcat/Makefile
index d51ec918bded..b215877b84f5 100644
--- a/net/slackcat/Makefile
+++ b/net/slackcat/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	slackcat
 DISTVERSION=	1.7.3
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	net
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=	go.mod:gomod
diff --git a/net/speedtest-go/Makefile b/net/speedtest-go/Makefile
index 4aeebb97cce4..d9138a1f5b07 100644
--- a/net/speedtest-go/Makefile
+++ b/net/speedtest-go/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	speedtest-go
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.10
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net www
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/net/stc/Makefile b/net/stc/Makefile
index 75949f0f5416..f4ef5796786d 100644
--- a/net/stc/Makefile
+++ b/net/stc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	stc
 PORTVERSION=	1.4
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	net
 
 MAINTAINER=	kbowling@FreeBSD.org
diff --git a/net/storj/Makefile b/net/storj/Makefile
index 62c0aec2d6cf..eaa6d0a231d3 100644
--- a/net/storj/Makefile
+++ b/net/storj/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	storj
 PORTVERSION=	1.97.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index d2b6ec984c7d..5353e5f47ec3 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	syncthing
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.27.5
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONFULL}
diff --git a/net/termshark/Makefile b/net/termshark/Makefile
index be59f33ab34f..1942f1f1f9d0 100644
--- a/net/termshark/Makefile
+++ b/net/termshark/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	termshark
 PORTVERSION=	2.4.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	net
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 377e1dc5a811..4e878fc2ead1 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	torsocks
 DISTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	https://people.torproject.org/~dgoulet/${PORTNAME}/
 
@@ -15,7 +15,7 @@ USES=		alias gmake libtool tar:xz
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/torsocks
 
 SUB_FILES=	pkg-message
 
diff --git a/net/traefik/Makefile b/net/traefik/Makefile
index edd0e162c931..6f6c5150e1cf 100644
--- a/net/traefik/Makefile
+++ b/net/traefik/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	traefik
-PORTVERSION=	2.11.2
-PORTREVISION=	1
+PORTVERSION=	2.11.5
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/riggs/${PORTNAME}
 
diff --git a/net/traefik/distinfo b/net/traefik/distinfo
index f14b71a70e23..b3d31b8edb47 100644
--- a/net/traefik/distinfo
+++ b/net/traefik/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712998209
-SHA256 (traefik-2.11.2.tar.xz) = 001d59c2540d22b37b690cadb49ea67bec7980b04e9947413e3133041fd3b7ec
-SIZE (traefik-2.11.2.tar.xz) = 21235432
+TIMESTAMP = 1719038915
+SHA256 (traefik-2.11.5.tar.xz) = cc5565a54ab1ec274f3993b57546d29c13f1a7e48c1c0cd036f1ebb428ad3ded
+SIZE (traefik-2.11.5.tar.xz) = 21863256
diff --git a/net/tunneller/Makefile b/net/tunneller/Makefile
index 8a71b930e60d..646b80d6fccd 100644
--- a/net/tunneller/Makefile
+++ b/net/tunneller/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tunneller
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	0.6
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/net/v2ray/Makefile b/net/v2ray/Makefile
index 166b1f9163ac..8cb9f3436f96 100644
--- a/net/v2ray/Makefile
+++ b/net/v2ray/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	v2ray
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.36.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	net
 
 MAINTAINER=	shen.elf@gmail.com
diff --git a/net/waypipe/Makefile b/net/waypipe/Makefile
index c6da19f32ad3..3ec5b59af835 100644
--- a/net/waypipe/Makefile
+++ b/net/waypipe/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	waypipe
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.0
+DISTVERSION=	0.9.1
 CATEGORIES=	net wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/net/waypipe/distinfo b/net/waypipe/distinfo
index 87ed844d02fb..2bbdcd3d6835 100644
--- a/net/waypipe/distinfo
+++ b/net/waypipe/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710608981
-SHA256 (waypipe-v0.9.0.tar.bz2) = 79d5e8c534e190b0f076ae2e9cd711881d31efc58dbbd6326b477f3ed5a99807
-SIZE (waypipe-v0.9.0.tar.bz2) = 193493
+TIMESTAMP = 1717943395
+SHA256 (waypipe-v0.9.1.tar.bz2) = d60d94a19038d2e231e3f1bf8122ae0894bc78fa753190f6e831c7931f8caaab
+SIZE (waypipe-v0.9.1.tar.bz2) = 193469
diff --git a/net/wifibox-alpine/Makefile b/net/wifibox-alpine/Makefile
index f7a6a62d7360..4a6bf957fd6e 100644
--- a/net/wifibox-alpine/Makefile
+++ b/net/wifibox-alpine/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifibox-alpine
-PORTVERSION=	20240328
+PORTVERSION=	20240506
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
@@ -93,33 +93,17 @@ _GITHUB_SITE=	https://github.com/pgj/freebsd-wifibox-alpine/releases/download
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	pgj
 GH_PROJECT=	freebsd-wifibox-alpine:scripts
-GH_TAGNAME=	fe9b384e45c57b0cfafe5e5b3931ba163f4230fd:scripts
-
-ALPINE_VERSION=	3.19.1
-ALPINE_DATE=	2024.03.23
+GH_TAGNAME=	3ce5b1faf48ef4b9d52c38bf518aa612242fba3f:scripts
 
+ALPINE_VERSION=		3.19.1
 LINUX_LTS_VERSION=	6.6.22-r1
 LINUX_EDGE_VERSION=	6.8.1-r1
 
-_ALPINE_VER=	${ALPINE_VERSION:C@([0-9]+)\.([0-9]+).*@\1.\2@}
-_ALPINE_SITE1=	https://dl-cdn.alpinelinux.org/alpine/v${_ALPINE_VER}
-
-_ALPINE_BASE=	https://mirror.fel.cvut.cz
-
-.if defined(ALPINE_DATE)
-_SNAPSHOT=     	${ALPINE_DATE:S/./-/g}
-_ALPINE_SITE2=  ${_ALPINE_BASE}/alpine/snapshots/${_SNAPSHOT}/v${_ALPINE_VER}
-.else
-_ALPINE_SITE2=	${_ALPINE_BASE}/alpine/v${_ALPINE_VER}
-.endif
-
 _LINUXFW_SITE=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/
 _LINUXFW_TAG=	20240312
 _LINUXFW=	linux-firmware-${_LINUXFW_TAG}
 
-MASTER_SITES+=	${_ALPINE_SITE1}/releases/x86_64/:rootfs \
-		${_ALPINE_SITE2}/main/x86_64/:main_packages \
-		${_ALPINE_SITE2}/community/x86_64/:community_packages \
+MASTER_SITES+=	${_GITHUB_SITE}/upstream/:upstream \
 		${_GITHUB_SITE}/packages/:custom_packages \
 		${_LINUXFW_SITE}/linux-firmware.git/snapshot/:linux_firmware \
 		https://sources.openwrt.org/:openwrt \
@@ -160,11 +144,21 @@ _IPW2200_FIRMWARE=	iwi/ipw2200-bss \
 _MT76_FIRMWARE=		2135e201e7a9339e018d4e2d4a33c73266e674d7
 
 _LINUX64_KMOD!=		(kldstat -qn linux64 && echo "found") || echo ""
+_LINUX_EMUL_PATH!=	(sysctl -qn compat.linux.emul_path) || echo ""
+_LINUX_EP_EXISTS!=	(test -d "${_LINUX_EMUL_PATH}" && echo "found") || echo ""
 
-.if empty(_LINUX64_KMOD)
+.if empty(IGNORE) && empty(_LINUX64_KMOD)
 IGNORE=	needs the linux64 kernel module to build
 .endif
 
+.if empty(IGNORE) && empty(_LINUX_EMUL_PATH)
+IGNORE=	needs compat.linux.emul_path to be set
+.endif
+
+.if empty(IGNORE) && empty(_LINUX_EP_EXISTS)
+IGNORE= needs compat.linux.emul_path to point to an existing directory
+.endif
+
 pre-everything::
 .if !defined(FIRMWARE_FILES)
 	@${ECHO_MSG} "===> NOTICE:"
@@ -277,7 +271,7 @@ PORT_OPTIONS+=		FW_${flavor:tu}
 .endfor
 
 DIST_SUBDIR=	wifibox-alpine
-DISTFILES+=	${_MINIROOTFS}:rootfs
+DISTFILES+=	${_MINIROOTFS}:upstream
 
 LFW_ATH10K_FILES=	ath10k
 LFW_ATH11K_FILES=	ath11k
@@ -302,7 +296,7 @@ LINUX_FIRMWARE+=	${L${fw_opt}_FILES}
 
 RTL8821CE_VERSION=	20240120
 RTW88_VERSION=		20240316
-RTW89_VERSION=		20240310
+RTW89_VERSION=		20240106
 BROADCOM_WL_VERSION=	6.30.223.271
 
 _LINUX_LTS_MAJOR=	${LINUX_LTS_VERSION:C/^([0-9]*)\..*/\1/}
@@ -371,10 +365,8 @@ DISTFILES+=	${_LINUXFWFILE}:linux_firmware
 .for package in ${_PACKAGES}
 .if ${package:M*\:wifibox}
 DISTFILES+=	${package:C@^([^:]*):wifibox$@\1@}.apk:custom_packages
-.elif ${package:M*\:community}
-DISTFILES+=	${package:C@^([^:]*):community$@\1@}.apk:community_packages
 .else
-DISTFILES+=	${package:C@^([^:]*):wifibox$@\1@}.apk:main_packages
+DISTFILES+=	${package:C@^([^:]*):wifibox$@\1@}.apk:upstream
 .endif
 _APK_FILES+=	${_DISTDIR}/${package:C@^([^:]*):.*$@\1@}.apk
 .endfor
@@ -482,15 +474,4 @@ MAKE_ARGS+=	VERSION=${PORTVERSION} \
 MAKE_ARGS+=	FIRMWARE_FILES=${FIRMWARE_FILES}
 .endif
 
-.if make(check-alpine-packages)
-_APK_FETCH!=	${MAKE} fetch-urlall-list | ${GREP} apk | ${GREP} -v distcache
-.endif
-
-check-alpine-packages:
-.for apk in ${_APK_FETCH}
-	@${ECHO} -n "${apk:C@^.*/([0-9A-za-z\._-]*)@\1@} (${apk})..."
-	@${FETCH_CMD} -s ${apk} > /dev/null
-	@${ECHO} "OK"
-.endfor
-
 .include <bsd.port.mk>
diff --git a/net/wifibox-alpine/distinfo b/net/wifibox-alpine/distinfo
index 37ee6599bdf1..a9bcd657630a 100644
--- a/net/wifibox-alpine/distinfo
+++ b/net/wifibox-alpine/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1711611047
+TIMESTAMP = 1714987776
 SHA256 (wifibox-alpine/alpine-minirootfs-3.19.1-x86_64.tar.gz) = 185123ceb6e7d08f2449fff5543db206ffb79decd814608d399ad447e08fa29e
 SIZE (wifibox-alpine/alpine-minirootfs-3.19.1-x86_64.tar.gz) = 3285677
 SHA256 (wifibox-alpine/linux-firmware-20240312.tar.gz) = 89cbac35d1bd21ebf64936d764ccd01d4e0b6cde973e3b940f8ad2bac9086ec8
@@ -73,10 +73,10 @@ SHA256 (wifibox-alpine/rtl8821ce-edge-20240120-r06080010100.apk) = 35062fee8d7c6
 SIZE (wifibox-alpine/rtl8821ce-edge-20240120-r06080010100.apk) = 598056
 SHA256 (wifibox-alpine/rtw88-edge-20240316-r06080010100.apk) = 62fe2c87b04f5e86d46bfd0bd87d97cc42563eaf19a27806f80c021b76a068a3
 SIZE (wifibox-alpine/rtw88-edge-20240316-r06080010100.apk) = 194890
-SHA256 (wifibox-alpine/rtw89-20240310-r06060220100.apk) = abbcd2da0acb29a9a6a2aaf86716f60cf564b17e73ca97ada9d36c462ec496e8
-SIZE (wifibox-alpine/rtw89-20240310-r06060220100.apk) = 467416
-SHA256 (wifibox-alpine/rtw89-edge-20240310-r06080010100.apk) = 8f9872b21328efe1508c1aa7e11d53cd65e2f5e4131f201ed57b18b506c449b6
-SIZE (wifibox-alpine/rtw89-edge-20240310-r06080010100.apk) = 467502
+SHA256 (wifibox-alpine/rtw89-20240106-r06060220100.apk) = 961719596caa90522773a9ffe17d760ff2bdfda02eece413063d4f994e4d155f
+SIZE (wifibox-alpine/rtw89-20240106-r06060220100.apk) = 410651
+SHA256 (wifibox-alpine/rtw89-edge-20240106-r06080010100.apk) = 173a44c79d9f0f7df18eed1e5d487d4b7a4ea5a6641f32acaa3bda810456d768
+SIZE (wifibox-alpine/rtw89-edge-20240106-r06080010100.apk) = 411361
 SHA256 (wifibox-alpine/broadcom-wl-6.30.223.271-r06060220100.apk) = e42f9e0871e89105911ff09c5df7c87e0d55c8a5c9cf76c30d094f31625cb15e
 SIZE (wifibox-alpine/broadcom-wl-6.30.223.271-r06060220100.apk) = 1465323
 SHA256 (wifibox-alpine/broadcom-wl-edge-6.30.223.271-r06080010100.apk) = 964ddfe0b7d7a0de3a0069ca7361438e9eb5b0ebc5b5bc7772bdc57cddc00c3f
@@ -89,5 +89,5 @@ SHA256 (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = a07c3b6b277833c7dbe61d
 SIZE (wifibox-alpine/broadcom-wl-6.30.163.46.tar.bz2) = 7684610
 SHA256 (wifibox-alpine/2135e201e7a9339e018d4e2d4a33c73266e674d7.zip) = 7c9c69184bea159c6a6a885ffbafe878d9bb0e5d6d0fc2aeba010ee42c8fdd33
 SIZE (wifibox-alpine/2135e201e7a9339e018d4e2d4a33c73266e674d7.zip) = 12509641
-SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-fe9b384e45c57b0cfafe5e5b3931ba163f4230fd_GH0.tar.gz) = ca977198e9ce1e0fa4e95cda5c2f435ad6d829f2edd597ea697e0a58dfdb6475
-SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-fe9b384e45c57b0cfafe5e5b3931ba163f4230fd_GH0.tar.gz) = 208406
+SHA256 (wifibox-alpine/pgj-freebsd-wifibox-alpine-3ce5b1faf48ef4b9d52c38bf518aa612242fba3f_GH0.tar.gz) = 69d1feb931b3230b3577487cf21a7a008058442c8064b1f4f1a535d6838a212f
+SIZE (wifibox-alpine/pgj-freebsd-wifibox-alpine-3ce5b1faf48ef4b9d52c38bf518aa612242fba3f_GH0.tar.gz) = 208422
diff --git a/net/wifibox/Makefile b/net/wifibox/Makefile
index 61de81e65992..8cefe54e1f87 100644
--- a/net/wifibox/Makefile
+++ b/net/wifibox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wifibox
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	net
 
 MAINTAINER=	pali.gabor@gmail.com
diff --git a/net/wireguard-go/Makefile b/net/wireguard-go/Makefile
index a28bb68f05e9..6d217d97d4bb 100644
--- a/net/wireguard-go/Makefile
+++ b/net/wireguard-go/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wireguard-go
 PORTVERSION=	0.0.20230223
-PORTREVISION=	7
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	net net-vpn
 MASTER_SITES=	https://git.zx2c4.com/wireguard-go/snapshot/
diff --git a/net/wireproxy/Makefile b/net/wireproxy/Makefile
index 0760595ef184..5a67191821af 100644
--- a/net/wireproxy/Makefile
+++ b/net/wireproxy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wireproxy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	lwhsu@FreeBSD.org
diff --git a/net/xapsd/Makefile b/net/xapsd/Makefile
index 9ccc74440115..8e4c3fcc03dd 100644
--- a/net/xapsd/Makefile
+++ b/net/xapsd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xapsd
 DISTVERSION=	g20231019
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	PopularMoment@protonmail.com
diff --git a/net/yggdrasil/Makefile b/net/yggdrasil/Makefile
index 00d03c5ff01b..0ceb49277c78 100644
--- a/net/yggdrasil/Makefile
+++ b/net/yggdrasil/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yggdrasil
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.5
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	net
 
 MAINTAINER=	freebsd@neilalexander.dev
diff --git a/ports-mgmt/caronade/Makefile b/ports-mgmt/caronade/Makefile
index 73969c5a4336..a94150acd057 100644
--- a/ports-mgmt/caronade/Makefile
+++ b/ports-mgmt/caronade/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	caronade
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/ports-mgmt/fallout/Makefile b/ports-mgmt/fallout/Makefile
index 40ff5344c17d..c7623d515891 100644
--- a/ports-mgmt/fallout/Makefile
+++ b/ports-mgmt/fallout/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fallout
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.4
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/ports-mgmt/modules2tuple/Makefile b/ports-mgmt/modules2tuple/Makefile
index 63490d8d573c..2280a49359e1 100644
--- a/ports-mgmt/modules2tuple/Makefile
+++ b/ports-mgmt/modules2tuple/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	modules2tuple
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2.4
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index bb603044883d..91a1ff046ab5 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pkg
-DISTVERSION=	1.21.2
+DISTVERSION=	1.21.3
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 760c13bbee63..66b3ac8a4496 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713171199
-SHA256 (freebsd-pkg-1.21.2_GH0.tar.gz) = 955daabc2c9f59f143fabf6993a5c171b4868c2f92df619e22c06fe74dbfdffa
-SIZE (freebsd-pkg-1.21.2_GH0.tar.gz) = 16223369
+TIMESTAMP = 1716390130
+SHA256 (freebsd-pkg-1.21.3_GH0.tar.gz) = dbf84db9f83f5b504e71b57460e9e9dd590871e3cd87f5f7c8a208839d34f0d0
+SIZE (freebsd-pkg-1.21.3_GH0.tar.gz) = 16224122
diff --git a/ports-mgmt/portgrep/Makefile b/ports-mgmt/portgrep/Makefile
index fee9182e17d3..62c05c57e30e 100644
--- a/ports-mgmt/portgrep/Makefile
+++ b/ports-mgmt/portgrep/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	portgrep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.1
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 369d32085a73..3b2bbd02a83b 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,13 +1,9 @@
 PORTNAME=	cups
-DISTVERSION=	2.4.7
-PORTREVISION=	2
+DISTVERSION=	2.4.8
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/OpenPrinting/cups/releases/download/v${DISTVERSION}/
 EXTRACT_SUFX=	-source.tar.gz
 
-PATCH_SITES=	https://github.com/OpenPrinting/cups/commit/
-PATCHFILES=	43ceb50ad92236bda3de168a19765f371812a1ea.patch:-p1
-
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Common UNIX Printing System
 WWW=		https://github.com/OpenPrinting/cups
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 6f4dd49c7ef6..a0230498d61c 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1700253499
-SHA256 (cups-2.4.7-source.tar.gz) = dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c
-SIZE (cups-2.4.7-source.tar.gz) = 8134809
-SHA256 (43ceb50ad92236bda3de168a19765f371812a1ea.patch) = 039092048f00e855bb24679842eb15f28a915bb1832120f91222ccc0aa7a423a
-SIZE (43ceb50ad92236bda3de168a19765f371812a1ea.patch) = 9886
+TIMESTAMP = 1715366483
+SHA256 (cups-2.4.8-source.tar.gz) = 75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0
+SIZE (cups-2.4.8-source.tar.gz) = 8142007
diff --git a/print/ipp-usb/Makefile b/print/ipp-usb/Makefile
index ba88af3c7bef..a375287d3084 100644
--- a/print/ipp-usb/Makefile
+++ b/print/ipp-usb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ipp-usb
 DISTVERSION=	0.9.23
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	print
 
 MAINTAINER=	chuanwei.foo@hotmail.com
diff --git a/print/pdfcpu/Makefile b/print/pdfcpu/Makefile
index 8274249c8808..eeb507027184 100644
--- a/print/pdfcpu/Makefile
+++ b/print/pdfcpu/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pdfcpu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	print
 
 MAINTAINER=	diizzy@FreeBSD.org
diff --git a/print/qt5-printsupport/distinfo b/print/qt5-printsupport/distinfo
index ef4a41be04d7..1fa37cfaffce 100644
--- a/print/qt5-printsupport/distinfo
+++ b/print/qt5-printsupport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771156
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716930660
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/science/csvtk/Makefile b/science/csvtk/Makefile
index b1846fae3beb..ccfb7dda5bab 100644
--- a/science/csvtk/Makefile
+++ b/science/csvtk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	csvtk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.24.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	science
 
 MAINTAINER=	jwb@FreeBSD.org
diff --git a/science/molgif/Makefile b/science/molgif/Makefile
index d78783dcf938..ff6b0d61be44 100644
--- a/science/molgif/Makefile
+++ b/science/molgif/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	molgif
 DISTVERSION=	g20180108
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/multiwfn/Makefile b/science/multiwfn/Makefile
index c7e0470a16a4..35630a783446 100644
--- a/science/multiwfn/Makefile
+++ b/science/multiwfn/Makefile
@@ -39,8 +39,6 @@ ALL_TARGET=	default
 
 DISLIN_VERSION=	11.5
 
-MAKE_JOBS_UNSAFE=	yes # fix build on quarterly (not latest) when mod_2f2.mod isn't found due to commands mis-order
-
 BINARY_ALIAS=	ifort=gfortran${GCC_DEFAULT} \
 		gcc=${CC}
 
diff --git a/science/multiwfn/files/patch-Makefile b/science/multiwfn/files/patch-Makefile
index 00ff10bae181..9c38fc1f94f2 100644
--- a/science/multiwfn/files/patch-Makefile
+++ b/science/multiwfn/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	2023-02-06 10:17:38 UTC
 +++ Makefile
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,6 @@ SIMD = -msse3
  SIMD = -msse3
 -OPT = -O2 -qopenmp -qopenmp-link=static -threads -qopt-matmul $(SIMD) -diag-disable 8290,8291,6371,10316,6178 -fpp -mkl -static-intel -DINTEL_MKL
 -OPT1 = -O1 -qopenmp -qopenmp-link=static -threads $(SIMD) -diag-disable 8290,8291,6371,10316,6178 -fpp -mkl -static-intel -DINTEL_MKL
@@ -9,7 +9,7 @@
  #Options in the next line is for debugging purpose
  #OPTDBG = -O0 -qopenmp -diag-disable 8290,8291,6371 -threads -qopenmp-link=static -debug all -g -traceback -check all -fstack-protector -fpp -mkl -static-intel
  
-@@ -43,10 +43,10 @@ default : $(objects)
+@@ -43,10 +43,10 @@ GUI: $(objects)
  	@echo " ------------------------------------------------------ "
  
  GUI: $(objects)
@@ -22,7 +22,16 @@
  
  clean:
  	rm -f $(EXE) *.o *.mod
-@@ -230,7 +230,7 @@ cp2kmate.o : cp2kmate.f90 $(modules)
+@@ -80,7 +80,7 @@ util.o : util.f90 define.o
+ util.o : util.f90 define.o
+ 	$(FC) $(OPT) -c util.f90
+ 
+-function.o : function.f90 define.o util.o Bspline.o libreta.o
++function.o : function.f90 define.o util.o Bspline.o libreta.o 2F2.f90.o # add 2F2.f90.o to fix dependency problem when mod_2f2.mod isn't found
+ 	$(FC) $(OPT) -c function.f90
+ 
+ plot.o : plot.f90 define.o util.o
+@@ -230,7 +230,7 @@ noGUI/dislin_d_empty.o : noGUI/dislin_d_empty.f90
  
  
  noGUI/dislin_d_empty.o : noGUI/dislin_d_empty.f90
@@ -31,7 +40,7 @@
  
  
  # Interfaces of libreta-ESP to Multiwfn
-@@ -241,10 +241,10 @@ libreta.o: ${LIBRETAPATH}/libreta.f90 hrr_012345.o blo
+@@ -241,10 +241,10 @@ hrr_012345.o: ${LIBRETAPATH}/hrr_012345.f90
  # Pure libreta files for ESP
  
  hrr_012345.o: ${LIBRETAPATH}/hrr_012345.f90
diff --git a/science/nest/Makefile b/science/nest/Makefile
index d491a41a5927..d753283e2906 100644
--- a/science/nest/Makefile
+++ b/science/nest/Makefile
@@ -11,6 +11,7 @@ WWW=		https://www.nest-simulator.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_armv7=	compilation fails: error: expected identifier before '__is_convertible'
 BROKEN_i386=	https://github.com/nest/nest-simulator/issues/1205
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
diff --git a/science/py-MDAnalysis/Makefile b/science/py-MDAnalysis/Makefile
index acb635f24fb4..70b9478a111a 100644
--- a/science/py-MDAnalysis/Makefile
+++ b/science/py-MDAnalysis/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	MDAnalysis
-DISTVERSION=	2.3.0
-PORTREVISION=	1
+DISTVERSION=	2.7.0
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-MDAnalysis/distinfo b/science/py-MDAnalysis/distinfo
index eefa396a1fd7..904a4e724ecb 100644
--- a/science/py-MDAnalysis/distinfo
+++ b/science/py-MDAnalysis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662095086
-SHA256 (MDAnalysis-2.3.0.tar.gz) = 29579433c4ea87048278dc1d4019b52e6a19504162659447be7c79fbdbf508ff
-SIZE (MDAnalysis-2.3.0.tar.gz) = 3701615
+TIMESTAMP = 1714979275
+SHA256 (MDAnalysis-2.7.0.tar.gz) = 572e82945e5d058e3749ec5f18e6b3831ef7f2119cb54672567ae9a977201e93
+SIZE (MDAnalysis-2.7.0.tar.gz) = 3938260
diff --git a/science/py-MDAnalysis/files/patch-MDAnalysis.egg-info_requires.txt b/science/py-MDAnalysis/files/patch-MDAnalysis.egg-info_requires.txt
index 863978e58ce8..ec795498a023 100644
--- a/science/py-MDAnalysis/files/patch-MDAnalysis.egg-info_requires.txt
+++ b/science/py-MDAnalysis/files/patch-MDAnalysis.egg-info_requires.txt
@@ -1,10 +1,10 @@
---- MDAnalysis.egg-info/requires.txt.orig	2022-06-02 18:49:39 UTC
+--- MDAnalysis.egg-info/requires.txt.orig	2023-12-26 20:46:12 UTC
 +++ MDAnalysis.egg-info/requires.txt
-@@ -7,7 +7,6 @@ joblib>=0.12
+@@ -5,7 +5,6 @@ tqdm>=4.43.0
  scipy>=1.5.0
  matplotlib>=1.5.1
  tqdm>=4.43.0
 -threadpoolctl
  packaging
  fasteners
- gsd>=1.9.3
+ mda-xdrlib
diff --git a/science/py-MDAnalysis/files/patch-MDAnalysis_lib_formats_src_xdrfile.c b/science/py-MDAnalysis/files/patch-MDAnalysis_lib_formats_src_xdrfile.c
new file mode 100644
index 000000000000..e64cd135c92c
--- /dev/null
+++ b/science/py-MDAnalysis/files/patch-MDAnalysis_lib_formats_src_xdrfile.c
@@ -0,0 +1,46 @@
+- workaround for invalid C/C++ code, see https://github.com/MDAnalysis/mdanalysis/issues/4589
+
+--- MDAnalysis/lib/formats/src/xdrfile.c.orig	2024-05-06 20:07:19 UTC
++++ MDAnalysis/lib/formats/src/xdrfile.c
+@@ -132,8 +132,8 @@ struct XDR
+ 		int (*x_getbytes) (XDR *__xdrs, char *__addr, unsigned int __len);
+ 		int (*x_putbytes) (XDR *__xdrs, char *__addr, unsigned int __len);
+ 		/* two next routines are not 64-bit IO safe - don't use! */
+-		unsigned int (*x_getpostn) (XDR *__xdrs);
+-		int (*x_setpostn) (XDR *__xdrs, unsigned int __pos);
++		off_t (*x_getpostn) (XDR *__xdrs);
++		off_t (*x_setpostn) (XDR *__xdrs, off_t __pos, int);
+ 		void (*x_destroy) (XDR *__xdrs);
+ 	}
+     *x_ops;
+@@ -2519,8 +2519,8 @@ static int xdrstdio_putbytes (XDR *, char *, unsigned 
+ static int xdrstdio_putlong (XDR *, int32_t *);
+ static int xdrstdio_getbytes (XDR *, char *, unsigned int);
+ static int xdrstdio_putbytes (XDR *, char *, unsigned int);
+-static int64_t xdrstdio_getpos (XDR *);
+-static int xdrstdio_setpos (XDR *, int64_t, int);
++static off_t xdrstdio_getpos (XDR *);
++static off_t xdrstdio_setpos (XDR *, int64_t, int);
+ static void xdrstdio_destroy (XDR *);
+ 
+ /*
+@@ -2602,7 +2602,7 @@ xdrstdio_putbytes (XDR *xdrs, char *addr, unsigned int
+ }
+ 
+ 
+-static int64_t
++static off_t
+ xdrstdio_getpos (XDR *xdrs)
+ {
+     #ifdef _WIN32
+@@ -2612,8 +2612,8 @@ xdrstdio_getpos (XDR *xdrs)
+     #endif
+ }
+ 
+-static int
+-xdrstdio_setpos (XDR *xdrs, int64_t pos, int whence)
++static off_t
++xdrstdio_setpos (XDR *xdrs, off_t pos, int whence)
+ {
+     /* A reason for failure can be filesystem limits on allocation units,
+      * before the actual off_t overflow (ext3, with a 4K clustersize,
diff --git a/science/py-MDAnalysis/files/patch-setup.py b/science/py-MDAnalysis/files/patch-setup.py
index 21db43b92b78..b418f13e5dbc 100644
--- a/science/py-MDAnalysis/files/patch-setup.py
+++ b/science/py-MDAnalysis/files/patch-setup.py
@@ -1,19 +1,19 @@
---- setup.py.orig	2022-06-02 18:49:09 UTC
+--- setup.py.orig	2023-12-26 20:45:53 UTC
 +++ setup.py
-@@ -274,7 +274,7 @@ def extensions(config):
-     use_cython = config.get('use_cython', default=cython_found)
+@@ -266,7 +266,7 @@ def extensions(config):
      use_openmp = config.get('use_openmp', default=True)
+     annotate_cython = config.get('annotate_cython', default=False)
  
--    extra_compile_args = ['-std=c99', '-ffast-math', '-O3', '-funroll-loops',
-+    extra_compile_args = ['-std=c99', '-ffast-math', '-funroll-loops',
+-    extra_compile_args = ['-std=c99', '-O3', '-funroll-loops',
++    extra_compile_args = ['-std=c99', '-funroll-loops',
                            '-fsigned-zeros'] # see #2722
      define_macros = []
      if config.get('debug_cflags', default=False):
-@@ -599,7 +599,6 @@ if __name__ == '__main__':
+@@ -598,7 +598,6 @@ if __name__ == '__main__':
            'scipy>=1.5.0',
            'matplotlib>=1.5.1',
            'tqdm>=4.43.0',
 -          'threadpoolctl',
            'packaging',
            'fasteners',
-           'gsd>=1.9.3',
+           'mda-xdrlib',
diff --git a/science/py-MDAnalysisTests/Makefile b/science/py-MDAnalysisTests/Makefile
index ee722a2cd5b2..b560f72a9b9f 100644
--- a/science/py-MDAnalysisTests/Makefile
+++ b/science/py-MDAnalysisTests/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	MDAnalysisTests
-DISTVERSION=	2.3.0
-PORTREVISION=	1
+DISTVERSION=	2.7.0
 CATEGORIES=	science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/science/py-MDAnalysisTests/distinfo b/science/py-MDAnalysisTests/distinfo
index 28d4454038e0..f39c637c7f98 100644
--- a/science/py-MDAnalysisTests/distinfo
+++ b/science/py-MDAnalysisTests/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662099346
-SHA256 (MDAnalysisTests-2.3.0.tar.gz) = b4dcdbbc6e216a59feb7c3e8cb5c7d9251dbd7aa7ab35f04ad81e93a301c12dc
-SIZE (MDAnalysisTests-2.3.0.tar.gz) = 52461472
+TIMESTAMP = 1715029181
+SHA256 (MDAnalysisTests-2.7.0.tar.gz) = 326d65d7f14da8d1b047aab87ca312a68459a5fd18ddf6d8cb9ac9c3ca51d9e5
+SIZE (MDAnalysisTests-2.7.0.tar.gz) = 55704756
diff --git a/science/qt6-quick3dphysics/distinfo b/science/qt6-quick3dphysics/distinfo
index f124b0eca149..f53805a3cdad 100644
--- a/science/qt6-quick3dphysics/distinfo
+++ b/science/qt6-quick3dphysics/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663491
-SHA256 (KDE/Qt/6.6.3/qtquick3dphysics-everywhere-src-6.6.3.tar.xz) = 67e19b482ea1ac8ba14afda8f804e90e0a68ff68e7da58b454deffda3051f546
-SIZE (KDE/Qt/6.6.3/qtquick3dphysics-everywhere-src-6.6.3.tar.xz) = 4692928
+TIMESTAMP = 1718779144
+SHA256 (KDE/Qt/6.7.2/qtquick3dphysics-everywhere-src-6.7.2.tar.xz) = ffc790b8b44ebc03acc1f2d085dad0cc49fffde1eea941a6ff11d3eb0b6e4140
+SIZE (KDE/Qt/6.7.2/qtquick3dphysics-everywhere-src-6.7.2.tar.xz) = 4703956
diff --git a/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp b/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp
index 93fd958d96a6..ecd151c1f122 100644
--- a/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp
+++ b/science/qt6-quick3dphysics/files/patch-src_3rdparty_PhysX_source_foundation_src_unix_PsUnixThread.cpp
@@ -1,5 +1,5 @@
 Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
---- src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp.orig	2023-09-24 11:12:43 UTC
+--- src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp.orig	2024-05-09 03:10:14 UTC
 +++ src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
 @@ -36,7 +36,7 @@
  #include "PsThread.h"
@@ -19,22 +19,16 @@ Index: src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp
  #include <asm/unistd.h>
  #include <sys/resource.h>
  #endif
-@@ -111,11 +111,11 @@ static void setTid(_ThreadImpl& threadImpl)
+@@ -110,7 +110,7 @@ static void setTid(_ThreadImpl& threadImpl)
  static void setTid(_ThreadImpl& threadImpl)
  {
  // query TID
 -#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV)
 +#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) || PX_FREEBSD
  // AM: TODO: neither of the below are implemented
--#elif PX_APPLE_FAMILY
-+#elif PX_APPLE_FAMILY || !PX_FREEBSD
+ #elif PX_APPLE_FAMILY
  	threadImpl.tid = syscall(SYS_gettid);
--#elif PX_EMSCRIPTEN
-+#elif PX_EMSCRIPTEN || PX_FREEBSD
- 	threadImpl.tid = pthread_self();
- #else
- 	threadImpl.tid = syscall(__NR_gettid);
-@@ -311,7 +311,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask)
+@@ -324,7 +324,7 @@ uint32_t ThreadImpl::setAffinityMask(uint32_t mask)
  	{
  #if PX_PS4
  		prevMask = setAffinityMaskPS4(getThread(this)->thread, mask);
diff --git a/science/quantum-espresso/Makefile b/science/quantum-espresso/Makefile
index bb9981633487..1bc200b9c6fc 100644
--- a/science/quantum-espresso/Makefile
+++ b/science/quantum-espresso/Makefile
@@ -11,6 +11,7 @@ WWW=		https://www.quantum-espresso.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
+BROKEN_aarch64=	compilation fails: cannot find an intrinsic module named 'ieee_arithmetic', see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278942
 BROKEN_armv6=	fails to build: gfortran8: error: iotk_base_tmp.f90: No such file or directory
 BROKEN_armv7=	fails to build: gfortran8: error: iotk_base_tmp.f90: No such file or directory
 
diff --git a/security/2fa/Makefile b/security/2fa/Makefile
index 7683eb038979..b29170e99b5b 100644
--- a/security/2fa/Makefile
+++ b/security/2fa/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	2fa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/security/acmetool/Makefile b/security/acmetool/Makefile
index 4e6d6315a6ca..f6136d0527e1 100644
--- a/security/acmetool/Makefile
+++ b/security/acmetool/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	acmetool
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2
-PORTREVISION=	9
+PORTREVISION=	11
 CATEGORIES=	security
 
 MAINTAINER=	samm@FreeBSD.org
diff --git a/security/age/Makefile b/security/age/Makefile
index ccbeaacf7968..5b67f53a624b 100644
--- a/security/age/Makefile
+++ b/security/age/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	age
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.1
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	security
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/security/apg/Makefile b/security/apg/Makefile
index 27e950be0f8d..235b5be43599 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		apg
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.0
-PORTREVISION=	1
+PORTREVISION=	3
 PORTEPOCH=		1
 CATEGORIES=		security sysutils
 
diff --git a/security/assh/Makefile b/security/assh/Makefile
index 5668fde08d5a..1c76b0f5fc48 100644
--- a/security/assh/Makefile
+++ b/security/assh/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	assh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.15.0
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	security
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/security/aws-iam-authenticator/Makefile b/security/aws-iam-authenticator/Makefile
index 419fdbf6abe2..3375493b4725 100644
--- a/security/aws-iam-authenticator/Makefile
+++ b/security/aws-iam-authenticator/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aws-iam-authenticator
 PORTVERSION=	0.6.19
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/security/aws-vault/Makefile b/security/aws-vault/Makefile
index fa5a4cadcb43..cc8a40dd4ca4 100644
--- a/security/aws-vault/Makefile
+++ b/security/aws-vault/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aws-vault
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.6.2
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	security
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/security/boringssl/Makefile b/security/boringssl/Makefile
index 794ff992c09f..da0aeff1278a 100644
--- a/security/boringssl/Makefile
+++ b/security/boringssl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	boringssl
 PORTVERSION=	0.0.0.0.2024.04.01.01
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES+=	https://proxy.golang.org/:gomods
 DISTFILES+=	golang.org/x/crypto/@v/v0.17.0.zip:gomods \
diff --git a/security/botan3/Makefile b/security/botan3/Makefile
index 8ddf75dfbc36..cced01d5ffe7 100644
--- a/security/botan3/Makefile
+++ b/security/botan3/Makefile
@@ -12,11 +12,11 @@ WWW=		https://botan.randombit.net/
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-BROKEN_armv6=	include/arm_neon.h:28:2: error: "NEON support not enabled"
+BROKEN_FreeBSD_13=	compilation fails: no member named 'find' in namespace 'std::ranges'
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
 
-USES=		compiler:c++20-lang cpe gmake shebangfix tar:xz
+USES=		compiler:c++20-lang cpe gmake llvm:17 shebangfix tar:xz
 CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 
diff --git a/security/caldera-ot/Makefile b/security/caldera-ot/Makefile
index b25ab15b982a..e2c2f00f54bc 100644
--- a/security/caldera-ot/Makefile
+++ b/security/caldera-ot/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	caldera-ot
 DISTVERSION=	4.2.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	security python
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/security/caldera/Makefile b/security/caldera/Makefile
index 3ebc071f864b..400adc009d51 100644
--- a/security/caldera/Makefile
+++ b/security/caldera/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	caldera
 DISTVERSION=	5.0.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	security python
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/security/caldera4/Makefile b/security/caldera4/Makefile
index 005f1aa0082e..df09845f9da3 100644
--- a/security/caldera4/Makefile
+++ b/security/caldera4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	caldera
 DISTVERSION=	4.2.0
-PORTREVISION=	6
+PORTREVISION=	8
 PKGNAMESUFFIX=	4
 CATEGORIES=	security python
 
diff --git a/security/certmgr/Makefile b/security/certmgr/Makefile
index 98a0b3ccdcff..bc6322a2d410 100644
--- a/security/certmgr/Makefile
+++ b/security/certmgr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	certmgr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.3
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security net
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/security/certspotter/Makefile b/security/certspotter/Makefile
index d43eccc01e6b..3d898b2f52c3 100644
--- a/security/certspotter/Makefile
+++ b/security/certspotter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	certspotter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security www
 
 MAINTAINER=	flo@FreeBSD.org
diff --git a/security/cfssl/Makefile b/security/cfssl/Makefile
index 98a14e5ef3c8..8d308eaa5b3c 100644
--- a/security/cfssl/Makefile
+++ b/security/cfssl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cfssl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.5
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/crlfuzz/Makefile b/security/crlfuzz/Makefile
index a87040acaed7..6833805e12b7 100644
--- a/security/crlfuzz/Makefile
+++ b/security/crlfuzz/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	crlfuzz
 PORTVERSION=	1.4.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/crowdsec-blocklist-mirror/Makefile b/security/crowdsec-blocklist-mirror/Makefile
index 46caa238f7bd..6ad9e0a57fe3 100644
--- a/security/crowdsec-blocklist-mirror/Makefile
+++ b/security/crowdsec-blocklist-mirror/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	crowdsec-blocklist-mirror
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.2
 DISTVERSIONSUFFIX=	-freebsd
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
diff --git a/security/crowdsec-firewall-bouncer/Makefile b/security/crowdsec-firewall-bouncer/Makefile
index 0dadf49fdcee..dc9c8366a213 100644
--- a/security/crowdsec-firewall-bouncer/Makefile
+++ b/security/crowdsec-firewall-bouncer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	crowdsec-firewall-bouncer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.28
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
index 53d3aa5d116b..9c808b4af5b8 100644
--- a/security/crowdsec/Makefile
+++ b/security/crowdsec/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	crowdsec
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security
 
 MAINTAINER=	marco@crowdsec.net
diff --git a/security/ct-submit/Makefile b/security/ct-submit/Makefile
index 9837a165d0ff..64e6f744ed4f 100644
--- a/security/ct-submit/Makefile
+++ b/security/ct-submit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ct-submit
 PORTVERSION=	1.1.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security www
 
 MAINTAINER=	jim@ohlste.in
diff --git a/security/doas/Makefile b/security/doas/Makefile
index 8006f40e5e0b..7180fd0237fc 100644
--- a/security/doas/Makefile
+++ b/security/doas/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	doas
-PORTVERSION=	6.3p10
+PORTVERSION=	6.3p12
 CATEGORIES=	security
 
 MAINTAINER=	jsmith@resonatingmedia.com
diff --git a/security/doas/distinfo b/security/doas/distinfo
index b8bf4e6739d3..5a0be4612ac3 100644
--- a/security/doas/distinfo
+++ b/security/doas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714579988
-SHA256 (slicer69-doas-6.3p10_GH0.tar.gz) = 60d01561936ba7737b30d836e6a5002ed4864676cc4982ee72c4463b8d1fae1c
-SIZE (slicer69-doas-6.3p10_GH0.tar.gz) = 34291
+TIMESTAMP = 1715361640
+SHA256 (slicer69-doas-6.3p12_GH0.tar.gz) = e4f37745345c12d4e0c8c03c8237791729cf047dbd7b2455f8de60e2f82ac1b0
+SIZE (slicer69-doas-6.3p12_GH0.tar.gz) = 34396
diff --git a/security/doas/files/patch-doasedit b/security/doas/files/patch-doasedit
index 61cad710e13e..53e910bf09c7 100644
--- a/security/doas/files/patch-doasedit
+++ b/security/doas/files/patch-doasedit
@@ -1,4 +1,4 @@
---- doasedit.orig	2021-09-13 18:56:31 UTC
+--- doasedit.orig	2024-05-10 17:16:18 UTC
 +++ doasedit
 @@ -30,7 +30,7 @@ then
     exit 3
@@ -6,6 +6,6 @@
  
 -temp_file=$(mktemp --tmpdir doasedit.XXXXXXXX)
 +temp_file=$(mktemp -t /tmp)
- if [ ! $? ]
+ if [ ! -r "$temp_file" ]
  then
-    echo "Could not create temporary file."
+    echo "Was unable to create temporary file."
diff --git a/security/enc/Makefile b/security/enc/Makefile
index c0ecd7817fcd..b3c7a1bce4f0 100644
--- a/security/enc/Makefile
+++ b/security/enc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	enc
 DISTVERSION=	1.1.3
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/security/ffuf/Makefile b/security/ffuf/Makefile
index 82aaf628d638..ae30aa16d666 100644
--- a/security/ffuf/Makefile
+++ b/security/ffuf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ffuf
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.1.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	security www
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/git-credential-azure/Makefile b/security/git-credential-azure/Makefile
index 89d27467a597..a641e923f9d2 100644
--- a/security/git-credential-azure/Makefile
+++ b/security/git-credential-azure/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-credential-azure
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/security/git-credential-gopass/Makefile b/security/git-credential-gopass/Makefile
index 0f9f5e2defac..5e3b1ab7bd58 100644
--- a/security/git-credential-gopass/Makefile
+++ b/security/git-credential-gopass/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-credential-gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.13
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/security/git-credential-oauth/Makefile b/security/git-credential-oauth/Makefile
index 1e8e933e86a5..019debe7e07d 100644
--- a/security/git-credential-oauth/Makefile
+++ b/security/git-credential-oauth/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-credential-oauth
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/security/gitjacker/Makefile b/security/gitjacker/Makefile
index bb2f580bbb0b..0592d878f048 100644
--- a/security/gitjacker/Makefile
+++ b/security/gitjacker/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitjacker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/go-cve-dictionary/Makefile b/security/go-cve-dictionary/Makefile
index f7f2e09ec96e..1e09d6a8d3ee 100644
--- a/security/go-cve-dictionary/Makefile
+++ b/security/go-cve-dictionary/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-cve-dictionary
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/security/gokart/Makefile b/security/gokart/Makefile
index 8b6158906c77..18ac9c1bab96 100644
--- a/security/gokart/Makefile
+++ b/security/gokart/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gokart
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/gokey/Makefile b/security/gokey/Makefile
index ccfb0faab0d1..10f38622fa57 100644
--- a/security/gokey/Makefile
+++ b/security/gokey/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gokey
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.2
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index 303176356bf7..d86584c97d7b 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15.13
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/security/gosec/Makefile b/security/gosec/Makefile
index e83abb6ec112..51a5f54acc3f 100644
--- a/security/gosec/Makefile
+++ b/security/gosec/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gosec
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.19.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/headscale/Makefile b/security/headscale/Makefile
index e922ba98e9a1..914512221fb4 100644
--- a/security/headscale/Makefile
+++ b/security/headscale/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	headscale
 PORTVERSION=	0.16.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	14
+PORTREVISION=	16
 CATEGORIES=	security net-vpn
 
 MAINTAINER=	m.muenz@gmail.com
diff --git a/security/hockeypuck/Makefile b/security/hockeypuck/Makefile
index b0cd61dcf34d..38c1cde8cfe2 100644
--- a/security/hockeypuck/Makefile
+++ b/security/hockeypuck/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hockeypuck
 DISTVERSION=	g20180725
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/security/honeytrap/Makefile b/security/honeytrap/Makefile
index 68ea2798cc21..3ffa7192d35e 100644
--- a/security/honeytrap/Makefile
+++ b/security/honeytrap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	honeytrap
 DISTVERSION=	g20210510
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security
 
 MAINTAINER=	ezri.mudde@dutchsec.com
diff --git a/security/horcrux/Makefile b/security/horcrux/Makefile
index 476bb9add527..5948f9769441 100644
--- a/security/horcrux/Makefile
+++ b/security/horcrux/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	horcrux
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	security
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index 083167185383..53253c5d0dab 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	keybase
 PORTVERSION=	6.2.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	https://raw.githubusercontent.com/keybase/client/v${PORTVERSION}/go/:gomod
 DISTFILES=	go.mod:gomod
diff --git a/security/kpmenu/Makefile b/security/kpmenu/Makefile
index 1f86691205d8..dc9847e7b559 100644
--- a/security/kpmenu/Makefile
+++ b/security/kpmenu/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kpmenu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	security
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/security/lego/Makefile b/security/lego/Makefile
index a442ce7e1e88..2eaede01de96 100644
--- a/security/lego/Makefile
+++ b/security/lego/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lego
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.16.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	matt@matthoran.com
diff --git a/security/local-php-security-checker/Makefile b/security/local-php-security-checker/Makefile
index f654c6fefba5..c4b5c5c99fa3 100644
--- a/security/local-php-security-checker/Makefile
+++ b/security/local-php-security-checker/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	local-php-security-checker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.6
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	security
 MASTER_SITES=	GH
 
diff --git a/security/meek/Makefile b/security/meek/Makefile
index 8554671e65b4..8ec8277a38fe 100644
--- a/security/meek/Makefile
+++ b/security/meek/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	meek
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.37.0
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	security net
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index fc5c61e4aaaa..f300fe26cd06 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	metasploit
 DISTVERSION=	6.3.50
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security
 
 MAINTAINER=	tanawts@gmail.com
diff --git a/security/nebula/Makefile b/security/nebula/Makefile
index 90df769f60db..e7e342093d9b 100644
--- a/security/nebula/Makefile
+++ b/security/nebula/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nebula
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 6fe9c8a22085..126c22405f6a 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	nss
-PORTVERSION=	3.99
+PORTVERSION=	3.101
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
-WWW=		https://developer.mozilla.org/docs/Mozilla/Projects/NSS
+WWW=		https://firefox-source-docs.mozilla.org/security/nss/index.html
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 3000c9184744..f79fd314a284 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711647825
-SHA256 (nss-3.99.tar.gz) = 5cd5c2c8406a376686e6fa4b9c2de38aa280bea07bf927c0d521ba07c88b09bd
-SIZE (nss-3.99.tar.gz) = 76753982
+TIMESTAMP = 1719771261
+SHA256 (nss-3.101.tar.gz) = 859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7
+SIZE (nss-3.101.tar.gz) = 76317799
diff --git a/security/nss/pkg-plist b/security/nss/pkg-plist
index e378280e187d..54ad14fae62f 100644
--- a/security/nss/pkg-plist
+++ b/security/nss/pkg-plist
@@ -22,7 +22,6 @@ bin/strsclnt
 bin/symkeyutil
 bin/vfychain
 bin/vfyserv
-include/nss/sslexp.h
 include/nss/base64.h
 include/nss/blapit.h
 include/nss/cert.h
@@ -66,6 +65,7 @@ include/nss/nssckfwt.h
 include/nss/nssckg.h
 include/nss/nssckmdt.h
 include/nss/nssckt.h
+include/nss/nsshash.h
 include/nss/nssilckt.h
 include/nss/nssilock.h
 include/nss/nsslocks.h
@@ -85,7 +85,6 @@ include/nss/pk11priv.h
 include/nss/pk11pub.h
 include/nss/pk11sdr.h
 include/nss/pkcs11.h
-include/nss/pkcs1sig.h
 include/nss/pkcs11f.h
 include/nss/pkcs11n.h
 include/nss/pkcs11p.h
@@ -94,6 +93,7 @@ include/nss/pkcs11u.h
 include/nss/pkcs11uri.h
 include/nss/pkcs12.h
 include/nss/pkcs12t.h
+include/nss/pkcs1sig.h
 include/nss/pkcs7t.h
 include/nss/portreg.h
 include/nss/preenc.h
@@ -119,6 +119,7 @@ include/nss/shsign.h
 include/nss/smime.h
 include/nss/ssl.h
 include/nss/sslerr.h
+include/nss/sslexp.h
 include/nss/sslproto.h
 include/nss/sslt.h
 include/nss/utilmodt.h
diff --git a/security/nuclei/Makefile b/security/nuclei/Makefile
index 4e71788e4147..9187a16745e4 100644
--- a/security/nuclei/Makefile
+++ b/security/nuclei/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nuclei
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.10
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/obfs4proxy-tor/Makefile b/security/obfs4proxy-tor/Makefile
index 59cf4aa17e75..a1c4abe66b11 100644
--- a/security/obfs4proxy-tor/Makefile
+++ b/security/obfs4proxy-tor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	obfs4proxy
 DISTVERSION=	0.0.14
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	security net
 PKGNAMESUFFIX=	-tor
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/onionscan/Makefile b/security/onionscan/Makefile
index 5dfc62db877c..f511d1e52e1c 100644
--- a/security/onionscan/Makefile
+++ b/security/onionscan/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	onionscan
 DISTVERSIONPREFIX=	OnionScan-
 DISTVERSION=	0.2
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	security net
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/security/openiked/Makefile b/security/openiked/Makefile
index 4e5ee3b35455..a280721acf7e 100644
--- a/security/openiked/Makefile
+++ b/security/openiked/Makefile
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-libevent-dir=${PREFIX} --with-mantype=man
+CONFIGURE_ARGS+=	--without-zlib-version-check # fix build by disabling zlib version check
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/ikeca.cnf \
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index ccf46bb23850..9b1d44580f94 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openssh
 DISTVERSION=	9.7p1
-PORTREVISION=	0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	OPENBSD/OpenSSH/portable
diff --git a/security/openssh-portable/files/patch-9.8-cves b/security/openssh-portable/files/patch-9.8-cves
new file mode 100644
index 000000000000..2e47d586edcd
--- /dev/null
+++ b/security/openssh-portable/files/patch-9.8-cves
@@ -0,0 +1,56 @@
+https://lists.mindrot.org/pipermail/openssh-unix-dev/2024-July/041431.html
+
+Damien Miller djm at mindrot.org
+Mon Jul 1 18:21:11 AEST 2024
+Previous message (by thread): Announce: OpenSSH 9.8 released
+Next message (by thread): Announce: OpenSSH 9.8 released
+Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+Hi,
+
+Regarding the race condition fixed in OpenSSH 9.8. A mitigation to
+prevent exploitation of this bug is to disable the login grace timer
+by setting LoginGraceTime=0 in sshd_config. This will however make
+it much easier for an attacker to deny service to sshd.
+
+Similarly, the much more minor keystroke timing bug can be avoided
+by disabling the feature using ObscureKeystrokeTiming=0.
+
+Some users will understandably prefer to patch their OpenSSH rather
+than upgrade to the newest version, so here are minimal patches for
+both problems.
+
+1) Critical race condition in sshd
+
+2) Minor logic error in ObscureKeystrokeTiming
+
+--- log.c.orig	2024-07-02 09:05:35.023051000 -0700
++++ log.c	2024-07-02 09:05:54.881067000 -0700
+@@ -451,12 +451,14 @@ sshsigdie(const char *file, const char *func, int line
+ sshsigdie(const char *file, const char *func, int line, int showfunc,
+     LogLevel level, const char *suffix, const char *fmt, ...)
+ {
++#ifdef SYSLOG_R_SAFE_IN_SIGHAND
+ 	va_list args;
+ 
+ 	va_start(args, fmt);
+ 	sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL,
+ 	    suffix, fmt, args);
+ 	va_end(args);
++#endif
+ 	_exit(1);
+ }
+ 
+--- clientloop.c.orig	2024-07-02 09:06:09.736347000 -0700
++++ clientloop.c	2024-07-02 09:06:41.414979000 -0700
+@@ -608,8 +608,9 @@ obfuscate_keystroke_timing(struct ssh *ssh, struct tim
+ 		if (timespeccmp(&now, &chaff_until, >=)) {
+ 			/* Stop if there have been no keystrokes for a while */
+ 			stop_reason = "chaff time expired";
+-		} else if (timespeccmp(&now, &next_interval, >=)) {
+-			/* Otherwise if we were due to send, then send chaff */
++		} else if (timespeccmp(&now, &next_interval, >=) &&
++		    !ssh_packet_have_data_to_write(ssh)) {
++			/* If due to send but have no data, then send chaff */
+ 			if (send_chaff(ssh))
+ 				nchaff++;
+ 		}
diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile
index a43d106ec16f..9afe495b48d4 100644
--- a/security/openssl-quictls/Makefile
+++ b/security/openssl-quictls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openssl
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.0.13
-PORTREVISION=	3
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	-${GH_ACCOUNT}
diff --git a/security/openssl-quictls/files/patch-CVE-2024-4603 b/security/openssl-quictls/files/patch-CVE-2024-4603
new file mode 100644
index 000000000000..abe84a2a7c77
--- /dev/null
+++ b/security/openssl-quictls/files/patch-CVE-2024-4603
@@ -0,0 +1,172 @@
+From 3559e868e58005d15c6013a0c1fd832e51c73397 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Wed, 8 May 2024 15:23:45 +0200
+Subject: [PATCH] Check DSA parameters for excessive sizes before validating
+
+This avoids overly long computation of various validation
+checks.
+
+Fixes CVE-2024-4603
+
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/24346)
+
+(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
+---
+ CHANGES.md                                    | 17 ++++++
+ crypto/dsa/dsa_check.c                        | 44 ++++++++++++--
+ .../invalid/p10240_q256_too_big.pem           | 57 +++++++++++++++++++
+ 3 files changed, 114 insertions(+), 4 deletions(-)
+ create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+
+diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
+index fb0e9129a2956..122449a7bf087 100644
+--- crypto/dsa/dsa_check.c.orig
++++ crypto/dsa/dsa_check.c
+@@ -19,8 +19,34 @@
+ #include "dsa_local.h"
+ #include "crypto/dsa.h"
+ 
++static int dsa_precheck_params(const DSA *dsa, int *ret)
++{
++    if (dsa->params.p == NULL || dsa->params.q == NULL) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    return 1;
++}
++
+ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
+         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
+                                                FFC_PARAM_TYPE_DSA, ret);
+@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+  */
+ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+  */
+ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
+ {
+     *ret = 0;
+ 
+-    return (dsa->params.q != NULL
+-            && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
++    return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
+ }
+ 
+ /*
+@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
+     BN_CTX *ctx = NULL;
+     BIGNUM *pub_key = NULL;
+ 
+-    if (dsa->params.p == NULL
+-        || dsa->params.g == NULL
++    if (!dsa_precheck_params(dsa, &ret))
++        return 0;
++
++    if (dsa->params.g == NULL
+         || dsa->priv_key == NULL
+         || dsa->pub_key == NULL)
+         return 0;
+diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+new file mode 100644
+index 0000000000000..e85e2953b7a24
+--- /dev/null
++++ test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+@@ -0,0 +1,57 @@
++-----BEGIN DSA PARAMETERS-----
++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja
++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil
++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF
++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk
++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW
++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb
++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O
++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ
++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5
++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2
++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB
++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN
++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl
++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ
++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg
++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG
++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE
++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN
++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2
++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8
++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd
++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW
++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9
++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7
++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s
++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs
++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN
++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy
++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx
++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36
++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2
++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B
++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8
++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W
++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl
+++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX
++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq
++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX
++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot
++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK
++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco
++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD
++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3
++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy
++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct
++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+
++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd
++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG
++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E
++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk
++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF
++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d
++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa
++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D
++vKuje86bePD6kD/LH3wmkA==
++-----END DSA PARAMETERS-----
diff --git a/security/openssl-quictls/files/patch-CVE-2024-4741 b/security/openssl-quictls/files/patch-CVE-2024-4741
new file mode 100644
index 000000000000..f4f5ca1069a1
--- /dev/null
+++ b/security/openssl-quictls/files/patch-CVE-2024-4741
@@ -0,0 +1,69 @@
+From b3f0eb0a295f58f16ba43ba99dad70d4ee5c437d Mon Sep 17 00:00:00 2001
+From: Watson Ladd <watsonbladd@gmail.com>
+Date: Wed, 24 Apr 2024 11:26:56 +0100
+Subject: [PATCH] Only free the read buffers if we're not using them
+
+If we're part way through processing a record, or the application has
+not released all the records then we should not free our buffer because
+they are still needed.
+
+CVE-2024-4741
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24395)
+
+(cherry picked from commit 704f725b96aa373ee45ecfb23f6abfe8be8d9177)
+---
+ ssl/record/rec_layer_s3.c | 9 +++++++++
+ ssl/record/record.h       | 1 +
+ ssl/ssl_lib.c             | 3 +++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
+index 4bcffcc41e364..1569997bea2d3 100644
+--- ssl/record/rec_layer_s3.c.orig
++++ ssl/record/rec_layer_s3.c
+@@ -81,6 +81,15 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl)
+     return SSL3_BUFFER_get_left(&rl->rbuf) != 0;
+ }
+ 
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl)
++{
++    if (rl->rstate == SSL_ST_READ_BODY)
++        return 1;
++    if (RECORD_LAYER_processed_read_pending(rl))
++        return 1;
++    return 0;
++}
++
+ /* Checks if we have decrypted unread record data pending */
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl)
+ {
+diff --git a/ssl/record/record.h b/ssl/record/record.h
+index 234656bf93942..b60f71c8cb23b 100644
+--- ssl/record/record.h.orig
++++ ssl/record/record.h
+@@ -205,6 +205,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl);
+ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
+ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index eed649c6fdee9..d14c55ae557bc 100644
+--- ssl/ssl_lib.c.orig
++++ ssl/ssl_lib.c
+@@ -5492,6 +5492,9 @@ int SSL_free_buffers(SSL *ssl)
+     if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl))
+         return 0;
+ 
++    if (RECORD_LAYER_data_present(rl))
++        return 0;
++
+     RECORD_LAYER_release(rl);
+     return 1;
+ }
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 2746bb51cdcc..c1bf75453382 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openssl
 PORTVERSION=	3.0.13
-PORTREVISION=	3
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
diff --git a/security/openssl/files/patch-CVE-2024-4603 b/security/openssl/files/patch-CVE-2024-4603
new file mode 100644
index 000000000000..abe84a2a7c77
--- /dev/null
+++ b/security/openssl/files/patch-CVE-2024-4603
@@ -0,0 +1,172 @@
+From 3559e868e58005d15c6013a0c1fd832e51c73397 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Wed, 8 May 2024 15:23:45 +0200
+Subject: [PATCH] Check DSA parameters for excessive sizes before validating
+
+This avoids overly long computation of various validation
+checks.
+
+Fixes CVE-2024-4603
+
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/24346)
+
+(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
+---
+ CHANGES.md                                    | 17 ++++++
+ crypto/dsa/dsa_check.c                        | 44 ++++++++++++--
+ .../invalid/p10240_q256_too_big.pem           | 57 +++++++++++++++++++
+ 3 files changed, 114 insertions(+), 4 deletions(-)
+ create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+
+diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
+index fb0e9129a2956..122449a7bf087 100644
+--- crypto/dsa/dsa_check.c.orig
++++ crypto/dsa/dsa_check.c
+@@ -19,8 +19,34 @@
+ #include "dsa_local.h"
+ #include "crypto/dsa.h"
+ 
++static int dsa_precheck_params(const DSA *dsa, int *ret)
++{
++    if (dsa->params.p == NULL || dsa->params.q == NULL) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    return 1;
++}
++
+ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
+         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
+                                                FFC_PARAM_TYPE_DSA, ret);
+@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+  */
+ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+  */
+ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
+ {
+     *ret = 0;
+ 
+-    return (dsa->params.q != NULL
+-            && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
++    return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
+ }
+ 
+ /*
+@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
+     BN_CTX *ctx = NULL;
+     BIGNUM *pub_key = NULL;
+ 
+-    if (dsa->params.p == NULL
+-        || dsa->params.g == NULL
++    if (!dsa_precheck_params(dsa, &ret))
++        return 0;
++
++    if (dsa->params.g == NULL
+         || dsa->priv_key == NULL
+         || dsa->pub_key == NULL)
+         return 0;
+diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+new file mode 100644
+index 0000000000000..e85e2953b7a24
+--- /dev/null
++++ test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+@@ -0,0 +1,57 @@
++-----BEGIN DSA PARAMETERS-----
++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja
++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil
++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF
++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk
++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW
++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb
++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O
++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ
++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5
++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2
++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB
++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN
++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl
++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ
++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg
++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG
++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE
++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN
++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2
++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8
++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd
++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW
++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9
++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7
++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s
++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs
++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN
++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy
++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx
++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36
++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2
++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B
++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8
++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W
++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl
+++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX
++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq
++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX
++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot
++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK
++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco
++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD
++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3
++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy
++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct
++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+
++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd
++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG
++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E
++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk
++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF
++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d
++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa
++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D
++vKuje86bePD6kD/LH3wmkA==
++-----END DSA PARAMETERS-----
diff --git a/security/openssl/files/patch-CVE-2024-4741 b/security/openssl/files/patch-CVE-2024-4741
new file mode 100644
index 000000000000..f4f5ca1069a1
--- /dev/null
+++ b/security/openssl/files/patch-CVE-2024-4741
@@ -0,0 +1,69 @@
+From b3f0eb0a295f58f16ba43ba99dad70d4ee5c437d Mon Sep 17 00:00:00 2001
+From: Watson Ladd <watsonbladd@gmail.com>
+Date: Wed, 24 Apr 2024 11:26:56 +0100
+Subject: [PATCH] Only free the read buffers if we're not using them
+
+If we're part way through processing a record, or the application has
+not released all the records then we should not free our buffer because
+they are still needed.
+
+CVE-2024-4741
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24395)
+
+(cherry picked from commit 704f725b96aa373ee45ecfb23f6abfe8be8d9177)
+---
+ ssl/record/rec_layer_s3.c | 9 +++++++++
+ ssl/record/record.h       | 1 +
+ ssl/ssl_lib.c             | 3 +++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
+index 4bcffcc41e364..1569997bea2d3 100644
+--- ssl/record/rec_layer_s3.c.orig
++++ ssl/record/rec_layer_s3.c
+@@ -81,6 +81,15 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl)
+     return SSL3_BUFFER_get_left(&rl->rbuf) != 0;
+ }
+ 
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl)
++{
++    if (rl->rstate == SSL_ST_READ_BODY)
++        return 1;
++    if (RECORD_LAYER_processed_read_pending(rl))
++        return 1;
++    return 0;
++}
++
+ /* Checks if we have decrypted unread record data pending */
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl)
+ {
+diff --git a/ssl/record/record.h b/ssl/record/record.h
+index 234656bf93942..b60f71c8cb23b 100644
+--- ssl/record/record.h.orig
++++ ssl/record/record.h
+@@ -205,6 +205,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl);
+ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
+ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index eed649c6fdee9..d14c55ae557bc 100644
+--- ssl/ssl_lib.c.orig
++++ ssl/ssl_lib.c
+@@ -5492,6 +5492,9 @@ int SSL_free_buffers(SSL *ssl)
+     if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl))
+         return 0;
+ 
++    if (RECORD_LAYER_data_present(rl))
++        return 0;
++
+     RECORD_LAYER_release(rl);
+     return 1;
+ }
diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile
index 4f829d9afa6e..99afcb80ff7b 100644
--- a/security/openssl31-quictls/Makefile
+++ b/security/openssl31-quictls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openssl
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	3.1.5
-PORTREVISION=	2
+PORTREVISION=	5
 DISTVERSIONSUFFIX=	-quic1
 CATEGORIES=	security devel
 PKGNAMESUFFIX=	31-quictls
@@ -141,6 +141,16 @@ SHLIBS=			lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so
 
 PORTSCOUT=		limit=^3\.1\.
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == powerpc64
+CONFIGURE_ARGS+=	BSD-ppc64
+.elif ${ARCH} == powerpc64le
+CONFIGURE_ARGS+=	BSD-ppc64le
+.elif ${ARCH} == riscv64
+CONFIGURE_ARGS+=	BSD-riscv64
+.endif
+
 .include <bsd.port.pre.mk>
 .if ${PREFIX} == /usr
 IGNORE=	the OpenSSL port can not be installed over the base version
diff --git a/security/openssl31-quictls/files/patch-CVE-2024-4603 b/security/openssl31-quictls/files/patch-CVE-2024-4603
new file mode 100644
index 000000000000..2994ec6c13a6
--- /dev/null
+++ b/security/openssl31-quictls/files/patch-CVE-2024-4603
@@ -0,0 +1,172 @@
+From 9c39b3858091c152f52513c066ff2c5a47969f0d Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Wed, 8 May 2024 15:23:45 +0200
+Subject: [PATCH] Check DSA parameters for excessive sizes before validating
+
+This avoids overly long computation of various validation
+checks.
+
+Fixes CVE-2024-4603
+
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/24346)
+
+(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
+---
+ CHANGES.md                                    | 17 ++++++
+ crypto/dsa/dsa_check.c                        | 44 ++++++++++++--
+ .../invalid/p10240_q256_too_big.pem           | 57 +++++++++++++++++++
+ 3 files changed, 114 insertions(+), 4 deletions(-)
+ create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+
+diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
+index fb0e9129a2956..122449a7bf087 100644
+--- crypto/dsa/dsa_check.c.orig
++++ crypto/dsa/dsa_check.c
+@@ -19,8 +19,34 @@
+ #include "dsa_local.h"
+ #include "crypto/dsa.h"
+ 
++static int dsa_precheck_params(const DSA *dsa, int *ret)
++{
++    if (dsa->params.p == NULL || dsa->params.q == NULL) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    return 1;
++}
++
+ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
+         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
+                                                FFC_PARAM_TYPE_DSA, ret);
+@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+  */
+ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+  */
+ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
+ {
+     *ret = 0;
+ 
+-    return (dsa->params.q != NULL
+-            && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
++    return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
+ }
+ 
+ /*
+@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
+     BN_CTX *ctx = NULL;
+     BIGNUM *pub_key = NULL;
+ 
+-    if (dsa->params.p == NULL
+-        || dsa->params.g == NULL
++    if (!dsa_precheck_params(dsa, &ret))
++        return 0;
++
++    if (dsa->params.g == NULL
+         || dsa->priv_key == NULL
+         || dsa->pub_key == NULL)
+         return 0;
+diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+new file mode 100644
+index 0000000000000..e85e2953b7a24
+--- /dev/null
++++ test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+@@ -0,0 +1,57 @@
++-----BEGIN DSA PARAMETERS-----
++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja
++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil
++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF
++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk
++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW
++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb
++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O
++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ
++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5
++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2
++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB
++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN
++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl
++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ
++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg
++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG
++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE
++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN
++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2
++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8
++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd
++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW
++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9
++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7
++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s
++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs
++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN
++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy
++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx
++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36
++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2
++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B
++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8
++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W
++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl
+++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX
++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq
++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX
++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot
++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK
++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco
++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD
++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3
++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy
++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct
++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+
++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd
++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG
++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E
++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk
++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF
++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d
++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa
++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D
++vKuje86bePD6kD/LH3wmkA==
++-----END DSA PARAMETERS-----
diff --git a/security/openssl31-quictls/files/patch-CVE-2024-4741 b/security/openssl31-quictls/files/patch-CVE-2024-4741
new file mode 100644
index 000000000000..75fcc6311d2c
--- /dev/null
+++ b/security/openssl31-quictls/files/patch-CVE-2024-4741
@@ -0,0 +1,67 @@
+From 704f725b96aa373ee45ecfb23f6abfe8be8d9177 Mon Sep 17 00:00:00 2001
+From: Watson Ladd <watsonbladd@gmail.com>
+Date: Wed, 24 Apr 2024 11:26:56 +0100
+Subject: [PATCH] Only free the read buffers if we're not using them
+
+If we're part way through processing a record, or the application has
+not released all the records then we should not free our buffer because
+they are still needed.
+
+CVE-2024-4741
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24395)
+---
+ ssl/record/rec_layer_s3.c | 9 +++++++++
+ ssl/record/record.h       | 1 +
+ ssl/ssl_lib.c             | 3 +++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
+index 4bcffcc41e364..1569997bea2d3 100644
+--- ssl/record/rec_layer_s3.c.orig
++++ ssl/record/rec_layer_s3.c
+@@ -81,6 +81,15 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl)
+     return SSL3_BUFFER_get_left(&rl->rbuf) != 0;
+ }
+ 
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl)
++{
++    if (rl->rstate == SSL_ST_READ_BODY)
++        return 1;
++    if (RECORD_LAYER_processed_read_pending(rl))
++        return 1;
++    return 0;
++}
++
+ /* Checks if we have decrypted unread record data pending */
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl)
+ {
+diff --git a/ssl/record/record.h b/ssl/record/record.h
+index 234656bf93942..b60f71c8cb23b 100644
+--- ssl/record/record.h.orig
++++ ssl/record/record.h
+@@ -205,6 +205,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl);
+ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
+ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index e747b7f90aa71..9088223b9f6bb 100644
+--- ssl/ssl_lib.c.orig
++++ ssl/ssl_lib.c
+@@ -5493,6 +5493,9 @@ int SSL_free_buffers(SSL *ssl)
+     if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl))
+         return 0;
+ 
++    if (RECORD_LAYER_data_present(rl))
++        return 0;
++
+     RECORD_LAYER_release(rl);
+     return 1;
+ }
diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile
index 7e91b88065a6..526be2156557 100644
--- a/security/openssl31/Makefile
+++ b/security/openssl31/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openssl
 PORTVERSION=	3.1.5
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
diff --git a/security/openssl31/files/patch-CVE-2024-4603 b/security/openssl31/files/patch-CVE-2024-4603
new file mode 100644
index 000000000000..2994ec6c13a6
--- /dev/null
+++ b/security/openssl31/files/patch-CVE-2024-4603
@@ -0,0 +1,172 @@
+From 9c39b3858091c152f52513c066ff2c5a47969f0d Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Wed, 8 May 2024 15:23:45 +0200
+Subject: [PATCH] Check DSA parameters for excessive sizes before validating
+
+This avoids overly long computation of various validation
+checks.
+
+Fixes CVE-2024-4603
+
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/24346)
+
+(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
+---
+ CHANGES.md                                    | 17 ++++++
+ crypto/dsa/dsa_check.c                        | 44 ++++++++++++--
+ .../invalid/p10240_q256_too_big.pem           | 57 +++++++++++++++++++
+ 3 files changed, 114 insertions(+), 4 deletions(-)
+ create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+
+diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
+index fb0e9129a2956..122449a7bf087 100644
+--- crypto/dsa/dsa_check.c.orig
++++ crypto/dsa/dsa_check.c
+@@ -19,8 +19,34 @@
+ #include "dsa_local.h"
+ #include "crypto/dsa.h"
+ 
++static int dsa_precheck_params(const DSA *dsa, int *ret)
++{
++    if (dsa->params.p == NULL || dsa->params.q == NULL) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    return 1;
++}
++
+ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
+         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
+                                                FFC_PARAM_TYPE_DSA, ret);
+@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+  */
+ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+  */
+ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
+ {
+     *ret = 0;
+ 
+-    return (dsa->params.q != NULL
+-            && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
++    return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
+ }
+ 
+ /*
+@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
+     BN_CTX *ctx = NULL;
+     BIGNUM *pub_key = NULL;
+ 
+-    if (dsa->params.p == NULL
+-        || dsa->params.g == NULL
++    if (!dsa_precheck_params(dsa, &ret))
++        return 0;
++
++    if (dsa->params.g == NULL
+         || dsa->priv_key == NULL
+         || dsa->pub_key == NULL)
+         return 0;
+diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+new file mode 100644
+index 0000000000000..e85e2953b7a24
+--- /dev/null
++++ test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+@@ -0,0 +1,57 @@
++-----BEGIN DSA PARAMETERS-----
++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja
++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil
++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF
++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk
++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW
++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb
++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O
++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ
++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5
++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2
++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB
++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN
++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl
++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ
++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg
++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG
++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE
++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN
++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2
++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8
++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd
++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW
++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9
++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7
++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s
++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs
++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN
++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy
++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx
++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36
++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2
++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B
++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8
++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W
++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl
+++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX
++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq
++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX
++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot
++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK
++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco
++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD
++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3
++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy
++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct
++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+
++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd
++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG
++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E
++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk
++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF
++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d
++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa
++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D
++vKuje86bePD6kD/LH3wmkA==
++-----END DSA PARAMETERS-----
diff --git a/security/openssl31/files/patch-CVE-2024-4741 b/security/openssl31/files/patch-CVE-2024-4741
new file mode 100644
index 000000000000..75fcc6311d2c
--- /dev/null
+++ b/security/openssl31/files/patch-CVE-2024-4741
@@ -0,0 +1,67 @@
+From 704f725b96aa373ee45ecfb23f6abfe8be8d9177 Mon Sep 17 00:00:00 2001
+From: Watson Ladd <watsonbladd@gmail.com>
+Date: Wed, 24 Apr 2024 11:26:56 +0100
+Subject: [PATCH] Only free the read buffers if we're not using them
+
+If we're part way through processing a record, or the application has
+not released all the records then we should not free our buffer because
+they are still needed.
+
+CVE-2024-4741
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24395)
+---
+ ssl/record/rec_layer_s3.c | 9 +++++++++
+ ssl/record/record.h       | 1 +
+ ssl/ssl_lib.c             | 3 +++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
+index 4bcffcc41e364..1569997bea2d3 100644
+--- ssl/record/rec_layer_s3.c.orig
++++ ssl/record/rec_layer_s3.c
+@@ -81,6 +81,15 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl)
+     return SSL3_BUFFER_get_left(&rl->rbuf) != 0;
+ }
+ 
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl)
++{
++    if (rl->rstate == SSL_ST_READ_BODY)
++        return 1;
++    if (RECORD_LAYER_processed_read_pending(rl))
++        return 1;
++    return 0;
++}
++
+ /* Checks if we have decrypted unread record data pending */
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl)
+ {
+diff --git a/ssl/record/record.h b/ssl/record/record.h
+index 234656bf93942..b60f71c8cb23b 100644
+--- ssl/record/record.h.orig
++++ ssl/record/record.h
+@@ -205,6 +205,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl);
+ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl);
+ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
++int RECORD_LAYER_data_present(const RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
+ void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
+ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index e747b7f90aa71..9088223b9f6bb 100644
+--- ssl/ssl_lib.c.orig
++++ ssl/ssl_lib.c
+@@ -5493,6 +5493,9 @@ int SSL_free_buffers(SSL *ssl)
+     if (RECORD_LAYER_read_pending(rl) || RECORD_LAYER_write_pending(rl))
+         return 0;
+ 
++    if (RECORD_LAYER_data_present(rl))
++        return 0;
++
+     RECORD_LAYER_release(rl);
+     return 1;
+ }
diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile
index 3feb471fe332..c9081410da74 100644
--- a/security/openssl32/Makefile
+++ b/security/openssl32/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openssl
 DISTVERSION=	3.2.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
diff --git a/security/openssl32/files/patch-CVE-2024-4603 b/security/openssl32/files/patch-CVE-2024-4603
new file mode 100644
index 000000000000..9a7ce27644c3
--- /dev/null
+++ b/security/openssl32/files/patch-CVE-2024-4603
@@ -0,0 +1,172 @@
+From da343d0605c826ef197aceedc67e8e04f065f740 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tomas@openssl.org>
+Date: Wed, 8 May 2024 15:23:45 +0200
+Subject: [PATCH] Check DSA parameters for excessive sizes before validating
+
+This avoids overly long computation of various validation
+checks.
+
+Fixes CVE-2024-4603
+
+Reviewed-by: Paul Dale <ppzgs1@gmail.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/24346)
+
+(cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)
+---
+ CHANGES.md                                    | 17 ++++++
+ crypto/dsa/dsa_check.c                        | 44 ++++++++++++--
+ .../invalid/p10240_q256_too_big.pem           | 57 +++++++++++++++++++
+ 3 files changed, 114 insertions(+), 4 deletions(-)
+ create mode 100644 test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+
+diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
+index fb0e9129a2956..122449a7bf087 100644
+--- crypto/dsa/dsa_check.c.orig
++++ crypto/dsa/dsa_check.c
+@@ -19,8 +19,34 @@
+ #include "dsa_local.h"
+ #include "crypto/dsa.h"
+ 
++static int dsa_precheck_params(const DSA *dsa, int *ret)
++{
++    if (dsa->params.p == NULL || dsa->params.q == NULL) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) {
++        ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE);
++        *ret = FFC_CHECK_INVALID_PQ;
++        return 0;
++    }
++
++    return 1;
++}
++
+ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
+         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
+                                                FFC_PARAM_TYPE_DSA, ret);
+@@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
+  */
+ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+  */
+ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret)
+ {
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
+     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
+            && *ret == 0;
+ }
+@@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
+ {
+     *ret = 0;
+ 
+-    return (dsa->params.q != NULL
+-            && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret));
++    if (!dsa_precheck_params(dsa, ret))
++        return 0;
++
++    return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret);
+ }
+ 
+ /*
+@@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa)
+     BN_CTX *ctx = NULL;
+     BIGNUM *pub_key = NULL;
+ 
+-    if (dsa->params.p == NULL
+-        || dsa->params.g == NULL
++    if (!dsa_precheck_params(dsa, &ret))
++        return 0;
++
++    if (dsa->params.g == NULL
+         || dsa->priv_key == NULL
+         || dsa->pub_key == NULL)
+         return 0;
+diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+new file mode 100644
+index 0000000000000..e85e2953b7a24
+--- /dev/null
++++ test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem
+@@ -0,0 +1,57 @@
++-----BEGIN DSA PARAMETERS-----
++MIIKLAKCBQEAym47LzPFZdbz16WvjczLKuzLtsP8yRk/exxL4bBthJhP1qOwctja
++p1586SF7gDxCMn7yWVEYdfRbFefGoq0gj1XOE917XqlbnkmZhMgxut2KbNJo/xil
++XNFUjGvKs3F413U9rAodC8f07cWHP1iTcWL+vPe6u2yilKWYYfnLWHQH+Z6aPrrF
++x/R08LI6DZ6nEsIo+hxaQnEtx+iqNTJC6Q1RIjWDqxQkFVTkJ0Y7miRDXmRdneWk
++oLrMZRpaXr5l5tSjEghh1pBgJcdyOv0lh4dlDy/alAiqE2Qlb667yHl6A9dDPlpW
++dAntpffy4LwOxfbuEhISvKjjQoBwIvYE4TBPqL0Q6bC6HgQ4+tqd9b44pQjdIQjb
++Xcjc6azheITSnPEex3OdKtKoQeRq01qCeLBpMXu1c+CTf4ApKArZvT3vZSg0hM1O
++pR71bRZrEEegDj0LH2HCgI5W6H3blOS9A0kUTddCoQXr2lsVdiPtRbPKH1gcd9FQ
++P8cGrvbakpTiC0dCczOMDaCteM1QNILlkM7ZoV6VghsKvDnFPxFsiIr5GgjasXP5
++hhbn3g7sDoq1LiTEo+IKQY28pBWx7etSOSRuXW/spnvCkivZla7lSEGljoy9QlQ2
++UZmsEQI9G3YyzgpxHvKZBK1CiZVTywdYKTZ4TYCxvqzhYhjv2bqbpjI12HRFLojB
++koyEmMSp53lldCzp158PrIanqSp2rksMR8SmmCL3FwfAp2OjqFMEglG9DT8x0WaN
++TLSkjGC6t2csMte7WyU1ekNoFDKfMjDSAz0+xIx21DEmZtYqFOg1DNPK1xYLS0pl
++RSMRRkJVN2mk/G7/1oxlB8Wb9wgi3GKUqqCYT11SnBjzq0NdoJ3E4GMedp5Lx3AZ
++4mFuRPUd4iV86tE0XDSHSFE7Y3ZkrOjD7Q/26/L53L/UH5z4HW6CHP5os7QERJjg
++c1S3x87wXWo9QXbB9b2xmf+c+aWwAAr1cviw38tru58jF3/IGyduj9H8claKQqBG
++cIOUF4aNe1hK2K3ArAOApUxr4KE+tCvrltRfiTmVFip0g9Jt1CPY3Zu7Bd4Z2ZkE
++DtSztpwa49HrWF5E9xpquvBL2U8jQ68E7Xd8Wp4orI/TIChriamBmdkgRz3H2LvN
++Ozb6+hsnEGrz3sp2RVAToSqA9ysa6nHZdfufPNtMEbQdO/k1ehmGRb0ljBRsO6b2
++rsG2eYuC8tg8eCrIkua0TGRI7g6a4K32AJdzaX6NsISaaIW+OYJuoDSscvD3oOg8
++PPEhU+zM7xJskTA+jxvPlikKx8V7MNHOCQECldJlUBwzJvqp40JvwfnDsF+8VYwd
++UaiieR3pzMzyTjpReXRmZbnRPusRcsVzxb2OhB79wmuy4UPjjQBX+7eD0rs8xxvW
++5a5q1Cjq4AvbwmmcA/wDrHDOjcbD/zodad2O1QtBWa/R4xyWea4zKsflgACE1zY9
++wW2br7+YQFekcrXkkkEzgxd6zxv8KVEDpXRZjmAM1cI5LvkoN64To4GedN8Qe/G7
++R9SZh9gnS17PTP64hK+aYqhFafMdu87q/+qLfxaSux727qE5hiW01u4nnWhACf9s
++xuOozowKqxZxkolMIyZv6Lddwy1Zv5qjCyd0DvM/1skpXWkb9kfabYC+OhjsjVhs
++0Ktfs6a5B3eixiw5x94hhIcTEcS4hmvhGUL72FiTca6ZeSERTKmNBy8CIQC9/ZUN
++uU/V5JTcnYyUGHzm7+XcZBjyGBagBj9rCmW3SQKCBQAJ/k9rb39f1cO+/3XDEMjy
++9bIEXSuS48g5RAc1UGd5nrrBQwuDxGWFyz0yvAY7LgyidZuJS21+MAp9EY7AOMmx
++TDttifNaBJYt4GZ8of166PcqTKkHQwq5uBpxeSDv/ZE8YbYfaCtLTcUC8KlO+l36
++gjJHSkdkflSsGy1yObSNDQDfVAAwQs//TjDMnuEtvlNXZllsTvFFBceXVETn10K2
++ZMmdSIJNfLnjReUKEN6PfeGqv7F4xoyGwUybEfRE4u5RmXrqCODaIjY3SNMrOq8B
++R3Ata/cCozsM1jIdIW2z+OybDJH+BYsYm2nkSZQjZS6javTYClLrntEKG/hAQwL8
++F16YLOQXpHhgiAaWnTZzANtLppB2+5qCVy5ElzKongOwT8JTjTFXOaRnqe/ngm9W
++SSbrxfDaoWUOyK9XD8Cydzpv3n4Y8nWNGayi7/yAFCU36Ri040ufgv/TZLuKacnl
+++3ga3ZUpRlSigzx0kb1+KjTSWeQ8vE/psdWjvBukVEbzdUauMLyRLo/6znSVvvPX
++UGhviThE5uhrsUg+wEPFINriSHfF7JDKVhDcJnLBdaXvfN52pkF/naLBF5Rt3Gvq
++fjCxjx0Sy9Lag1hDN4dor7dzuO7wmwOS01DJW1PtNLuuH0Bbqh1kYSaQkmyXBZWX
++qo8K3nkoDM0niOtJJubOhTNrGmSaZpNXkK3Mcy9rBbdvEs5O0Jmqaax/eOdU0Yot
++B3lX+3ddOseT2ZEFjzObqTtkWuFBeBxuYNcRTsu3qMdIBsEb8URQdsTtjoIja2fK
++hreVgjK36GW70KXEl8V/vq5qjQulmqkBEjmilcDuiREKqQuyeagUOnhQaBplqVco
++4xznh5DMBMRbpGb5lHxKv4cPNi+uNAJ5i98zWUM1JRt6aXnRCuWcll1z8fRZ+5kD
++vK9FaZU3VRMK/eknEG49cGr8OuJ6ZRSaC+tKwV1y+amkSZpKPWnk2bUnQI3ApJv3
++k1e1EToeECpMUkLMDgNbpKBoz4nqMEvAAlYgw9xKNbLlQlahqTVEAmaJHh4yDMDy
++i7IZ9Wrn47IGoR7s3cvhDHUpRPeW4nsmgzj+tf5EAxemI61STZJTTWo0iaPGJxct
++9nhOOhw1I38Mvm4vkAbFH7YJ0B6QrjjYL2MbOTp5JiIh4vdOeWwNo9/y4ffyaN5+
++ADpxuuIAmcbdr6GPOhkOFFixRJa0B2eP1i032HESlLs8RB9oYtdTXdXQotnIgJGd
++Y8tSKOa1zjzeLHn3AVpRZTUW++/BxmApV3GKIeG8fsUjg/df0QRrBcdC/1uccdaG
++KKlAOwlywVn5jUlwHkTmDiTM9w5AqVVGHZ2b+4ZgQW8jnPKN0SrKf6U555D+zp7E
++x4uXoE8ojN9y8m8UKf0cTLnujH2XgZorjPfuMOt5VZEhQFMS2QaljSeni5CJJ8gk
++XtztNqfBlAtWR4V5iAHeQOfIB2YaOy8GESda89tyKraKeaez41VblpTVHTeq9IIF
++YB4cQA2PfuNaGVRGLMAgT3Dvl+mxxxeJyxnGAiUcETU/jJJt9QombiuszBlYGQ5d
++ELOSm/eQSRARV9zNSt5jaQlMSjMBqenIEM09BzYqa7jDwqoztFxNdO8bcuQPuKwa
++4z3bBZ1yYm63WFdNbQqqGEwc0OYmqg1raJ0zltgHyjFyw8IGu4g/wETs+nVQcH7D
++vKuje86bePD6kD/LH3wmkA==
++-----END DSA PARAMETERS-----
diff --git a/security/openssl32/files/patch-CVE-2024-4741 b/security/openssl32/files/patch-CVE-2024-4741
new file mode 100644
index 000000000000..78aea45553ce
--- /dev/null
+++ b/security/openssl32/files/patch-CVE-2024-4741
@@ -0,0 +1,36 @@
+From c88c3de51020c37e8706bf7a682a162593053aac Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Tue, 23 Apr 2024 16:34:46 +0100
+Subject: [PATCH] Only free the read buffers if we're not using them
+
+If we're part way through processing a record, or the application has
+not released all the records then we should not free our buffer because
+they are still needed.
+
+CVE-2024-4741
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24395)
+
+(cherry picked from commit 38690cab18de88198f46478565fab423cf534efa)
+---
+ ssl/record/methods/tls_common.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
+index 08e519ac7a385..f46da0fd5b33f 100644
+--- ssl/record/methods/tls_common.c.orig
++++ ssl/record/methods/tls_common.c
+@@ -2129,7 +2129,10 @@ int tls_free_buffers(OSSL_RECORD_LAYER *rl)
+     /* Read direction */
+ 
+     /* If we have pending data to be read then fail */
+-    if (rl->curr_rec < rl->num_recs || TLS_BUFFER_get_left(&rl->rbuf) != 0)
++    if (rl->curr_rec < rl->num_recs
++            || rl->curr_rec != rl->num_released
++            || TLS_BUFFER_get_left(&rl->rbuf) != 0
++            || rl->rstate == SSL_ST_READ_BODY)
+         return 0;
+ 
+     return tls_release_read_buffer(rl);
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index e5738ca5c50c..eec0e76269e9 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		openvpn
-DISTVERSION=		2.6.10
+DISTVERSION=		2.6.11
 PORTREVISION?=		0
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 7a36c05782a6..b28f8f1a4e19 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711807764
-SHA256 (openvpn-2.6.10.tar.gz) = 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b
-SIZE (openvpn-2.6.10.tar.gz) = 1907280
+TIMESTAMP = 1718911014
+SHA256 (openvpn-2.6.11.tar.gz) = d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e
+SIZE (openvpn-2.6.11.tar.gz) = 1907454
diff --git a/security/osv-scanner/Makefile b/security/osv-scanner/Makefile
index cc2356133d1a..733df9edf85e 100644
--- a/security/osv-scanner/Makefile
+++ b/security/osv-scanner/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	osv-scanner
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/security/picocrypt/Makefile b/security/picocrypt/Makefile
index 1de0d2598b9d..0561fcefcaf7 100644
--- a/security/picocrypt/Makefile
+++ b/security/picocrypt/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	picocrypt
 DISTVERSION=	1.33
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	security
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/security/py-certbot-dns-powerdns/Makefile b/security/py-certbot-dns-powerdns/Makefile
index fcb5cd0f772e..a6a55a42b798 100644
--- a/security/py-certbot-dns-powerdns/Makefile
+++ b/security/py-certbot-dns-powerdns/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	certbot-dns-powerdns
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,7 +14,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P
 		${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dns-lexicon>=3.2.4:dns/py-dns-lexicon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}mock>=4.0.3:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}
 
 USES=		python
 
diff --git a/security/py-cryptography-legacy/Makefile b/security/py-cryptography-legacy/Makefile
index 0e9421c19323..af0a496d0bb5 100644
--- a/security/py-cryptography-legacy/Makefile
+++ b/security/py-cryptography-legacy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cryptography
 PORTVERSION=	3.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	PYPI
diff --git a/security/py-cryptography-legacy/files/patch-libressl b/security/py-cryptography-legacy/files/patch-libressl
index b9bc1e535d63..31a802026e1b 100644
--- a/security/py-cryptography-legacy/files/patch-libressl
+++ b/security/py-cryptography-legacy/files/patch-libressl
@@ -1,4 +1,4 @@
---- src/_cffi_src/openssl/crypto.py.orig	2023-03-22 07:29:15 UTC
+--- src/_cffi_src/openssl/crypto.py.orig	2021-08-24 17:02:37 UTC
 +++ src/_cffi_src/openssl/crypto.py
 @@ -74,11 +74,8 @@ CUSTOMIZATIONS = """
  # define OPENSSL_DIR             SSLEAY_DIR
@@ -49,7 +49,7 @@
  #else
 --- src/_cffi_src/openssl/dh.py.orig	2021-08-24 17:17:17 UTC
 +++ src/_cffi_src/openssl/dh.py
-@@ -37,117 +37,9 @@ int Cryptography_i2d_DHxparams_bio(BIO *bp, DH *x);
+@@ -37,117 +37,9 @@ CUSTOMIZATIONS = """
  """
  
  CUSTOMIZATIONS = """
@@ -169,21 +169,26 @@
  /* Define our own to simplify support across all versions. */
 --- src/_cffi_src/openssl/fips.py.orig	2021-08-24 17:17:17 UTC
 +++ src/_cffi_src/openssl/fips.py
-@@ -17,11 +17,5 @@ int FIPS_mode(void);
+@@ -12,16 +12,8 @@ FUNCTIONS = """
+ """
+ 
+ FUNCTIONS = """
+-int FIPS_mode_set(int);
+-int FIPS_mode(void);
  """
  
  CUSTOMIZATIONS = """
 -#if CRYPTOGRAPHY_IS_LIBRESSL
--static const long Cryptography_HAS_FIPS = 0;
+ static const long Cryptography_HAS_FIPS = 0;
 -int (*FIPS_mode_set)(int) = NULL;
 -int (*FIPS_mode)(void) = NULL;
 -#else
- static const long Cryptography_HAS_FIPS = 1;
+-static const long Cryptography_HAS_FIPS = 1;
 -#endif
  """
 --- src/_cffi_src/openssl/ocsp.py.orig	2021-08-24 17:17:17 UTC
 +++ src/_cffi_src/openssl/ocsp.py
-@@ -77,7 +77,6 @@ int i2d_OCSP_RESPDATA(OCSP_RESPDATA *, unsigned char *
+@@ -77,7 +77,6 @@ CUSTOMIZATIONS = """
  
  CUSTOMIZATIONS = """
  #if ( \
@@ -256,7 +261,7 @@
  """
 --- src/_cffi_src/openssl/ssl.py.orig	2021-08-24 17:17:17 UTC
 +++ src/_cffi_src/openssl/ssl.py
-@@ -515,12 +515,7 @@ CUSTOMIZATIONS = """
+@@ -515,12 +515,7 @@ static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1
  // users have upgraded. PersistentlyDeprecated2020
  static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1;
  
@@ -280,7 +285,7 @@
  #endif
 --- src/_cffi_src/openssl/x509.py.orig	2021-08-24 17:02:37 UTC
 +++ src/_cffi_src/openssl/x509.py
-@@ -276,33 +276,8 @@ void X509_REQ_get0_signature(const X509_REQ *, const A
+@@ -276,33 +276,8 @@ CUSTOMIZATIONS = """
  """
  
  CUSTOMIZATIONS = """
diff --git a/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py b/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py
new file mode 100644
index 000000000000..fed5fe1cf1a7
--- /dev/null
+++ b/security/py-cryptography-legacy/files/patch-src___cffi__src_openssl_err.py
@@ -0,0 +1,13 @@
+https://www.openssl.org/docs/man3.0/man7/migration_guide.html#Removal-of-function-code-from-the-error-codes
+states that the ERR_GET_FUNC() "macro" was removed, so follow suit:
+
+--- src/_cffi_src/openssl/err.py.orig	2021-08-24 17:17:17 UTC
++++ src/_cffi_src/openssl/err.py
+@@ -39,7 +39,6 @@ int ERR_GET_LIB(unsigned long);
+ void ERR_put_error(int, int, int, const char *, int);
+ 
+ int ERR_GET_LIB(unsigned long);
+-int ERR_GET_FUNC(unsigned long);
+ int ERR_GET_REASON(unsigned long);
+ 
+ """
diff --git a/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py b/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py
new file mode 100644
index 000000000000..da25fa61681a
--- /dev/null
+++ b/security/py-cryptography-legacy/files/patch-src_cryptography_hazmat_bindings_openssl_binding.py
@@ -0,0 +1,15 @@
+https://www.openssl.org/docs/man3.0/man7/migration_guide.html#Removal-of-function-code-from-the-error-codes
+states that the code is always 0, so do just that and forgo the call of a
+nonexistent function.
+
+--- src/cryptography/hazmat/bindings/openssl/binding.py.orig	2021-08-24 17:17:17 UTC
++++ src/cryptography/hazmat/bindings/openssl/binding.py
+@@ -43,7 +43,7 @@ def _consume_errors(lib):
+             break
+ 
+         err_lib = lib.ERR_GET_LIB(code)
+-        err_func = lib.ERR_GET_FUNC(code)
++        err_func = 0
+         err_reason = lib.ERR_GET_REASON(code)
+ 
+         errors.append(_OpenSSLError(code, err_lib, err_func, err_reason))
diff --git a/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py b/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py
new file mode 100644
index 000000000000..8650c280071b
--- /dev/null
+++ b/security/py-cryptography-legacy/files/patch-src_cryptography_utils.py
@@ -0,0 +1,28 @@
+Taken from ../py-cryptography source code as of
+FreeBSD ports tree 3216ed57448ee28aa6061e08839198c3e5cff5d7
+with py-cryptography-42.0.7,1, with type annotations stripped out:
+-- mandree@ 2024-05-30
+
+--- src/cryptography/utils.py.orig	2021-08-24 17:17:17 UTC
++++ src/cryptography/utils.py
+@@ -132,13 +132,15 @@ class _ModuleWithDeprecations(object):
+         return ["_module"] + dir(self._module)
+ 
+ 
+-def deprecated(value, module_name, message, warning_class):
++def deprecated(value, module_name, message, warning_class, name=None):
+     module = sys.modules[module_name]
+     if not isinstance(module, _ModuleWithDeprecations):
+-        sys.modules[module_name] = _ModuleWithDeprecations(
+-            module
+-        )  # type: ignore[assignment]
+-    return _DeprecatedValue(value, message, warning_class)
++        sys.modules[module_name] = module = _ModuleWithDeprecations(module)
++    dv = _DeprecatedValue(value, message, warning_class)
++    # Maintain backwards compatibility with `name is None` for pyOpenSSL.
++    if name is not None:
++        setattr(module, name, dv)
++    return dv
+ 
+ 
+ def cached_property(func):
diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile
index ff83699d171c..c2ef38dc05ff 100644
--- a/security/qtkeychain/Makefile
+++ b/security/qtkeychain/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	qtkeychain
 #DISTVERSIONPREFIX=	v
-DISTVERSION=	0.14.2
+DISTVERSION=	0.14.3
 CATEGORIES=	security
 PKGNAMESUFFIX=	-${FLAVOR}
 
diff --git a/security/qtkeychain/distinfo b/security/qtkeychain/distinfo
index 37efc987c4c7..24d1ce020139 100644
--- a/security/qtkeychain/distinfo
+++ b/security/qtkeychain/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703882744
-SHA256 (frankosterfeld-qtkeychain-0.14.2_GH0.tar.gz) = cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571
-SIZE (frankosterfeld-qtkeychain-0.14.2_GH0.tar.gz) = 50915
+TIMESTAMP = 1715255536
+SHA256 (frankosterfeld-qtkeychain-0.14.3_GH0.tar.gz) = a22c708f351431d8736a0ac5c562414f2b7bb919a6292cbca1ff7ac0849cb0a7
+SIZE (frankosterfeld-qtkeychain-0.14.3_GH0.tar.gz) = 50948
diff --git a/security/rubygem-omniauth-rails_csrf_protection/Makefile b/security/rubygem-omniauth-rails_csrf_protection/Makefile
index 2df24a6ee691..e5685d164aba 100644
--- a/security/rubygem-omniauth-rails_csrf_protection/Makefile
+++ b/security/rubygem-omniauth-rails_csrf_protection/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	omniauth-rails_csrf_protection
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	security rubygems
 MASTER_SITES=	RG
 
@@ -10,7 +10,7 @@ WWW=		https://github.com/cookpad/omniauth-rails_csrf_protection
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-actionpack61>=4.2:www/rubygem-actionpack61 \
+RUN_DEPENDS=	rubygem-actionpack70>=4.2:www/rubygem-actionpack70 \
 		rubygem-omniauth>=2.0<3:security/rubygem-omniauth
 
 USES=		gem
diff --git a/security/rubygem-omniauth-rails_csrf_protection/distinfo b/security/rubygem-omniauth-rails_csrf_protection/distinfo
index 1b794d0064f9..c471855e4abf 100644
--- a/security/rubygem-omniauth-rails_csrf_protection/distinfo
+++ b/security/rubygem-omniauth-rails_csrf_protection/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665830346
-SHA256 (rubygem/omniauth-rails_csrf_protection-1.0.1.gem) = fc546aeb7d43b7b9d7737051c380156e61c8f080b898cd4934d523eaa7e59acf
-SIZE (rubygem/omniauth-rails_csrf_protection-1.0.1.gem) = 10752
+TIMESTAMP = 1715572767
+SHA256 (rubygem/omniauth-rails_csrf_protection-1.0.2.gem) = 1170fd672aff092b9b7ebebc1453559f073ed001e3ce62a1df616e32f8dc5fe0
+SIZE (rubygem/omniauth-rails_csrf_protection-1.0.2.gem) = 8192
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index 5c1d03d886ab..550af4047b38 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scanlogd
 PORTVERSION=	2.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://openwall.com/scanlogd/ \
 		ftp://ftp.openwall.com/pub/projects/scanlogd/ \
diff --git a/security/scanlogd/files/850.scanlogd b/security/scanlogd/files/850.scanlogd
index d2aec37544ff..b3f475162fa5 100644
--- a/security/scanlogd/files/850.scanlogd
+++ b/security/scanlogd/files/850.scanlogd
@@ -18,9 +18,6 @@ fi
 
 : ${security_status_scanlogd_period="daily"}
 
-security_daily_compat_var security_status_logdir
-security_daily_compat_var security_status_scanlogd_enable
-
 logdir="${security_status_logdir}"
 
 yesterday=`env LC_TIME=C date -v-1d "+%b %e "`
diff --git a/security/snowflake-tor/Makefile b/security/snowflake-tor/Makefile
index d35556f9a8ae..72fce52301ae 100644
--- a/security/snowflake-tor/Makefile
+++ b/security/snowflake-tor/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		snowflake
 DISTVERSIONPREFIX=	v
 PORTVERSION=		2.5.1
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=		security net
 PKGNAMESUFFIX=		-tor
 
diff --git a/security/sops/Makefile b/security/sops/Makefile
index 2f1d351527e3..953b5d29a836 100644
--- a/security/sops/Makefile
+++ b/security/sops/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sops
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.7.3
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	security editors
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/security/ssb/Makefile b/security/ssb/Makefile
index 0fd0eabe09e5..d8bbfcd9abec 100644
--- a/security/ssb/Makefile
+++ b/security/ssb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ssb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/security/ssllabs-scan/Makefile b/security/ssllabs-scan/Makefile
index 8ae6998836db..c77b207efaef 100644
--- a/security/ssllabs-scan/Makefile
+++ b/security/ssllabs-scan/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		ssllabs-scan
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.5.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		security net
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/security/stegify/Makefile b/security/stegify/Makefile
index 8f48e5819add..3e706457ec3c 100644
--- a/security/stegify/Makefile
+++ b/security/stegify/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	stegify
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2-2
 DISTVERSIONSUFFIX=	-g62518ca
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	security graphics
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/step-certificates/Makefile b/security/step-certificates/Makefile
index 0eeaa98f153a..eeaf2ec3025a 100644
--- a/security/step-certificates/Makefile
+++ b/security/step-certificates/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	step-certificates
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.26.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	mw@wipp.bayern
diff --git a/security/step-cli/Makefile b/security/step-cli/Makefile
index 6527a05cca05..6f1ca2faa827 100644
--- a/security/step-cli/Makefile
+++ b/security/step-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	step-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.26.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	mw@wipp.bayern
diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index 15ba604bf372..d48b2b896af1 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tailscale
-PORTVERSION=	1.64.2
+PORTVERSION=	1.68.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security net-vpn
 
diff --git a/security/tailscale/distinfo b/security/tailscale/distinfo
index 477f54f7cec5..d636f8d33729 100644
--- a/security/tailscale/distinfo
+++ b/security/tailscale/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713379891
-SHA256 (go/security_tailscale/tailscale-v1.64.2/v1.64.2.mod) = 792c3444d2e75cc08c11dfce429b6ce8abb9b5d87714753b7e7be9d8ea6388d2
-SIZE (go/security_tailscale/tailscale-v1.64.2/v1.64.2.mod) = 18985
-SHA256 (go/security_tailscale/tailscale-v1.64.2/v1.64.2.zip) = 1b9efdb4614b8753631f2e1767481cd6e4b98db6d4f0cba3007e6dd64ed0ec0a
-SIZE (go/security_tailscale/tailscale-v1.64.2/v1.64.2.zip) = 3237477
+TIMESTAMP = 1718446166
+SHA256 (go/security_tailscale/tailscale-v1.68.1/v1.68.1.mod) = 2fc7d7c97922cb35d8bce03d668b3257a491bf0b7e2d5c787daa43eddb804205
+SIZE (go/security_tailscale/tailscale-v1.68.1/v1.68.1.mod) = 19953
+SHA256 (go/security_tailscale/tailscale-v1.68.1/v1.68.1.zip) = 6968fb1b363ca6ad01b765e654e249cc167a64ee508bf50c04c9b34ab63111bb
+SIZE (go/security_tailscale/tailscale-v1.68.1/v1.68.1.zip) = 3472907
diff --git a/security/teleport/Makefile b/security/teleport/Makefile
index 65f77d4fc10a..c37c9209c371 100644
--- a/security/teleport/Makefile
+++ b/security/teleport/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	teleport
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.2.5
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	security
 
 MAINTAINER=	kraileth@elderlinux.org
diff --git a/security/tfsec/Makefile b/security/tfsec/Makefile
index 9200dcc2dd7e..bb1e796f0589 100644
--- a/security/tfsec/Makefile
+++ b/security/tfsec/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tfsec
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.28.5
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/security/totp-cli/Makefile b/security/totp-cli/Makefile
index 8a5690fb71de..cb4abf75c370 100644
--- a/security/totp-cli/Makefile
+++ b/security/totp-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	totp-cli
 PORTVERSION=	1.8.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/security/trivy/Makefile b/security/trivy/Makefile
index c99b3e40399e..030b7ca345a6 100644
--- a/security/trivy/Makefile
+++ b/security/trivy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	trivy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.51.0
+DISTVERSION=	0.53.0
 CATEGORIES=	security
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/security/trivy/distinfo b/security/trivy/distinfo
index a909d8cdeae5..349872b7c9de 100644
--- a/security/trivy/distinfo
+++ b/security/trivy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1714797056
-SHA256 (go/security_trivy/trivy-v0.51.0/v0.51.0.mod) = bc28929574f7118e5a209d3718c80060829976d1c54f516bc224937234478f71
-SIZE (go/security_trivy/trivy-v0.51.0/v0.51.0.mod) = 22462
-SHA256 (go/security_trivy/trivy-v0.51.0/v0.51.0.zip) = 406200eb621d305c01eeea4a5297d69a8d01282d1effe4c66d1f6d844b600eb0
-SIZE (go/security_trivy/trivy-v0.51.0/v0.51.0.zip) = 57074454
+TIMESTAMP = 1719843416
+SHA256 (go/security_trivy/trivy-v0.53.0/v0.53.0.mod) = 86adad3fd423806d5d406cf3bb6542f3d3d2248fa40fc57096329c33f594a2a4
+SIZE (go/security_trivy/trivy-v0.53.0/v0.53.0.mod) = 19923
+SHA256 (go/security_trivy/trivy-v0.53.0/v0.53.0.zip) = 8de80f2ffc26df0f6077735c86d162b43bc7d61d00abb6825c512ec777e2648e
+SIZE (go/security_trivy/trivy-v0.53.0/v0.53.0.zip) = 58098784
diff --git a/security/trufflehog/Makefile b/security/trufflehog/Makefile
index f2d7fec999c0..10864e1fde5c 100644
--- a/security/trufflehog/Makefile
+++ b/security/trufflehog/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	trufflehog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.63.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/security/vault/Makefile b/security/vault/Makefile
index aae282bb8322..5e5888621866 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vault
 PORTVERSION=	1.14.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ \
 		LOCAL/bofh/security/${PORTNAME}/:web_ui
diff --git a/security/vouch-proxy/Makefile b/security/vouch-proxy/Makefile
index fe50f1258da6..6973d1a3f7c1 100644
--- a/security/vouch-proxy/Makefile
+++ b/security/vouch-proxy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vouch-proxy
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.39.0
-PORTREVISION=	10
+PORTREVISION=	12
 CATEGORIES=	security
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/security/vuls/Makefile b/security/vuls/Makefile
index 14e8eb7b3007..0a2e5675868a 100644
--- a/security/vuls/Makefile
+++ b/security/vuls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vuls
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.25.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	girgen@FreeBSD.org
diff --git a/security/vulsrepo/Makefile b/security/vulsrepo/Makefile
index 3c026fbac83c..664f4051925e 100644
--- a/security/vulsrepo/Makefile
+++ b/security/vulsrepo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vulsrepo
 PORTVERSION=	0.7.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security www
 MASTER_SITES=   https://raw.githubusercontent.com/${GH_ACCOUNT}/${PORTNAME}/v${PORTVERSION}/server/:gomod
 DISTFILES=	go.mod:gomod
diff --git a/security/webtunnel-tor/Makefile b/security/webtunnel-tor/Makefile
index 378d3b4a4fd5..d5bf0d9021ea 100644
--- a/security/webtunnel-tor/Makefile
+++ b/security/webtunnel-tor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	webtunnel
 PORTVERSION=	0.0.1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	security net
 PKGNAMESUFFIX=	-tor
 
diff --git a/security/xhash/Makefile b/security/xhash/Makefile
index 7201e10db52e..0bb1d6b06f90 100644
--- a/security/xhash/Makefile
+++ b/security/xhash/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xhash
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 
 MAINTAINER=	rbranco@suse.de
diff --git a/security/xray-core/Makefile b/security/xray-core/Makefile
index f1a9131be64d..2598df607304 100644
--- a/security/xray-core/Makefile
+++ b/security/xray-core/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xray-core
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.8
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/v2fly/geoip/releases/download/202403070031/:geoip \
 		https://github.com/v2fly/domain-list-community/releases/download/20240301033006/:geosite
diff --git a/security/yubikey-agent/Makefile b/security/yubikey-agent/Makefile
index 30f6f62ab0ac..33a49e9bf695 100644
--- a/security/yubikey-agent/Makefile
+++ b/security/yubikey-agent/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yubikey-agent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.6
-PORTREVISION=	11
+PORTREVISION=	13
 CATEGORIES=	security sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/security/zlint/Makefile b/security/zlint/Makefile
index a3eaa938c34d..6652e9daf6ae 100644
--- a/security/zlint/Makefile
+++ b/security/zlint/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zlint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.6.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/shells/antibody/Makefile b/shells/antibody/Makefile
index 02b2eeb95750..3812d4218014 100644
--- a/shells/antibody/Makefile
+++ b/shells/antibody/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	antibody
 PORTVERSION=	6.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	shells
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/shells/carapace/Makefile b/shells/carapace/Makefile
index 35bc5e244a94..31b6afe91528 100644
--- a/shells/carapace/Makefile
+++ b/shells/carapace/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	carapace
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	shells
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
index 686fae921d2d..ccd583367b58 100644
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.20.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
diff --git a/shells/envy/Makefile b/shells/envy/Makefile
index 4d8aaf991707..a74ba70226c2 100644
--- a/shells/envy/Makefile
+++ b/shells/envy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	envy
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.1.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	shells
 
 MAINTAINER=	krion@FreeBSD.org
diff --git a/shells/murex/Makefile b/shells/murex/Makefile
index 496b54fc9fc4..4504aa3a08f4 100644
--- a/shells/murex/Makefile
+++ b/shells/murex/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	murex
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0.1000
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	shells
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/3mux/Makefile b/sysutils/3mux/Makefile
index e3c6842130e6..69080cb619c8 100644
--- a/sysutils/3mux/Makefile
+++ b/sysutils/3mux/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	3mux
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index ec5cd2929edb..d131bbe18163 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	amazon-ssm-agent
 PORTVERSION=	2.3.1205.0
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	sysutils
 
 MAINTAINER=	cperciva@FreeBSD.org
diff --git a/sysutils/amazon-ssm-plugin/Makefile b/sysutils/amazon-ssm-plugin/Makefile
index 182a2cd48f9c..1f450e9297a0 100644
--- a/sysutils/amazon-ssm-plugin/Makefile
+++ b/sysutils/amazon-ssm-plugin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	amazon-ssm-plugin
 DISTVERSION=	1.2.536.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	nork@FreeBSD.org
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index d8c4c8e2bcac..e0d5c757c25c 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ansible
 DISTVERSION=	8.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
new file mode 100644
index 000000000000..e89669b4830c
--- /dev/null
+++ b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
@@ -0,0 +1,20 @@
+--- ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py.orig	2023-09-07 02:17:47.000000000 -0700
++++ ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py	2024-05-15 08:23:34.190190000 -0700
+@@ -289,7 +289,7 @@
+ 
+ 
+ def _private_query(v, value):
+-    if v.is_private():
++    if not v.ip.is_global():
+         return value
+ 
+ 
+@@ -298,7 +298,7 @@
+     if all(
+         [
+             v_ip.is_unicast(),
+-            not v_ip.is_private(),
++            v_ip.is_global(),
+             not v_ip.is_loopback(),
+             not v_ip.is_netmask(),
+             not v_ip.is_hostmask(),
diff --git a/sysutils/aptly/Makefile b/sysutils/aptly/Makefile
index 56be212a79e1..c0e8f7362ce5 100644
--- a/sysutils/aptly/Makefile
+++ b/sysutils/aptly/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aptly
 PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	sysutils
 
 MAINTAINER=	romain@FreeBSD.org
diff --git a/sysutils/autorestic/Makefile b/sysutils/autorestic/Makefile
index 4f508cbf2ff5..caf33afb417e 100644
--- a/sysutils/autorestic/Makefile
+++ b/sysutils/autorestic/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	autorestic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.10
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/sysutils/beats7/Makefile b/sysutils/beats7/Makefile
index e0ef718c2892..5597cbdd84e5 100644
--- a/sysutils/beats7/Makefile
+++ b/sysutils/beats7/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.17.11
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	7
 
diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile
index b0e8c75409a4..d4dd0a8e1269 100644
--- a/sysutils/beats8/Makefile
+++ b/sysutils/beats8/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.8.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 PKGNAMESUFFIX?=	8
diff --git a/sysutils/brename/Makefile b/sysutils/brename/Makefile
index a6e568bb8e8e..fd65593dbc2e 100644
--- a/sysutils/brename/Makefile
+++ b/sysutils/brename/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	brename
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.14.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/buildah/Makefile b/sysutils/buildah/Makefile
index 745bbc694b2b..cabaa8ca5c08 100644
--- a/sysutils/buildah/Makefile
+++ b/sysutils/buildah/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	buildah
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.33.2
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/cardano-cli/distinfo b/sysutils/cardano-cli/distinfo
index 1578e70a2bf8..8febf5c25f56 100644
--- a/sysutils/cardano-cli/distinfo
+++ b/sysutils/cardano-cli/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1710489749
+TIMESTAMP = 1715112442
 SHA256 (cabal/Diff-0.5/Diff-0.5.tar.gz) = 03cc84dedfb18fa693f0b0b7054d65e92c388d0657cf45ad5e9fbe3fe8b54551
 SIZE (cabal/Diff-0.5/Diff-0.5.tar.gz) = 9122
 SHA256 (cabal/Diff-0.5/revision/1.cabal) = 9c8a972eead9e079b90c6581fa8ef5755662c10dd075951b32b801145704afbb
@@ -905,7 +905,7 @@ SHA256 (cabal/typed-process-0.2.11.1/typed-process-0.2.11.1.tar.gz) = d5c5dda091
 SIZE (cabal/typed-process-0.2.11.1/typed-process-0.2.11.1.tar.gz) = 18339
 SHA256 (cabal/typed-protocols-0.1.1.0.tar.gz) = 23feff45c28a15484cdfdbbebd4000f99148748d44f40bbb17df865ba44293ac
 SIZE (cabal/typed-protocols-0.1.1.0.tar.gz) = 24491
-SHA256 (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 3afb8cf577e858150eb2fdc89638c4a88987c1fd0d6332db77b1c69928fd207d
+SHA256 (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 8776c5b773e667290edc2b367bfdd6630c559181c37dd43ed3fd33e8ea9fbaa3
 SIZE (cabal/typed-protocols-0.1.1.0/revision/1.cabal) = 1630
 SHA256 (cabal/typed-protocols-cborg-0.1.0.4.tar.gz) = 355a02848edf9447451dc7ca0d43bccc25b50b8cc4eac62216203796a2b223f1
 SIZE (cabal/typed-protocols-cborg-0.1.0.4.tar.gz) = 6287
diff --git a/sysutils/cbsd-mq-api/Makefile b/sysutils/cbsd-mq-api/Makefile
index ac9fd74b71f0..7356f14f9152 100644
--- a/sysutils/cbsd-mq-api/Makefile
+++ b/sysutils/cbsd-mq-api/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cbsd-mq-api
 PORTVERSION=	0.3
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd-mq-router/Makefile b/sysutils/cbsd-mq-router/Makefile
index d186834d9ad3..77a8edd1b919 100644
--- a/sysutils/cbsd-mq-router/Makefile
+++ b/sysutils/cbsd-mq-router/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cbsd-mq-router
 PORTVERSION=	0.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 8507a5469392..202c71378510 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cbsd
-DISTVERSION=	14.0.7
+DISTVERSION=	14.1.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -9,11 +9,12 @@ WWW=		https://www.bsdstore.ru
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
-		libcurl.so:ftp/curl \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libsqlite3.so:databases/sqlite3 \
 		libssh2.so:security/libssh2
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		curl:ftp/curl \
+		jq:textproc/jq \
 		rsync:net/rsync \
 		sqlite3:databases/sqlite3 \
 		sudo:security/sudo
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 401ef7cb6895..e91ee99abc2d 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712484690
-SHA256 (cbsd-cbsd-14.0.7_GH0.tar.gz) = df8cd513e998ad9adaea0e5551055300eb97ca6b6df8d084ec0c82c1f8b09182
-SIZE (cbsd-cbsd-14.0.7_GH0.tar.gz) = 6585135
+TIMESTAMP = 1717883438
+SHA256 (cbsd-cbsd-14.1.0_GH0.tar.gz) = a6dd2c110fcc887fd867ad1c2a2a075cc2eb908a7f419a32f7cd49682410409e
+SIZE (cbsd-cbsd-14.1.0_GH0.tar.gz) = 6594226
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index c236fb75f8d6..fb2f2ff8e08a 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -112,6 +112,7 @@ cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-13.3
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-14
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-14.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-14.1
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-14.2
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-15
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-amd64-15.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-13
@@ -119,11 +120,14 @@ cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-13.1
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14.1
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-14.2
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-15
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-arm64-15.0
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-13.1
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14
 cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14.0
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14.1
+cbsd/etc/defaults/FreeBSD-kernel-GENERIC-riscv-14.2
 cbsd/etc/defaults/FreeBSD-kernels.conf
 cbsd/etc/defaults/FreeBSD-sources.conf
 cbsd/etc/defaults/FreeBSD-srvbrowser.conf
@@ -184,8 +188,8 @@ cbsd/etc/defaults/node.conf
 cbsd/etc/defaults/pf.conf.tpl
 cbsd/etc/defaults/pkgbrowser.conf
 cbsd/etc/defaults/portsup.conf
-cbsd/etc/defaults/qexec.conf
 cbsd/etc/defaults/qemu-default-default.conf
+cbsd/etc/defaults/qexec.conf
 cbsd/etc/defaults/qlogin.conf
 cbsd/etc/defaults/qls.conf
 cbsd/etc/defaults/racct-bhyve-statsd.conf
@@ -212,15 +216,18 @@ cbsd/etc/defaults/vls.conf
 cbsd/etc/defaults/vm-dflybsd-cloud-DragonflyBSD-hammer-x64-6.conf
 cbsd/etc/defaults/vm-dflybsd-x86-6.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-14.0.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-aarch64-14.1.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-bsdinstall-jail.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-from-jail.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-img-aarch64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-img-arm64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-14.0.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-riscv64-14.1.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-12.4.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.0.conf
+cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-14.1.conf
 cbsd/etc/defaults/vm-freebsd-FreeBSD-x64-15.0-LATEST.conf
 cbsd/etc/defaults/vm-freebsd-GhostBSD-x64-24.conf
 cbsd/etc/defaults/vm-freebsd-HardenedBSD-x64-14-STABLE.conf
@@ -232,11 +239,13 @@ cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-12.4.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.0.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-14.1.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-ufs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-12.4.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.2.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-13.3.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.0.conf
+cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-14.1.conf
 cbsd/etc/defaults/vm-freebsd-cloud-FreeBSD-zfs-x64-15.conf
 cbsd/etc/defaults/vm-freebsd-cloud-GhostBSD-ufs-x64-22.conf
 cbsd/etc/defaults/vm-freebsd-cloud-OPNSense-22-RELEASE-amd64-22.conf
@@ -245,6 +254,7 @@ cbsd/etc/defaults/vm-freebsd-cloud-firestarter-ufs-x64-14.conf
 cbsd/etc/defaults/vm-freebsd-fio.conf
 cbsd/etc/defaults/vm-freebsd-helloSystem-x64.conf
 cbsd/etc/defaults/vm-freebsd-pfSense-2-RELEASE-amd64.conf
+cbsd/etc/defaults/vm-freebsd-ravynOS-x64-24.conf
 cbsd/etc/defaults/vm-linux-AlmaLinux-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-Alpine-extended-3.conf
 cbsd/etc/defaults/vm-linux-Alpine-standart-3.conf
@@ -264,11 +274,12 @@ cbsd/etc/defaults/vm-linux-FreePBX-64bit-16.conf
 cbsd/etc/defaults/vm-linux-Kali-2024-amd64.conf
 cbsd/etc/defaults/vm-linux-Manjaro-x86-2024.conf
 cbsd/etc/defaults/vm-linux-Mint-21.conf
-cbsd/etc/defaults/vm-linux-NixOS-23.conf
+cbsd/etc/defaults/vm-linux-NixOS-24.conf
 cbsd/etc/defaults/vm-linux-OracleLinux-7.conf
 cbsd/etc/defaults/vm-linux-OracleLinux-8.conf
 cbsd/etc/defaults/vm-linux-OracleLinux-9.conf
-cbsd/etc/defaults/vm-linux-Parrot-security-5-x64.conf
+cbsd/etc/defaults/vm-linux-Parrot-security-6-x64.conf
+cbsd/etc/defaults/vm-linux-Proxmox-Backup-8.conf
 cbsd/etc/defaults/vm-linux-Rocky-8-x86_64.conf
 cbsd/etc/defaults/vm-linux-Rocky-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-RouterOS-x86-7.conf
@@ -276,8 +287,8 @@ cbsd/etc/defaults/vm-linux-Slackware-x86-15.conf
 cbsd/etc/defaults/vm-linux-Starface-8.conf
 cbsd/etc/defaults/vm-linux-Tails-6.conf
 cbsd/etc/defaults/vm-linux-TinyCore-x86-15.conf
-cbsd/etc/defaults/vm-linux-TrueNAS-Scale-22.conf
-cbsd/etc/defaults/vm-linux-VoidLinux-2023-x86_64.conf
+cbsd/etc/defaults/vm-linux-TrueNAS-Scale-24.conf
+cbsd/etc/defaults/vm-linux-VoidLinux-2024-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Alma-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Arch-x86-2022.conf
 cbsd/etc/defaults/vm-linux-cloud-CentOS-7-x86_64.conf
@@ -292,8 +303,9 @@ cbsd/etc/defaults/vm-linux-cloud-Euro-9-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Fedora-37-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Fedora-38-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Fedora-39-x86_64.conf
+cbsd/etc/defaults/vm-linux-cloud-Fedora-40-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-FreePBX-16-x86_64.conf
-cbsd/etc/defaults/vm-linux-cloud-HomeAssistant-8.conf
+cbsd/etc/defaults/vm-linux-cloud-HomeAssistantOS-2024.conf
 cbsd/etc/defaults/vm-linux-cloud-Kali-2022-amd64.conf
 cbsd/etc/defaults/vm-linux-cloud-Oracle-7-x86_64.conf
 cbsd/etc/defaults/vm-linux-cloud-Oracle-8-x86_64.conf
@@ -307,22 +319,28 @@ cbsd/etc/defaults/vm-linux-cloud-ubuntudesktop-amd64-22.04.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-20.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-22.04.conf
 cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-23.04.conf
+cbsd/etc/defaults/vm-linux-cloud-ubuntuserver-amd64-24.04.conf
 cbsd/etc/defaults/vm-linux-fedora-server-39-x86_64.conf
-cbsd/etc/defaults/vm-linux-fedora-silverblue-39-x86_64.conf
+cbsd/etc/defaults/vm-linux-fedora-server-40-x86_64.conf
+cbsd/etc/defaults/vm-linux-fedora-silverblue-40-x86_64.conf
 cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-22.conf
 cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-23.conf
+cbsd/etc/defaults/vm-linux-kubuntu-desktop-amd64-24.conf
 cbsd/etc/defaults/vm-linux-lubuntu-desktop-amd64-22.conf
+cbsd/etc/defaults/vm-linux-lubuntu-desktop-amd64-24.conf
 cbsd/etc/defaults/vm-linux-opensuse-leap-15-x86.conf
 cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-22.conf
 cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-23.conf
+cbsd/etc/defaults/vm-linux-ubuntu-desktop-amd64-24.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-20.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-22.conf
 cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-23.conf
+cbsd/etc/defaults/vm-linux-ubuntuserver-amd64-24.conf
 cbsd/etc/defaults/vm-linux-vyos-1.5.conf
-cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-9.conf
 cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-10.conf
-cbsd/etc/defaults/vm-netbsd-x86-9.conf
+cbsd/etc/defaults/vm-netbsd-cloud-netbsd-x86-9.conf
 cbsd/etc/defaults/vm-netbsd-x86-10.conf
+cbsd/etc/defaults/vm-netbsd-x86-9.conf
 cbsd/etc/defaults/vm-openbsd-cloud-openbsd-x86-7.conf
 cbsd/etc/defaults/vm-openbsd-cloud-openbsd-x86-74.conf
 cbsd/etc/defaults/vm-openbsd-x86-7.conf
@@ -478,6 +496,9 @@ cbsd/modules/bsdconf.d/cloud-tpl/fire-fbsd/20-user-data-user-lockpassword
 cbsd/modules/bsdconf.d/cloud-tpl/fire-fbsd/20-user-data-user-password
 cbsd/modules/bsdconf.d/cloud-tpl/fire-fbsd/30-network-config-static
 cbsd/modules/bsdconf.d/cloud-tpl/fire-fbsd/50-resize
+cbsd/modules/bsdconf.d/cloud-tpl/homeass/30-network-config-dhcp4
+cbsd/modules/bsdconf.d/cloud-tpl/homeass/30-network-config-static
+cbsd/modules/bsdconf.d/cloud-tpl/homeass/README.md
 cbsd/modules/bsdconf.d/cloud-tpl/openbsd/10-network-config
 cbsd/modules/bsdconf.d/cloud-tpl/openbsd/10-user-data
 cbsd/modules/bsdconf.d/cloud-tpl/openbsd/20-network-config-interface
@@ -664,6 +685,9 @@ cbsd/share/Linux-jail-ubuntu-jammy-system-skel/fstab.local
 cbsd/share/Linux-jail-ubuntu-jammy-system-skel/tests/00.check_distribution.sh
 cbsd/share/autocompletion/bash/CBSDCompletion.bash
 cbsd/share/autocompletion/zsh/_cbsd
+cbsd/share/bhyve-HomeAssistantOS-system-skel/etc/blogin.conf
+cbsd/share/bhyve-HomeAssistantOS-system-skel/etc/qlogin.conf
+cbsd/share/bhyve-HomeAssistantOS-system-skel/etc/xlogin.conf
 cbsd/share/bhyve-system-default/create.d/placeholder
 cbsd/share/bhyve-system-default/facts.d/placeholder
 cbsd/share/bhyve-system-default/master_create.d/placeholder
@@ -768,6 +792,7 @@ cbsd/share/examples/cloud-init/centos/user-data
 cbsd/share/examples/cloud-init/freebsd/meta-data
 cbsd/share/examples/cloud-init/freebsd/network-config
 cbsd/share/examples/cloud-init/freebsd/user-data
+cbsd/share/examples/cloud-init/homeass/master_prestart.d/prestart.sh
 cbsd/share/examples/cloud-init/master_prestart.d/cloud_init_set_netname.sh
 cbsd/share/examples/cloud-init/netbsd/meta-data
 cbsd/share/examples/cloud-init/netbsd/network-config
@@ -992,9 +1017,9 @@ cbsd/sudoexec/jstart
 cbsd/sudoexec/jstop
 cbsd/sudoexec/junregister
 cbsd/sudoexec/mkdatadir
-cbsd/sudoexec/qexec
 cbsd/sudoexec/qcreate
 cbsd/sudoexec/qdestroy
+cbsd/sudoexec/qexec
 cbsd/sudoexec/qremove
 cbsd/sudoexec/qstart
 cbsd/sudoexec/qstop
@@ -1136,6 +1161,7 @@ cbsd/tools/repo-tui
 cbsd/tools/retrinv
 cbsd/tools/rsyncdoff
 cbsd/tools/rsyncdon
+cbsd/tools/save-jail-info
 cbsd/tools/secretsfile
 cbsd/tools/select_jail
 cbsd/tools/show_profile_list
@@ -1307,6 +1333,8 @@ cbsd/upgrade/pre-patch-13.0.5.0
 cbsd/upgrade/pre-patch-13.1.1.0
 cbsd/upgrade/pre-patch-13.2.2.0
 cbsd/upgrade/pre-patch-14.0.3.0
+cbsd/upgrade/pre-patch-14.0.8.1
+cbsd/upgrade/pre-patch-14.1.0.0
 cbsd/vboxctl/vconfig
 cbsd/vboxctl/vconstruct-tui
 cbsd/vboxctl/vcontrol-tui
diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile
index 444e7f74cedd..7c00274942ae 100644
--- a/sysutils/chaoskube/Makefile
+++ b/sysutils/chaoskube/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chaoskube
 PORTVERSION=	0.32.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/chezmoi/Makefile b/sysutils/chezmoi/Makefile
index 5c14b47c65b1..3dd3b06ef840 100644
--- a/sysutils/chezmoi/Makefile
+++ b/sysutils/chezmoi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chezmoi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.45.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 EXTRACT_ONLY=	${_DISTFILES:N*.js}
 
diff --git a/sysutils/choria/Makefile b/sysutils/choria/Makefile
index 40f3740e3a7c..dec0a80e81b5 100644
--- a/sysutils/choria/Makefile
+++ b/sysutils/choria/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	choria
 PORTVERSION=	0.27.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	sysutils
 
 MAINTAINER=	puppet@FreeBSD.org
diff --git a/sysutils/conmon/Makefile b/sysutils/conmon/Makefile
index 62b20f6eb549..c7e8d6b4ba52 100644
--- a/sysutils/conmon/Makefile
+++ b/sysutils/conmon/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	conmon
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.10
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile
index 7d3bb9dbaef3..0f87cffd9960 100644
--- a/sysutils/consul-alerts/Makefile
+++ b/sysutils/consul-alerts/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	consul-alerts
 PORTVERSION=	0.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile
index 75cd2f5f25ba..87240483db2c 100644
--- a/sysutils/consul-replicate/Makefile
+++ b/sysutils/consul-replicate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	consul-replicate
 PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 6fe908aeaa57..ea2c60aa0056 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	consul
 DISTVERSION=	1.18.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile
index 039d0cbd9d7e..8f3734a4e2de 100644
--- a/sysutils/consul_exporter/Makefile
+++ b/sysutils/consul_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	consul_exporter
 PORTVERSION=	0.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	t.tom@succont.de
diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile
index 0b2436ac089e..3a5458905408 100644
--- a/sysutils/container-diff/Makefile
+++ b/sysutils/container-diff/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	container-diff
 PORTVERSION=	0.19.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/sysutils/container-diff/files/patch-aarch64 b/sysutils/container-diff/files/patch-aarch64
new file mode 100644
index 000000000000..f35530eff731
--- /dev/null
+++ b/sysutils/container-diff/files/patch-aarch64
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/golang/sys/commit/33540a1f603772f9d4b761f416f5c10dade23e96
+
+--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2024-04-18 11:16:31 UTC
++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+@@ -397,7 +397,7 @@ type FpReg struct {
+ }
+ 
+ type FpReg struct {
+-	Fp_q  [32]uint128
++	Fp_q  [512]uint8
+ 	Fp_sr uint32
+ 	Fp_cr uint32
+ }
diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
index bb7bc27ac1c6..47db2c566a70 100644
--- a/sysutils/containerd/Makefile
+++ b/sysutils/containerd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	containerd
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.7.15
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/sysutils/coreos-ct/Makefile b/sysutils/coreos-ct/Makefile
index b1184ae9800e..aaa0bb159d49 100644
--- a/sysutils/coreos-ct/Makefile
+++ b/sysutils/coreos-ct/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	coreos-ct
 PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	fabian.freyer@physik.tu-berlin.de
diff --git a/sysutils/ctop/Makefile b/sysutils/ctop/Makefile
index d11f4b65c638..17c19fbeeb63 100644
--- a/sysutils/ctop/Makefile
+++ b/sysutils/ctop/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ctop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.7.7
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	sysutils
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile
index 74aad4b728dd..776b6d38c924 100644
--- a/sysutils/datadog-agent/Makefile
+++ b/sysutils/datadog-agent/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	datadog-agent
 DISTVERSION=	7.24.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils net www
 
 MAINTAINER=	uros@gruber.si
diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile
index 801ab0f53503..9c67c56560f2 100644
--- a/sysutils/direnv/Makefile
+++ b/sysutils/direnv/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	direnv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.34.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/sysutils/docker-credential-pass/Makefile b/sysutils/docker-credential-pass/Makefile
index 6fc719bf2a53..12390701b0cb 100644
--- a/sysutils/docker-credential-pass/Makefile
+++ b/sysutils/docker-credential-pass/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docker-credential-pass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/sysutils/docker-machine/Makefile b/sysutils/docker-machine/Makefile
index 340f24703ce4..c64e3af5362f 100644
--- a/sysutils/docker-machine/Makefile
+++ b/sysutils/docker-machine/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		docker-machine
 PORTVERSION=		0.16.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=		sysutils
 
 MAINTAINER=		ports@FreeBSD.org
diff --git a/sysutils/docker-registry/Makefile b/sysutils/docker-registry/Makefile
index 19116f98e4a6..49fe0b0aa485 100644
--- a/sysutils/docker-registry/Makefile
+++ b/sysutils/docker-registry/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	docker-registry
 PORTVERSION=	2.7.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	freebsd@yapsoft.it
diff --git a/sysutils/docker/Makefile b/sysutils/docker/Makefile
index 712771cd3fbe..2d6804ec3381 100644
--- a/sysutils/docker/Makefile
+++ b/sysutils/docker/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		docker
 PORTVERSION=		18.09.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		sysutils
 
 MAINTAINER=		joneum@FreeBSD.org
diff --git a/sysutils/doctl/Makefile b/sysutils/doctl/Makefile
index a3e67c4caf5c..9b0c9993af11 100644
--- a/sysutils/doctl/Makefile
+++ b/sysutils/doctl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	doctl
 DISTVERSION=	1.99.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/digitalocean/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
diff --git a/sysutils/duf/Makefile b/sysutils/duf/Makefile
index ef24ecfa2cf8..53aecab2f04f 100644
--- a/sysutils/duf/Makefile
+++ b/sysutils/duf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	duf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile
index aad4bc75a690..8602b980c480 100644
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	envconsul
 PORTVERSION=	0.13.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/sysutils/epazote/Makefile b/sysutils/epazote/Makefile
index 6537d38ec107..0389f609d4e6 100644
--- a/sysutils/epazote/Makefile
+++ b/sysutils/epazote/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	epazote
 PORTVERSION=	2.1.2
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	nbari@tequila.io
diff --git a/sysutils/equinix-metal-cli/Makefile b/sysutils/equinix-metal-cli/Makefile
index 5e5584120bf3..04f2a5b5ca41 100644
--- a/sysutils/equinix-metal-cli/Makefile
+++ b/sysutils/equinix-metal-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	equinix-metal-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.22.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/sysutils/f2/Makefile b/sysutils/f2/Makefile
index 09dabcc886bb..4af86d9db0eb 100644
--- a/sysutils/f2/Makefile
+++ b/sysutils/f2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	f2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/fusefs-webdavfs/Makefile b/sysutils/fusefs-webdavfs/Makefile
index 2fae5c4ba4de..c4916d1615bc 100644
--- a/sysutils/fusefs-webdavfs/Makefile
+++ b/sysutils/fusefs-webdavfs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fusefs-webdavfs
 DISTVERSION=	g20200520
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
diff --git a/sysutils/fx/Makefile b/sysutils/fx/Makefile
index 6adaad65e254..6b109fd2566a 100644
--- a/sysutils/fx/Makefile
+++ b/sysutils/fx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fx
 DISTVERSION=	34.0.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/gcp-ops-agent/Makefile b/sysutils/gcp-ops-agent/Makefile
index 355ae63e08e2..56196a9b16bd 100644
--- a/sysutils/gcp-ops-agent/Makefile
+++ b/sysutils/gcp-ops-agent/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ops-agent
 DISTVERSION=	2.22.0
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	gcp-
 
diff --git a/sysutils/gdu/Makefile b/sysutils/gdu/Makefile
index ee8a193150f4..f7ac24801b06 100644
--- a/sysutils/gdu/Makefile
+++ b/sysutils/gdu/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gdu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.27.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/glow/Makefile b/sysutils/glow/Makefile
index e8b8f673c141..1aa74d782cb1 100644
--- a/sysutils/glow/Makefile
+++ b/sysutils/glow/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	glow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/go-wtf/Makefile b/sysutils/go-wtf/Makefile
index f0356974f122..d5108ead648e 100644
--- a/sysutils/go-wtf/Makefile
+++ b/sysutils/go-wtf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wtf
 PORTVERSION=	0.43.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	go-
 
diff --git a/sysutils/goawk/Makefile b/sysutils/goawk/Makefile
index dfc0984f94c1..68d70695e4db 100644
--- a/sysutils/goawk/Makefile
+++ b/sysutils/goawk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	goawk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.26.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/gomi/Makefile b/sysutils/gomi/Makefile
index 40857ad08c31..b64973a12df1 100644
--- a/sysutils/gomi/Makefile
+++ b/sysutils/gomi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gomi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.6
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/gomplate/Makefile b/sysutils/gomplate/Makefile
index ff16c8d31089..94f692f2f746 100644
--- a/sysutils/gomplate/Makefile
+++ b/sysutils/gomplate/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gomplate
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.11.7
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/gotop/Makefile b/sysutils/gotop/Makefile
index 17eb97a9929b..0f49a4880b86 100644
--- a/sysutils/gotop/Makefile
+++ b/sysutils/gotop/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gotop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.1.4
-PORTREVISION=	15
+PORTREVISION=	17
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/govmomi/Makefile b/sysutils/govmomi/Makefile
index 0a78fa314964..e8bd35e8d1c5 100644
--- a/sysutils/govmomi/Makefile
+++ b/sysutils/govmomi/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	govmomi
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.36.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	alex@i.org.ua
diff --git a/sysutils/hared/Makefile b/sysutils/hared/Makefile
index d29770147b10..b17a69e8582a 100644
--- a/sysutils/hared/Makefile
+++ b/sysutils/hared/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hared
 DISTVERSION=	1.0-45
 DISTVERSIONSUFFIX=	-g8341d8a
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/sysutils/hcloud/Makefile b/sysutils/hcloud/Makefile
index ec2b89db5d49..01a635fe44c1 100644
--- a/sysutils/hcloud/Makefile
+++ b/sysutils/hcloud/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hcloud
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.42.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	uzsolt@FreeBSD.org
diff --git a/sysutils/helmfile/Makefile b/sysutils/helmfile/Makefile
index 5f010d5aeb1f..003136f252fb 100644
--- a/sysutils/helmfile/Makefile
+++ b/sysutils/helmfile/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	helmfile
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.158.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	timp87@gmail.com
diff --git a/sysutils/hostctl/Makefile b/sysutils/hostctl/Makefile
index 0102fce50828..2c444df50f69 100644
--- a/sysutils/hostctl/Makefile
+++ b/sysutils/hostctl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hostctl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.4
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/immortal/Makefile b/sysutils/immortal/Makefile
index 6e5c3b65033a..1a0c7cbab996 100644
--- a/sysutils/immortal/Makefile
+++ b/sysutils/immortal/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	immortal
 PORTVERSION=	0.24.4
-PORTREVISION=	14
+PORTREVISION=	16
 CATEGORIES=	sysutils
 
 MAINTAINER=	nbari@tequila.io
diff --git a/sysutils/ipfs-go-fs-repo-migrations/Makefile b/sysutils/ipfs-go-fs-repo-migrations/Makefile
index c7af4d30bfd6..bd4f73c1e541 100644
--- a/sysutils/ipfs-go-fs-repo-migrations/Makefile
+++ b/sysutils/ipfs-go-fs-repo-migrations/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ipfs-go-fs-repo-migrations
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/ipfs/fs-repo-migrations/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
diff --git a/sysutils/ipget/Makefile b/sysutils/ipget/Makefile
index dd3f1a21e774..2714cbb3b759 100644
--- a/sysutils/ipget/Makefile
+++ b/sysutils/ipget/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ipget
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/ipmi_exporter/Makefile b/sysutils/ipmi_exporter/Makefile
index dbe519e3f02b..dae0441f33da 100644
--- a/sysutils/ipmi_exporter/Makefile
+++ b/sysutils/ipmi_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ipmi_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	meka@tilda.center
diff --git a/sysutils/istio/Makefile b/sysutils/istio/Makefile
index 14e51c22bc03..7016d084ea32 100644
--- a/sysutils/istio/Makefile
+++ b/sysutils/istio/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	istio
 PORTVERSION=	1.7.4
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/sysutils/jest/Makefile b/sysutils/jest/Makefile
index 7fa7fc8bb3b7..ba487b7975e5 100644
--- a/sysutils/jest/Makefile
+++ b/sysutils/jest/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jest
 DISTVERSION=	3.0.16
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/k9s/Makefile b/sysutils/k9s/Makefile
index a093c62da3dc..7894527b2f8d 100644
--- a/sysutils/k9s/Makefile
+++ b/sysutils/k9s/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	k9s
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.32.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	gogolok@gmail.com
diff --git a/sysutils/kapp/Makefile b/sysutils/kapp/Makefile
index 1b4ff8582756..396b54fca913 100644
--- a/sysutils/kapp/Makefile
+++ b/sysutils/kapp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kapp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.59.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	timp87@gmail.com
diff --git a/sysutils/kopia/Makefile b/sysutils/kopia/Makefile
index cdad8b65c73c..18a9f9f05251 100644
--- a/sysutils/kopia/Makefile
+++ b/sysutils/kopia/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kopia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/kops/Makefile b/sysutils/kops/Makefile
index 9fc107a6ab22..6b3bc0614500 100644
--- a/sysutils/kops/Makefile
+++ b/sysutils/kops/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kops
 PORTVERSION=	1.28.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile
index be5e53343905..2091904a29aa 100644
--- a/sysutils/loki/Makefile
+++ b/sysutils/loki/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	loki
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	grafana-
 
diff --git a/sysutils/mackerel-agent/Makefile b/sysutils/mackerel-agent/Makefile
index 4de3cce1cfee..631eeaac86b8 100644
--- a/sysutils/mackerel-agent/Makefile
+++ b/sysutils/mackerel-agent/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mackerel-agent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.78.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/sysutils/minikube/Makefile b/sysutils/minikube/Makefile
index ee7353bff5f0..487cefc10f9e 100644
--- a/sysutils/minikube/Makefile
+++ b/sysutils/minikube/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	minikube
 PORTVERSION=	1.32.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/sysutils/nerdctl/Makefile b/sysutils/nerdctl/Makefile
index 8df7f14ad966..0fb5d186a14a 100644
--- a/sysutils/nerdctl/Makefile
+++ b/sysutils/nerdctl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nerdctl
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.7.3
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/node_exporter/Makefile b/sysutils/node_exporter/Makefile
index 586890f9ff07..c247473ef3e5 100644
--- a/sysutils/node_exporter/Makefile
+++ b/sysutils/node_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	node_exporter
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.6.1
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	dor.bsd@xm0.uk
diff --git a/sysutils/nomad-pot-driver/Makefile b/sysutils/nomad-pot-driver/Makefile
index 26942e0a1649..2644d96b1d6e 100644
--- a/sysutils/nomad-pot-driver/Makefile
+++ b/sysutils/nomad-pot-driver/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nomad-pot-driver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	pizzamig@FreeBSD.org
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index 89b7464cd62b..f54d375e79c7 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.4
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/nomad/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
diff --git a/sysutils/nut_exporter/Makefile b/sysutils/nut_exporter/Makefile
index 6779581c671e..e4a5191e2caa 100644
--- a/sysutils/nut_exporter/Makefile
+++ b/sysutils/nut_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nut_exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.0.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	bsd@j-star.org
diff --git a/sysutils/oc/Makefile b/sysutils/oc/Makefile
index b666a66fa7f3..25c3359bf64a 100644
--- a/sysutils/oc/Makefile
+++ b/sysutils/oc/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	oc
 PORTVERSION=	4.9
 DISTVERSIONPREFIX=	release-
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@freebsd.org
diff --git a/sysutils/opa/Makefile b/sysutils/opa/Makefile
index eddc9b94a0b9..143297c8a93a 100644
--- a/sysutils/opa/Makefile
+++ b/sysutils/opa/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	opa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.41.0
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/opentofu/Makefile b/sysutils/opentofu/Makefile
index 6e3dc56843fd..3899d30c3f99 100644
--- a/sysutils/opentofu/Makefile
+++ b/sysutils/opentofu/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	opentofu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 65c71447b655..1fa7b9e4ea35 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	packer
 PORTVERSION=	1.10.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	brad@facefault.org
diff --git a/sysutils/paladin/Makefile b/sysutils/paladin/Makefile
index 720f10163ebf..bacae52f20fd 100644
--- a/sysutils/paladin/Makefile
+++ b/sysutils/paladin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	paladin
 PORTVERSION=	2.0.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	rwestlun@gmail.com
diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 66dae542cb57..965fe6b051ae 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	podman
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.8.3
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index e06151c93cdd..ac74f197c3d3 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	salt
-PORTVERSION=	3007.0
+PORTVERSION=	3006.8
+PORTEPOCH=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index 46f1e39327f5..a54901960074 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711901921
-SHA256 (salt-3007.0.tar.gz) = 41bf84e71fc655bf8a4b52eb440d0621ae961096a086d20e132e1512e2eddff8
-SIZE (salt-3007.0.tar.gz) = 20304228
+TIMESTAMP = 1714889549
+SHA256 (salt-3006.8.tar.gz) = 31629905c8d784bdb9786b6a3f77f9a87330bc56d7b68bebc9a19472d9efd866
+SIZE (salt-3006.8.tar.gz) = 19631806
diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt
index 39918449c502..bce755a71c50 100644
--- a/sysutils/py-salt/files/patch-requirements_base.txt
+++ b/sysutils/py-salt/files/patch-requirements_base.txt
@@ -1,10 +1,8 @@
---- requirements/base.txt.orig	2024-03-31 16:19:43 UTC
+--- requirements/base.txt.orig	2023-11-26 11:34:24 UTC
 +++ requirements/base.txt
-@@ -15,7 +15,6 @@ aiohttp>=3.9.0
- 
- # We need contextvars for salt-ssh.
- # Even on python versions which ships with contextvars in the standard library!
+@@ -8,5 +8,3 @@ looseversion
+ psutil>=5.0.0
+ packaging>=21.3
+ looseversion
+-# We need contextvars for salt-ssh
 -contextvars
- 
- setproctitle>=1.2.3
- timelib>=0.2.5
diff --git a/sysutils/qt5-qtdiag/distinfo b/sysutils/qt5-qtdiag/distinfo
index fa8018a31e16..aabf0c25bf1c 100644
--- a/sysutils/qt5-qtdiag/distinfo
+++ b/sysutils/qt5-qtdiag/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771157
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716930660
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/sysutils/qt5-qtpaths/distinfo b/sysutils/qt5-qtpaths/distinfo
index a9d52829b13b..1631f5c5776b 100644
--- a/sysutils/qt5-qtpaths/distinfo
+++ b/sysutils/qt5-qtpaths/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771158
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716930661
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/sysutils/qt5-qtplugininfo/distinfo b/sysutils/qt5-qtplugininfo/distinfo
index c802921ed5db..0751a4592739 100644
--- a/sysutils/qt5-qtplugininfo/distinfo
+++ b/sysutils/qt5-qtplugininfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771159
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716930662
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/sysutils/rest-server/Makefile b/sysutils/rest-server/Makefile
index 22893744c12b..24fd21245d71 100644
--- a/sysutils/rest-server/Makefile
+++ b/sysutils/rest-server/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rest-server
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.1
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile
index 7f2943fe547c..f0dc7e4348c6 100644
--- a/sysutils/restic/Makefile
+++ b/sysutils/restic/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	restic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.4
-PORTREVISION=	5
+DISTVERSION=	0.16.5
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/restic/distinfo b/sysutils/restic/distinfo
index ef9fd3f52ae5..5a3e9c34296d 100644
--- a/sysutils/restic/distinfo
+++ b/sysutils/restic/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1707122182
-SHA256 (go/sysutils_restic/restic-v0.16.4/v0.16.4.mod) = 1cbadb63f8c3e1b8d5d850dd569e68b0de45e74c06e293a0baa8140eaaefc372
-SIZE (go/sysutils_restic/restic-v0.16.4/v0.16.4.mod) = 3514
-SHA256 (go/sysutils_restic/restic-v0.16.4/v0.16.4.zip) = d87155460c87b4f14338bde24220e572e95f5ae9f8b0c4bd90a610f15b6198e0
-SIZE (go/sysutils_restic/restic-v0.16.4/v0.16.4.zip) = 24448953
+TIMESTAMP = 1719898526
+SHA256 (go/sysutils_restic/restic-v0.16.5/v0.16.5.mod) = 13e3085d886afe56076416f2c9803338176a6958501b6b4b68e2f2614823a2f8
+SIZE (go/sysutils_restic/restic-v0.16.5/v0.16.5.mod) = 3880
+SHA256 (go/sysutils_restic/restic-v0.16.5/v0.16.5.zip) = aa87e4419bb1f49e910b273f91ee3ecaa18f3f1ed791b56b7ced0818588e4ede
+SIZE (go/sysutils_restic/restic-v0.16.5/v0.16.5.zip) = 24450406
diff --git a/sysutils/runj/Makefile b/sysutils/runj/Makefile
index 76e815412a9d..6beae0099934 100644
--- a/sysutils/runj/Makefile
+++ b/sysutils/runj/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	runj
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/sysutils/rush/Makefile b/sysutils/rush/Makefile
index c14c4c5030cf..5f31de4fd96a 100644
--- a/sysutils/rush/Makefile
+++ b/sysutils/rush/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rush
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.4
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-parallelization-tool
 
diff --git a/sysutils/sake/Makefile b/sysutils/sake/Makefile
index 0c1c9ca25e0e..f4520bb33cce 100644
--- a/sysutils/sake/Makefile
+++ b/sysutils/sake/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sake
 PORTVERSION=	0.15.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/sysutils/sensu-go/Makefile b/sysutils/sensu-go/Makefile
index 66195af2b553..ff28be987778 100644
--- a/sysutils/sensu-go/Makefile
+++ b/sysutils/sensu-go/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		sensu-go
 PORTVERSION=		6.9.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=		sysutils
 
 MAINTAINER=		jp+ports@supplntr.io
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 59f4573a4ec2..5fe8a34711f3 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	serf
 PORTVERSION=	0.10.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	hashicorp-
 
diff --git a/sysutils/siegfried/Makefile b/sysutils/siegfried/Makefile
index c8c46f0ee914..8f8f7406ad4c 100644
--- a/sysutils/siegfried/Makefile
+++ b/sysutils/siegfried/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	siegfried
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.11.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/skopeo/Makefile b/sysutils/skopeo/Makefile
index 7a60e3e4f80e..5edffaac5302 100644
--- a/sysutils/skopeo/Makefile
+++ b/sysutils/skopeo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	skopeo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.14.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	sysutils
 
 MAINTAINER=	dfr@FreeBSD.org
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 625cc74f5b99..bc38536accdc 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -119,6 +119,8 @@ PROC2FIX=	common/callerid.c common/fd.c common/fetch_config.c	\
 LLD2FIX=	api plugins/openapi sacctmgr sackd scontrol scrontab scrun	\
 		slurmctld slurmd/slurmd squeue
 
+.include <bsd.port.options.mk>
+
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:
 	${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
@@ -143,8 +145,19 @@ pre-configure:
 		${ECHO_CMD} "********************************************"; \
 		false; \
 	fi
+.if ${ARCH} == powerpc64le
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64lppc -o|'
+.elif ${ARCH} == powerpc64
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m elf64ppc -o|'
+.elif ${ARCH} == aarch64
+	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|-r -o|-r -m aarch64elf -o|'
+.else
 	${FIND} ${LLD2FIX:C|^|${WRKSRC}/src/|} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|-r -o|-r -m elf_${ARCH} -o|'
+.endif
 	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|htmldir = \$${datadir.*$$|htmldir = @htmldir@|'
 
diff --git a/sysutils/smug/Makefile b/sysutils/smug/Makefile
index ed0b41180b00..96dddf29f8cb 100644
--- a/sysutils/smug/Makefile
+++ b/sysutils/smug/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	smug
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.3
-PORTREVISION=	8
+PORTREVISION=	10
 CATEGORIES=	sysutils
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile
index f2416ba19e1a..022f61b16e6b 100644
--- a/sysutils/snmp_exporter/Makefile
+++ b/sysutils/snmp_exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	snmp_exporter
 PORTVERSION=	0.20.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	fabian.freyer@physik.tu-berlin.de
diff --git a/sysutils/sockaddr/Makefile b/sysutils/sockaddr/Makefile
index ae5822d430b0..cf299f753d51 100644
--- a/sysutils/sockaddr/Makefile
+++ b/sysutils/sockaddr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sockaddr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.6
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/stressdisk/Makefile b/sysutils/stressdisk/Makefile
index 2df320d62b53..11c257e88a5a 100644
--- a/sysutils/stressdisk/Makefile
+++ b/sysutils/stressdisk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	stressdisk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.13
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/sysutils/terraform-docs/Makefile b/sysutils/terraform-docs/Makefile
index 91df78e99284..62fd8c1f4b2f 100644
--- a/sysutils/terraform-docs/Makefile
+++ b/sysutils/terraform-docs/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terraform-docs
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.0
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	sysutils textproc
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/terraform-provider-gridscale/Makefile b/sysutils/terraform-provider-gridscale/Makefile
index 37ff26d60cac..46d9e15df9e2 100644
--- a/sysutils/terraform-provider-gridscale/Makefile
+++ b/sysutils/terraform-provider-gridscale/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terraform-provider-gridscale
 PORTVERSION=	1.6.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	egypcio@FreeBSD.org
diff --git a/sysutils/terraform-provider-vultr/Makefile b/sysutils/terraform-provider-vultr/Makefile
index b4f0a879e794..deb613e9c226 100644
--- a/sysutils/terraform-provider-vultr/Makefile
+++ b/sysutils/terraform-provider-vultr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terraform-provider-vultr
 PORTVERSION=	0.1.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/terraform-switcher/Makefile b/sysutils/terraform-switcher/Makefile
index f53cd5ff3e81..874e0ebb3e39 100644
--- a/sysutils/terraform-switcher/Makefile
+++ b/sysutils/terraform-switcher/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	terraform-switcher
 DISTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 0b41b9fe0fb2..422596f1730c 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terraform
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.5
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/terragrunt/Makefile b/sysutils/terragrunt/Makefile
index d34f655e2aa6..dca5034922cc 100644
--- a/sysutils/terragrunt/Makefile
+++ b/sysutils/terragrunt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	terragrunt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.55.21
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/tflint/Makefile b/sysutils/tflint/Makefile
index 2fa3869e7e96..a1ec55f49ebb 100644
--- a/sysutils/tflint/Makefile
+++ b/sysutils/tflint/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tflint
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.50.3
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	dutra@FreeBSD.org
diff --git a/sysutils/viddy/Makefile b/sysutils/viddy/Makefile
index 3da236ecbd23..de9cd02af235 100644
--- a/sysutils/viddy/Makefile
+++ b/sysutils/viddy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	viddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.4
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 MASTER_SITES=
 
diff --git a/sysutils/walk/Makefile b/sysutils/walk/Makefile
index 00cdd4f5cffc..b6e0565e4325 100644
--- a/sysutils/walk/Makefile
+++ b/sysutils/walk/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	walk
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	sysutils
 
 MAINTAINER=	DtxdF@disroot.org
diff --git a/sysutils/zfs-snap-diff/Makefile b/sysutils/zfs-snap-diff/Makefile
index 28e6e44f0a55..52aac3a68e33 100644
--- a/sysutils/zfs-snap-diff/Makefile
+++ b/sysutils/zfs-snap-diff/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zfs-snap-diff
 PORTVERSION=	1.1.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile
index c7799e427ac9..d7dc6c881c5a 100644
--- a/sysutils/zrepl/Makefile
+++ b/sysutils/zrepl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zrepl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	sysutils
 
 MAINTAINER=	driesm@FreeBSD.org
diff --git a/textproc/codesearch/Makefile b/textproc/codesearch/Makefile
index 8c1c6d61df7e..684a65fb0bec 100644
--- a/textproc/codesearch/Makefile
+++ b/textproc/codesearch/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	codesearch
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	textproc
 
 MAINTAINER=	eborisch@gmail.com
diff --git a/textproc/csvq/Makefile b/textproc/csvq/Makefile
index 7fecba2ff6fa..e402246f9d9a 100644
--- a/textproc/csvq/Makefile
+++ b/textproc/csvq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	csvq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.18.1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/dasel/Makefile b/textproc/dasel/Makefile
index 422d3d0c4bac..e78f06ce29f0 100644
--- a/textproc/dasel/Makefile
+++ b/textproc/dasel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	dasel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile
index dc8f5cbbca28..0d0a159c0a50 100644
--- a/textproc/fzf/Makefile
+++ b/textproc/fzf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fzf
 DISTVERSION=	0.42.0
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	textproc
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=	go.mod:gomod
diff --git a/textproc/gh-grep/Makefile b/textproc/gh-grep/Makefile
index 4775ab4a64af..bafed76ca617 100644
--- a/textproc/gh-grep/Makefile
+++ b/textproc/gh-grep/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gh-grep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/git-chglog/Makefile b/textproc/git-chglog/Makefile
index ef73790efd7d..26dc3fd91f2e 100644
--- a/textproc/git-chglog/Makefile
+++ b/textproc/git-chglog/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	git-chglog
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.4
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 8a76f5ca0eeb..6ff29b029701 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-elasticsearch-indexer
 PORTVERSION=	4.8.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/textproc/go-md2man/Makefile b/textproc/go-md2man/Makefile
index 18b904bf4f13..5830ddaf1c88 100644
--- a/textproc/go-md2man/Makefile
+++ b/textproc/go-md2man/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	go-md2man
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.2
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	textproc
 
 MAINTAINER=	mateusz@serveraptor.com
diff --git a/textproc/go-transifex-client/Makefile b/textproc/go-transifex-client/Makefile
index d97d48f4ed22..7a2f1587726e 100644
--- a/textproc/go-transifex-client/Makefile
+++ b/textproc/go-transifex-client/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	transifex-client
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.10
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	textproc
 PKGNAMEPREFIX=	go-
 
diff --git a/textproc/go-yq/Makefile b/textproc/go-yq/Makefile
index c09ec5b96cc5..9ba95b05e554 100644
--- a/textproc/go-yq/Makefile
+++ b/textproc/go-yq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=		go-yq
 DISTVERSIONPREFIX=	v
 DISTVERSION=		4.35.2
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=		textproc
 
 MAINTAINER=	timp87@gmail.com
diff --git a/textproc/gojq/Makefile b/textproc/gojq/Makefile
index 824174725b7c..86dab391a425 100644
--- a/textproc/gojq/Makefile
+++ b/textproc/gojq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gojq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.14
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	nork@FreeBSD.org
diff --git a/textproc/gron/Makefile b/textproc/gron/Makefile
index 8e2ede598dad..64ddf5369502 100644
--- a/textproc/gron/Makefile
+++ b/textproc/gron/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gron
 PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	textproc
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/textproc/htmltest/Makefile b/textproc/htmltest/Makefile
index 0d441c7c203c..1c4058bb3868 100644
--- a/textproc/htmltest/Makefile
+++ b/textproc/htmltest/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	htmltest
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.17.0
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	textproc
 
 MAINTAINER=	dbaio@FreeBSD.org
diff --git a/textproc/jid/Makefile b/textproc/jid/Makefile
index 79f2e0b57974..addb3c88825d 100644
--- a/textproc/jid/Makefile
+++ b/textproc/jid/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jid
 PORTVERSION=	0.7.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	textproc
 
 MAINTAINER=	sbz@FreeBSD.org
diff --git a/textproc/kepubify/Makefile b/textproc/kepubify/Makefile
index 99ead3188fca..aedd4b335327 100644
--- a/textproc/kepubify/Makefile
+++ b/textproc/kepubify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kepubify
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.0.4
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	textproc converters
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/textproc/markdownfmt/Makefile b/textproc/markdownfmt/Makefile
index 0b4002aa788e..07e97d38ce25 100644
--- a/textproc/markdownfmt/Makefile
+++ b/textproc/markdownfmt/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	markdownfmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1-67
 DISTVERSIONSUFFIX=	-g3438a10
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	textproc
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/textproc/md2roff/Makefile b/textproc/md2roff/Makefile
index ee44054d17be..126f284889d0 100644
--- a/textproc/md2roff/Makefile
+++ b/textproc/md2roff/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	md2roff
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.14.3-0.20200416233007
 DISTVERSIONSUFFIX=	-c4dfa597b8d5
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	textproc print
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/textproc/mergestat/Makefile b/textproc/mergestat/Makefile
index c4d91dc95ced..08b5072931ff 100644
--- a/textproc/mergestat/Makefile
+++ b/textproc/mergestat/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mergestat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.4
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/minify/Makefile b/textproc/minify/Makefile
index 1a305e90ff77..69215c03e548 100644
--- a/textproc/minify/Makefile
+++ b/textproc/minify/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	minify
 PORTVERSION=	2.20.19
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc www
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/moar/Makefile b/textproc/moar/Makefile
index 7135a2cb9bce..0337eceeada2 100644
--- a/textproc/moar/Makefile
+++ b/textproc/moar/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	moar
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.23.4
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/ov/Makefile b/textproc/ov/Makefile
index 7f436b3f1b9e..b753afca2977 100644
--- a/textproc/ov/Makefile
+++ b/textproc/ov/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ov
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.15.0
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/peco/Makefile b/textproc/peco/Makefile
index 991a7e007fd5..8a972efce0d1 100644
--- a/textproc/peco/Makefile
+++ b/textproc/peco/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	peco
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.11
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	textproc
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/textproc/pup/Makefile b/textproc/pup/Makefile
index 5d5e2e502e81..0e2c1f97638a 100644
--- a/textproc/pup/Makefile
+++ b/textproc/pup/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	pup
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0-10
 DISTVERSIONSUFFIX=	-g681d7bb
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	textproc
 PATCH_SITES=	https://github.com/ericchiang/pup/pull/
 PATCHFILES=	107.patch:-p1 \
diff --git a/textproc/py-mkdocstrings/Makefile b/textproc/py-mkdocstrings/Makefile
index 80531d6c02d2..19bb0891bb8d 100644
--- a/textproc/py-mkdocstrings/Makefile
+++ b/textproc/py-mkdocstrings/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mkdocstrings
-DISTVERSION=	0.25.0
+DISTVERSION=	0.25.1
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -30,7 +30,8 @@ USE_PYTHON=	autoplist pep517 pytest
 # mkdocs-gen-files (not in Ports tree, yet).
 # The same applies to "test_plugin" which requires markdown-exec (not in Ports
 # tree yet).
-PYTEST_IGNORED_TESTS=	test_sphinx_load_mkdocstrings_inventory_file test_plugin
+# The test_no_double_toc tests, on the other hand, require py-markdown >= 3.6.
+PYTEST_IGNORED_TESTS=	test_sphinx_load_mkdocstrings_inventory_file test_plugin test_no_double_toc
 
 # Required otherwise the build process tries to get the current version via git
 MAKE_ENV=	PDM_BUILD_SCM_VERSION=${DISTVERSION}
diff --git a/textproc/py-mkdocstrings/distinfo b/textproc/py-mkdocstrings/distinfo
index de0d9c5968ac..5deff67d42e0 100644
--- a/textproc/py-mkdocstrings/distinfo
+++ b/textproc/py-mkdocstrings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714600326
-SHA256 (mkdocstrings-mkdocstrings-0.25.0_GH0.tar.gz) = 08a91d5991628aa74b90dc4faa8daced02d3b526ddf0c51babe5218ffd3d6444
-SIZE (mkdocstrings-mkdocstrings-0.25.0_GH0.tar.gz) = 89714
+TIMESTAMP = 1715019587
+SHA256 (mkdocstrings-mkdocstrings-0.25.1_GH0.tar.gz) = bc7499d5a9f91240c8eef61824ec1c8f1a99b969be0e4c4a499d94c3ab293db4
+SIZE (mkdocstrings-mkdocstrings-0.25.1_GH0.tar.gz) = 89869
diff --git a/textproc/qt5-xml/distinfo b/textproc/qt5-xml/distinfo
index 975f9cc8dc61..fe264cf087a6 100644
--- a/textproc/qt5-xml/distinfo
+++ b/textproc/qt5-xml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771160
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716930663
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/textproc/qt5-xmlpatterns/distinfo b/textproc/qt5-xmlpatterns/distinfo
index e14991b6fce3..ced9751db0e8 100644
--- a/textproc/qt5-xmlpatterns/distinfo
+++ b/textproc/qt5-xmlpatterns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771161
-SHA256 (KDE/Qt/5.15.13/kde-qtxmlpatterns-5.15.13p0.tar.xz) = 1f8443a8ab491f13a4f25a3681d95cced775e6ba661ddf73ec9a72d6a679596d
-SIZE (KDE/Qt/5.15.13/kde-qtxmlpatterns-5.15.13p0.tar.xz) = 5097184
+TIMESTAMP = 1716930664
+SHA256 (KDE/Qt/5.15.14/kde-qtxmlpatterns-5.15.14p0.tar.xz) = 46fc87ec3cc30d2e6af887489cbb3f8e3a7fb24551ae533c4d91817c7c52fde2
+SIZE (KDE/Qt/5.15.14/kde-qtxmlpatterns-5.15.14p0.tar.xz) = 5099928
diff --git a/textproc/rubygem-actiontext61/Makefile b/textproc/rubygem-actiontext61/Makefile
index 561ad47fc4c5..28a8a50d0286 100644
--- a/textproc/rubygem-actiontext61/Makefile
+++ b/textproc/rubygem-actiontext61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actiontext
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/textproc/rubygem-actiontext61/distinfo b/textproc/rubygem-actiontext61/distinfo
index 6a698129ab64..d549d92e331f 100644
--- a/textproc/rubygem-actiontext61/distinfo
+++ b/textproc/rubygem-actiontext61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391010
-SHA256 (rubygem/actiontext-6.1.7.7.gem) = ee59f52dc5701cd4a05ff67a830cae968a633fc7e150de9a3a2e607cd5365542
-SIZE (rubygem/actiontext-6.1.7.7.gem) = 19456
+TIMESTAMP = 1717568536
+SHA256 (rubygem/actiontext-6.1.7.8.gem) = 7daee85e5740b3a59cca5891dd5f936b6b4f2e4a2d3f5d32946b76f02c4822ce
+SIZE (rubygem/actiontext-6.1.7.8.gem) = 19456
diff --git a/textproc/rubygem-actiontext70/Makefile b/textproc/rubygem-actiontext70/Makefile
index 9c971ce0bf1e..69b77c68949a 100644
--- a/textproc/rubygem-actiontext70/Makefile
+++ b/textproc/rubygem-actiontext70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actiontext
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/textproc/rubygem-actiontext70/distinfo b/textproc/rubygem-actiontext70/distinfo
index 33750bd28cbd..28264f483ec1 100644
--- a/textproc/rubygem-actiontext70/distinfo
+++ b/textproc/rubygem-actiontext70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391036
-SHA256 (rubygem/actiontext-7.0.8.1.gem) = 42e4cd0e7e8f98a8ed96d04b1d6ab83bb69afc4ceb0a46f5c18ef60fff889810
-SIZE (rubygem/actiontext-7.0.8.1.gem) = 92160
+TIMESTAMP = 1717568562
+SHA256 (rubygem/actiontext-7.0.8.4.gem) = 1ed8fb8cebdcc34fcaecf3b1404d48b2ea69fef9ae3f91ca4b9b672f6778a4bc
+SIZE (rubygem/actiontext-7.0.8.4.gem) = 83456
diff --git a/textproc/rubygem-actiontext71/Makefile b/textproc/rubygem-actiontext71/Makefile
index 97d9696f5fda..07744095a7bf 100644
--- a/textproc/rubygem-actiontext71/Makefile
+++ b/textproc/rubygem-actiontext71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actiontext
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/textproc/rubygem-actiontext71/distinfo b/textproc/rubygem-actiontext71/distinfo
index 452c935b11c0..4929b1c83266 100644
--- a/textproc/rubygem-actiontext71/distinfo
+++ b/textproc/rubygem-actiontext71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391062
-SHA256 (rubygem/actiontext-7.1.3.2.gem) = ece807199490521c8d7c8048899fdd110951073c04bf38883b6d3193bcd3c52a
-SIZE (rubygem/actiontext-7.1.3.2.gem) = 117248
+TIMESTAMP = 1717568588
+SHA256 (rubygem/actiontext-7.1.3.4.gem) = 84964dae95a3c99819d42641084f21e28de502fcefa6efb9df3805d6c439b784
+SIZE (rubygem/actiontext-7.1.3.4.gem) = 118272
diff --git a/textproc/sift/Makefile b/textproc/sift/Makefile
index 19be5175ebe7..ee533c70ec0c 100644
--- a/textproc/sift/Makefile
+++ b/textproc/sift/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sift
 PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	40
+PORTREVISION=	42
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
diff --git a/textproc/termshot/Makefile b/textproc/termshot/Makefile
index d2e8fa46c1ec..6925639dc207 100644
--- a/textproc/termshot/Makefile
+++ b/textproc/termshot/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	termshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.7
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	textproc graphics
 
 MAINTAINER=	lbartoletti@FreeBSD.org
diff --git a/textproc/textnote/Makefile b/textproc/textnote/Makefile
index 3a43513e8f3c..fa764923d790 100644
--- a/textproc/textnote/Makefile
+++ b/textproc/textnote/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	textnote
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	textproc
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/textproc/textql/Makefile b/textproc/textql/Makefile
index e74e8e34b5a2..b999bc8bb9b9 100644
--- a/textproc/textql/Makefile
+++ b/textproc/textql/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	textql
 PORTVERSION=	g20210706
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	textproc
 
 MAINTAINER=	ume@FreeBSD.org
diff --git a/textproc/trdsql/Makefile b/textproc/trdsql/Makefile
index 16ec50f0a088..08bb1eb089a8 100644
--- a/textproc/trdsql/Makefile
+++ b/textproc/trdsql/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	trdsql
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.13.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/uni/Makefile b/textproc/uni/Makefile
index ffb71b81b0b7..29b0492c11c9 100644
--- a/textproc/uni/Makefile
+++ b/textproc/uni/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	uni
 PORTVERSION=	2.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/textproc/up/Makefile b/textproc/up/Makefile
index f24761c8980d..e3832af847a4 100644
--- a/textproc/up/Makefile
+++ b/textproc/up/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	up
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	textproc
 
 MAINTAINER=	0mp@FreeBSD.org
diff --git a/textproc/vacuum/Makefile b/textproc/vacuum/Makefile
index d52fee0b17b7..cc7205df2ec0 100644
--- a/textproc/vacuum/Makefile
+++ b/textproc/vacuum/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vacuum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	textproc
 PKGNAMESUFFIX=	-lint-tool
 
diff --git a/textproc/vale/Makefile b/textproc/vale/Makefile
index b9a4b3561705..9674a9f5355e 100644
--- a/textproc/vale/Makefile
+++ b/textproc/vale/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vale
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.30.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/textproc/vgrep/Makefile b/textproc/vgrep/Makefile
index 969941a1cc32..bcba6a4395a2 100644
--- a/textproc/vgrep/Makefile
+++ b/textproc/vgrep/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vgrep
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	textproc
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/textproc/yamlfmt/Makefile b/textproc/yamlfmt/Makefile
index 5b2499524468..f4378f9450f3 100644
--- a/textproc/yamlfmt/Makefile
+++ b/textproc/yamlfmt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yamlfmt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/textproc/ytt/Makefile b/textproc/ytt/Makefile
index 1050cd7c6cd3..aa0be110eea1 100644
--- a/textproc/ytt/Makefile
+++ b/textproc/ytt/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ytt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.47.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/zed/Makefile b/textproc/zed/Makefile
index fa74876a9249..95a53c8ad596 100644
--- a/textproc/zed/Makefile
+++ b/textproc/zed/Makefile
@@ -1,7 +1,7 @@
 PORTNAME?=	zed
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.14.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc
 
 MAINTAINER=	meta@FreeBSD.org
diff --git a/textproc/zq/Makefile b/textproc/zq/Makefile
index 3087b2d6375c..c4d80ab59ee4 100644
--- a/textproc/zq/Makefile
+++ b/textproc/zq/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	zq
-PORTREVISION=	1
+PORTREVISION=	3
 
 COMMENT=	Easier and faster alternative to jq
 
diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile
index 89d8bd24529e..09ccd89e9038 100644
--- a/www/adguardhome/Makefile
+++ b/www/adguardhome/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	adguardhome
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.107.45
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/amfora/Makefile b/www/amfora/Makefile
index 1146f02db656..ef4f7cd669ad 100644
--- a/www/amfora/Makefile
+++ b/www/amfora/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	amfora
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/www/aquatone/Makefile b/www/aquatone/Makefile
index 17fe8b2f643b..6cb28ac39180 100644
--- a/www/aquatone/Makefile
+++ b/www/aquatone/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aquatone
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www security
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/authelia/Makefile b/www/authelia/Makefile
index 16d535030a9b..571d5ed6516e 100644
--- a/www/authelia/Makefile
+++ b/www/authelia/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	authelia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.38.5
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/authelia/authelia/releases/download/v${DISTVERSION}/:public_html
 DISTFILES=	authelia-${DISTVERSIONFULL}-public_html${EXTRACT_SUFX}:public_html # html root directory needs to be built in a special way
diff --git a/www/beehive/Makefile b/www/beehive/Makefile
index bb042d6174e9..9a9bc679458b 100644
--- a/www/beehive/Makefile
+++ b/www/beehive/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	beehive
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.0
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/www/bugzilla2atom/Makefile b/www/bugzilla2atom/Makefile
index 1346f1aa06ed..802fc2a0c405 100644
--- a/www/bugzilla2atom/Makefile
+++ b/www/bugzilla2atom/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bugzilla2atom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${MODVERSION:S/-/./g:R}
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	www
 
 MAINTAINER=	fuz@FreeBSD.org
diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile
index 59954858225a..59e1170f2475 100644
--- a/www/caddy-custom/Makefile
+++ b/www/caddy-custom/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	caddy-custom
 PORTVERSION=	${CADDY_VERSION}.${XCADDY_VERSION}
-PORTREVISION=	16
+PORTREVISION=	18
 CATEGORIES=	www
 DISTFILES=	# none
 
diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 4f5556675c3b..76dd6fe11a11 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.7.6
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www
 DIST_SUBDIR=	caddy
 
diff --git a/www/carbonapi/Makefile b/www/carbonapi/Makefile
index 9f35701c101e..6cfe7e06660c 100644
--- a/www/carbonapi/Makefile
+++ b/www/carbonapi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	carbonapi
 DISTVERSION=	0.14.1
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	a.andersson.thn@gmail.com
diff --git a/www/chisel/Makefile b/www/chisel/Makefile
index 4c7a842a82d3..f6d589952d1d 100644
--- a/www/chisel/Makefile
+++ b/www/chisel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	chisel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.9.1
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 9a2a287d8e19..ef0fed481be6 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,10 +1,14 @@
 PORTNAME=	chromium
-PORTVERSION=	124.0.6367.118
+PORTVERSION=	126.0.6478.126
+PULSEMV=	16
+PULSEV=		${PULSEMV}.1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
-		https://nerd.hu/distfiles/:external
+		https://nerd.hu/distfiles/:external \
+		https://freedesktop.org/software/pulseaudio/releases/:pulseaudio
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external
+		chrome-linux-${PORTVERSION}-llvm17.profdata${EXTRACT_SUFX}:external \
+		pulseaudio-${PULSEV}.tar.gz:pulseaudio
 
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Google web browser based on WebKit
@@ -34,8 +38,10 @@ BUILD_DEPENDS=	bash:shells/bash \
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-core \
 		libatspi.so:accessibility/at-spi2-core \
 		libspeechd.so:accessibility/speech-dispatcher \
+		libasound.so:audio/alsa-lib \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
+		libsndio.so:audio/sndio \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
@@ -122,10 +128,15 @@ GN_ARGS+=	clang_use_chrome_plugins=false \
 		use_system_libffi=true \
 		use_system_libjpeg=true \
 		use_udev=false \
-		extra_cxxflags="${CXXFLAGS}" \
+		extra_cxxflags="${CXXFLAGS} -I${WRKDIR}/pulseaudio-${PULSEV}/src -DPA_MAJOR=${PULSEMV}" \
 		extra_ldflags="${LDFLAGS}" \
 		ffmpeg_branding="${FFMPEG_BRAND}"
 
+# Audio backends
+GN_ARGS+=	use_alsa=true \
+		use_pulseaudio=true \
+		use_sndio=true
+
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
@@ -140,10 +151,8 @@ SUB_FILES=	chromium-browser.desktop chrome
 SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=		CODECS CUPS DEBUG DRIVER KERBEROS LTO PIPEWIRE TEST WIDEVINE
-OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO
+OPTIONS_DEFAULT=	CODECS CUPS DRIVER KERBEROS PIPEWIRE
 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
@@ -153,12 +162,6 @@ HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 HEIMDAL_DESC=		Heimdal Kerberos (security/heimdal)
 MIT_DESC=		MIT Kerberos (security/krb5)
 
-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 \
@@ -202,18 +205,6 @@ PIPEWIRE_VARS=		GN_ARGS+=rtc_use_pipewire=true \
 PIPEWIRE_VARS_OFF=	GN_ARGS+=rtc_use_pipewire=false \
 			GN_ARGS+=rtc_link_pipewire=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
-
 WIDEVINE_DESC=		Depend on foreign-cdm to enable playback of DRM content
 WIDEVINE_RUN_DEPENDS=	foreign-cdm>0:www/foreign-cdm
 
@@ -229,8 +220,8 @@ TEST_ALL_TARGET=	${TEST_TARGETS}
 IGNORE=		you have selected HEIMDAL_BASE but do not have Heimdal installed in base
 .endif
 
-.if ${COMPILER_VERSION} < 170
-LLVM_DEFAULT=		17
+.if ${COMPILER_VERSION} < 180
+LLVM_DEFAULT=		18
 BUILD_DEPENDS+=		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 BINARY_ALIAS+=		cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
 			cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -258,7 +249,7 @@ PLIST_SUB+=	NOT_AARCH64=""
 FFMPEG_TARGET=	ia32
 .endif
 
-FFMPEG_BDIR=	${WRKSRC}/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+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)
@@ -296,14 +287,15 @@ pre-configure:
 		dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
 		libusb libwebp libxml libxslt openh264 opus || ${FALSE}
 	# Chromium uses an unreleased version of FFmpeg, so configure it
-	cd ${WRKSRC}/third_party/ffmpeg && \
-		${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+	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 ${WRKDIR}/pulseaudio-${PULSEV}/src/pulse/version.h
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 249c42923349..f8f63c1c2c2b 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1714547240
-SHA256 (chromium-124.0.6367.118.tar.xz) = 8aa5a14aad1234b48b568da9ef23d6e0b1b72d7f4ca5c4039462e54e6ad45d96
-SIZE (chromium-124.0.6367.118.tar.xz) = 3444501448
-SHA256 (chrome-linux-124.0.6367.118-llvm17.profdata.tar.xz) = c31572a6cba6268c1938e2c6ea35e567ea8809370f59504fcccb4e67a8dbe24b
-SIZE (chrome-linux-124.0.6367.118-llvm17.profdata.tar.xz) = 30065808
-SHA256 (chromium-124.0.6367.118-testdata.tar.xz) = 81bef611eddfa954dc9ef1772eef72a053d8ae07ed0d57883889c00ca342bf34
-SIZE (chromium-124.0.6367.118-testdata.tar.xz) = 279593964
+TIMESTAMP = 1719308067
+SHA256 (chromium-126.0.6478.126.tar.xz) = 5d5206637e659f03e006cd8b6b269c49c0c2c697d10517e14dbcea851831e143
+SIZE (chromium-126.0.6478.126.tar.xz) = 4166142564
+SHA256 (chrome-linux-126.0.6478.126-llvm17.profdata.tar.xz) = daa5caa2a8dd8790c46c35cd37ed7ada57ceb6e9533bccc225c64d45a60d4422
+SIZE (chrome-linux-126.0.6478.126-llvm17.profdata.tar.xz) = 30502872
+SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
+SIZE (pulseaudio-16.1.tar.gz) = 2763111
+SHA256 (chromium-126.0.6478.126-testdata.tar.xz) = a25a71bff83a0185dabef2237ad09cfaf367f023a2b650f7dafc79c794cc6bd7
+SIZE (chromium-126.0.6478.126-testdata.tar.xz) = 281163232
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index e599afc55ff6..6df3122a0e71 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ BUILD.gn
-@@ -64,7 +64,7 @@ declare_args() {
+@@ -65,7 +65,7 @@ declare_args() {
    root_extra_deps = []
  }
  
@@ -9,7 +9,7 @@
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -96,7 +96,6 @@ group("gn_all") {
+@@ -97,7 +97,6 @@ group("gn_all") {
        "//codelabs",
        "//components:components_unittests",
        "//components/gwp_asan:gwp_asan_unittests",
@@ -17,7 +17,7 @@
        "//net:net_unittests",
        "//sandbox:sandbox_unittests",
        "//services:services_unittests",
-@@ -427,7 +426,7 @@ group("gn_all") {
+@@ -428,7 +427,7 @@ group("gn_all") {
        }
      }
  
@@ -26,7 +26,7 @@
        deps += [
          "//third_party/breakpad:breakpad_unittests",
          "//third_party/breakpad:core-2-minidump",
-@@ -627,6 +626,15 @@ group("gn_all") {
+@@ -624,6 +623,15 @@ group("gn_all") {
        }
      }
  
@@ -42,7 +42,7 @@
      if (is_mac) {
        deps += [
          "//third_party/breakpad:dump_syms",
-@@ -673,7 +681,7 @@ group("gn_all") {
+@@ -670,7 +678,7 @@ group("gn_all") {
            host_os == "win") {
          deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
        }
@@ -51,7 +51,7 @@
        deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
  
-@@ -1094,7 +1102,7 @@ if (use_blink && !is_cronet_build) {
+@@ -1090,7 +1098,7 @@ if (use_blink && !is_cronet_build) {
      ]
    }
  
diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
index d675abdb9186..6683ac0c2578 100644
--- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,8 +1,8 @@
---- apps/ui/views/app_window_frame_view.cc.orig	2024-01-30 07:53:34 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ apps/ui/views/app_window_frame_view.cc
 @@ -148,7 +148,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
    gfx::Rect window_bounds = client_bounds;
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 111ebfe4e412..73cfec037691 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,4 +1,4 @@
---- base/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- base/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ base/BUILD.gn
 @@ -200,7 +200,7 @@ buildflag_header("ios_cronet_buildflags") {
    flags = [ "CRONET_BUILD=$is_cronet_build" ]
@@ -9,7 +9,7 @@
  buildflag_header("message_pump_buildflags") {
    header = "message_pump_buildflags.h"
    header_dir = "base/message_loop"
-@@ -1131,11 +1131,23 @@ component("base") {
+@@ -1142,11 +1142,23 @@ component("base") {
    # Needed for <atomic> if using newer C++ library than sysroot, except if
    # building inside the cros_sdk environment - use host_toolchain as a
    # more robust check for this.
@@ -34,7 +34,7 @@
    if (use_allocator_shim) {
      if (is_apple) {
        sources += [ "allocator/early_zone_registration_apple.h" ]
-@@ -1155,7 +1167,7 @@ component("base") {
+@@ -1166,7 +1178,7 @@ component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -43,7 +43,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2113,6 +2125,22 @@ component("base") {
+@@ -2126,6 +2138,22 @@ component("base") {
      ]
    }
  
@@ -66,7 +66,7 @@
    # iOS
    if (is_ios) {
      sources += [
-@@ -2249,6 +2277,33 @@ component("base") {
+@@ -2271,6 +2299,33 @@ component("base") {
      }
    }
  
@@ -100,7 +100,7 @@
    if (use_blink) {
      sources += [
        "files/file_path_watcher.cc",
-@@ -2259,7 +2314,7 @@ component("base") {
+@@ -2281,7 +2336,7 @@ component("base") {
    }
  
    if (dep_libevent) {
@@ -109,7 +109,7 @@
    }
  
    if (use_libevent) {
-@@ -3072,7 +3127,7 @@ if (is_apple) {
+@@ -3094,7 +3149,7 @@ if (is_apple) {
    }
  }
  
@@ -118,7 +118,7 @@
    # This test must compile with -fstack-protector-all
    source_set("stack_canary_linux_unittests") {
      testonly = true
-@@ -3716,7 +3771,7 @@ test("base_unittests") {
+@@ -3743,7 +3798,7 @@ test("base_unittests") {
      ]
    }
  
@@ -127,7 +127,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3743,7 +3798,7 @@ test("base_unittests") {
+@@ -3770,7 +3825,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -136,7 +136,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3754,7 +3809,7 @@ test("base_unittests") {
+@@ -3781,7 +3836,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -145,7 +145,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -4022,7 +4077,7 @@ test("base_unittests") {
+@@ -4049,7 +4104,7 @@ test("base_unittests") {
      }
    }
  
diff --git a/www/chromium/files/patch-base_allocator_dispatcher_tls.h b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
index 4846c23803fd..895ef040f733 100644
--- a/www/chromium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/chromium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/dispatcher/tls.h.orig	2024-05-21 18:07:39 UTC
 +++ base/allocator/dispatcher/tls.h
-@@ -76,7 +76,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -77,7 +77,7 @@ struct BASE_EXPORT MMapAllocator {
    constexpr static size_t AllocationChunkSize = 16384;
  #elif BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)
    constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index d9e57c421e1a..48db51a06ad6 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig	2024-06-17 12:56:06 UTC
 +++ base/allocator/partition_allocator/partition_alloc.gni
 @@ -33,7 +33,7 @@ if (is_nacl) {
  use_large_empty_slot_span_ring = is_mac
@@ -9,7 +9,7 @@
  
  declare_args() {
    # Causes all the allocations to be routed via allocator_shim.cc. Usually,
-@@ -351,7 +351,7 @@ declare_args() {
+@@ -373,7 +373,7 @@ declare_args() {
    # dependencies that use partition_allocator are compiled in AOSP against a
    # version of glibc that does not include pkeys syscall numbers.
    enable_pkeys =
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
index 6c1f761e5029..8826075eedc3 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_BUILD.gn
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/BUILD.gn
-@@ -851,7 +851,7 @@ if (is_clang_or_gcc) {
+@@ -884,7 +884,7 @@ if (is_clang_or_gcc) {
          configs -= [ "//build/config/compiler:enable_arc" ]
        }
      }
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
index 76b0580b3f89..2c2562fa05d4 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h.orig	2024-05-21 18:07:39 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
  
@@ -9,12 +9,12 @@
  
      // We shouldn't allocate system pages at all for sanitizer builds. However,
      // we do, and if random hint addresses interfere with address ranges
-@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
+@@ -125,7 +125,7 @@ AslrMask(uintptr_t bits) {
          return AslrAddress(0x20000000ULL);
        }
- 
--      #elif BUILDFLAG(IS_LINUX)
-+      #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     #elif defined(ARCH_CPU_ARM64)
+-      #if BUILDFLAG(IS_LINUX)
++      #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  
        // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
        // page size and number of levels of translation pages used. We use
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
index 0bdfb80dfa47..18f8d7b14143 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h.orig	2024-06-17 12:56:06 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_config.h
-@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -232,7 +232,7 @@ constexpr bool kUseLazyCommit = false;
  // On these platforms, lock all the partitions before fork(), and unlock after.
  // This may be required on more platforms in the future.
  #define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -9,7 +9,7 @@
  
  // PartitionAlloc uses PartitionRootEnumerator to acquire all
  // PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -299,7 +299,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
  //
  // Also enabled on ARM64 macOS and iOS, as the 16kiB pages on this platform lead
  // to larger slot spans.
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
index 5214c122b0c5..ad2ec7e02089 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__alloc__constants.h
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h.orig	2024-06-17 12:56:06 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_alloc_constants.h
-@@ -313,7 +313,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
+@@ -316,7 +316,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
  // 8GB for each of the glued pools).
- #if BUILDFLAG(HAS_64_BIT_POINTERS)
+ #if PA_BUILDFLAG(HAS_64_BIT_POINTERS)
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
--    BUILDFLAG(ENABLE_POINTER_COMPRESSION)
-+    BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
+-    PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)
++    PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
  constexpr size_t kPoolMaxSize = 8 * kGiB;
  #else
  constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
index d5d4496bfa86..2ada1677d2fc 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_partition__root.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2024-04-19 13:02:56 UTC
+--- base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
  #include "wow64apiset.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #endif
  
-@@ -279,7 +279,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -280,7 +280,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
  
@@ -18,7 +18,7 @@
    // When fork() is called, only the current thread continues to execute in the
    // child process. If the lock is held, but *not* by this thread when fork() is
    // called, we have a deadlock.
-@@ -950,7 +950,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
+@@ -957,7 +957,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
index 55e38ef752fd..076da69d662f 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_starscan_stack_stack.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_src_partition__alloc_stack_stack.cc
@@ -1,5 +1,5 @@
---- base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc.orig	2023-12-10 06:10:27 UTC
-+++ base/allocator/partition_allocator/src/partition_alloc/starscan/stack/stack.cc
+--- base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc.orig	2024-05-21 18:07:39 UTC
++++ base/allocator/partition_allocator/src/partition_alloc/stack/stack.cc
 @@ -18,6 +18,10 @@
  #include <pthread.h>
  #endif
diff --git a/www/chromium/files/patch-base_base__paths__posix.cc b/www/chromium/files/patch-base_base__paths__posix.cc
index c343f2e93b3c..620bf1a97682 100644
--- a/www/chromium/files/patch-base_base__paths__posix.cc
+++ b/www/chromium/files/patch-base_base__paths__posix.cc
@@ -1,4 +1,4 @@
---- base/base_paths_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/base_paths_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/base_paths_posix.cc
 @@ -15,6 +15,7 @@
  #include <ostream>
@@ -23,7 +23,7 @@
  #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
  #include <stdlib.h>
  #endif
-@@ -48,8 +53,7 @@ bool PathProviderPosix(int key, FilePath* result) {
+@@ -49,8 +54,7 @@ bool PathProviderPosix(int key, FilePath* result) {
        *result = bin_dir;
        return true;
  #elif BUILDFLAG(IS_FREEBSD)
@@ -31,9 +31,9 @@
 -      std::optional<std::string> bin_dir = StringSysctl(name, std::size(name));
 +      std::optional<std::string> bin_dir = StringSysctl({ CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 });
        if (!bin_dir.has_value() || bin_dir.value().length() <= 1) {
-         NOTREACHED() << "Unable to resolve path.";
+         NOTREACHED_IN_MIGRATION() << "Unable to resolve path.";
          return false;
-@@ -65,13 +69,65 @@ bool PathProviderPosix(int key, FilePath* result) {
+@@ -67,13 +71,65 @@ bool PathProviderPosix(int key, FilePath* result) {
        *result = FilePath(bin_dir);
        return true;
  #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc
index 58341a527cf1..52e4fa4116e8 100644
--- a/www/chromium/files/patch-base_debug_debugger__posix.cc
+++ b/www/chromium/files/patch-base_debug_debugger__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/debugger_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/debug/debugger_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/debug/debugger_posix.cc
-@@ -36,6 +36,10 @@
+@@ -41,6 +41,10 @@
  #include <sys/sysctl.h>
  #endif
  
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_FREEBSD)
  #include <sys/user.h>
  #endif
-@@ -95,32 +99,51 @@ bool BeingDebugged() {
+@@ -100,32 +104,51 @@ bool BeingDebugged() {
  
    // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE.  The source and
    // binary interfaces may change.
diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc
index b585334b9528..1aee86e0554b 100644
--- a/www/chromium/files/patch-base_debug_elf__reader.cc
+++ b/www/chromium/files/patch-base_debug_elf__reader.cc
@@ -1,6 +1,6 @@
---- base/debug/elf_reader.cc.orig	2024-04-19 13:02:56 UTC
+--- base/debug/elf_reader.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/debug/elf_reader.cc
-@@ -45,6 +45,10 @@ using Xword = Elf64_Xword;
+@@ -50,6 +50,10 @@ using Xword = Elf64_Xword;
  
  constexpr char kGnuNoteName[] = "GNU";
  
diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc
index 4ed7cb701ed6..1b2a3aa07e39 100644
--- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc
+++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc
@@ -1,6 +1,6 @@
---- base/debug/proc_maps_linux.cc.orig	2022-02-28 16:54:41 UTC
+--- base/debug/proc_maps_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/debug/proc_maps_linux.cc
-@@ -13,7 +13,7 @@
+@@ -18,7 +18,7 @@
  #include "base/strings/string_split.h"
  #include "build/build_config.h"
  
diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc
index 729c3ad3e29a..2baef4126059 100644
--- a/www/chromium/files/patch-base_debug_stack__trace.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace.cc
@@ -1,6 +1,6 @@
---- base/debug/stack_trace.cc.orig	2024-04-19 13:02:56 UTC
+--- base/debug/stack_trace.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/debug/stack_trace.cc
-@@ -247,7 +247,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
+@@ -254,7 +254,7 @@ bool StackTrace::WillSymbolizeToStreamForTesting() {
    // Symbols are not expected to be reliable when gn args specifies
    // symbol_level=0.
    return false;
@@ -9,16 +9,16 @@
    // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
    // See https://crbug.com/706728
    return false;
-@@ -291,7 +291,7 @@ std::string StackTrace::ToString() const {
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+@@ -316,7 +316,7 @@ std::string StackTrace::ToString() const {
+ 
+ std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
    std::stringstream stream;
 -#if !defined(__UCLIBC__) && !defined(_AIX)
 +#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
-   if (ShouldSuppressOutput()) {
-     return "Backtrace suppressed.";
-   }
-@@ -301,7 +301,7 @@ std::string StackTrace::ToStringWithPrefix(const char*
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+@@ -340,7 +340,7 @@ bool StackTrace::ShouldSuppressOutput() {
  }
  
  std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index 7707da34bdff..7bd5a05630c1 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,6 +1,6 @@
---- base/debug/stack_trace_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/debug/stack_trace_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/debug/stack_trace_posix.cc
-@@ -41,7 +41,7 @@
+@@ -46,7 +46,7 @@
  // execinfo.h and backtrace(3) are really only present in glibc and in macOS
  // libc.
  #if BUILDFLAG(IS_APPLE) || \
@@ -9,7 +9,7 @@
  #define HAVE_BACKTRACE
  #include <execinfo.h>
  #endif
-@@ -59,8 +59,10 @@
+@@ -64,8 +64,10 @@
  #include <AvailabilityMacros.h>
  #endif
  
@@ -21,7 +21,7 @@
  
  #include "base/debug/proc_maps_linux.h"
  #endif
-@@ -301,7 +303,7 @@ void PrintToStderr(const char* output) {
+@@ -306,7 +308,7 @@ void PrintToStderr(const char* output) {
    std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
  }
  
@@ -30,7 +30,7 @@
  void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
    // We have seen rare cases on AMD linux where the default signal handler
    // either does not run or a thread (Probably an AMD driver thread) prevents
-@@ -318,7 +320,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
+@@ -323,7 +325,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
        "Warning: Default signal handler failed to terminate process.\n");
    PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
    // See: https://man7.org/linux/man-pages/man2/exit_group.2.html
@@ -42,7 +42,7 @@
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -535,7 +541,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -540,7 +546,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
      _exit(EXIT_FAILURE);
    }
  
@@ -51,7 +51,7 @@
    // Set an alarm to trigger in case the default handler does not terminate
    // the process. See 'AlarmSignalHandler' for more details.
    struct sigaction action;
-@@ -560,6 +566,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -565,6 +571,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
    // signals that do not re-raise autonomously), such as signals delivered via
    // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
    // otherwise be lost when re-raising the signal via raise().
@@ -59,7 +59,7 @@
    long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
                          info->si_signo, info);
    if (retval == 0) {
-@@ -574,6 +581,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+@@ -579,6 +586,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
    if (errno != EPERM) {
      _exit(EXIT_FAILURE);
    }
@@ -67,7 +67,7 @@
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(IS_CHROMEOS)
  
-@@ -763,6 +771,7 @@ class SandboxSymbolizeHelper {
+@@ -768,6 +776,7 @@ class SandboxSymbolizeHelper {
      return -1;
    }
  
@@ -75,7 +75,7 @@
    // This class is copied from
    // third_party/crashpad/crashpad/util/linux/scoped_pr_set_dumpable.h.
    // It aims at ensuring the process is dumpable before opening /proc/self/mem.
-@@ -855,11 +864,15 @@ class SandboxSymbolizeHelper {
+@@ -860,11 +869,15 @@ class SandboxSymbolizeHelper {
        r.base = cur_base;
      }
    }
@@ -91,7 +91,7 @@
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -877,6 +890,7 @@ class SandboxSymbolizeHelper {
+@@ -882,6 +895,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
diff --git a/www/chromium/files/patch-base_features.cc b/www/chromium/files/patch-base_features.cc
new file mode 100644
index 000000000000..21d6f98ec048
--- /dev/null
+++ b/www/chromium/files/patch-base_features.cc
@@ -0,0 +1,20 @@
+--- base/features.cc.orig	2024-05-21 18:07:39 UTC
++++ base/features.cc
+@@ -9,7 +9,7 @@
+ #include "base/threading/platform_thread.h"
+ #include "build/buildflag.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "base/message_loop/message_pump_libevent.h"
+ #endif
+ 
+@@ -98,7 +98,7 @@ void Init(EmitThreadControllerProfilerMetadata
+   sequence_manager::internal::ThreadController::InitializeFeatures(
+       emit_thread_controller_profiler_metadata);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   MessagePumpLibevent::InitializeFeatures();
+ #endif
+ 
diff --git a/www/chromium/files/patch-base_files_dir__reader__linux.h b/www/chromium/files/patch-base_files_dir__reader__linux.h
index 91bc1897532e..0d2122466a98 100644
--- a/www/chromium/files/patch-base_files_dir__reader__linux.h
+++ b/www/chromium/files/patch-base_files_dir__reader__linux.h
@@ -1,6 +1,6 @@
---- base/files/dir_reader_linux.h.orig	2022-08-31 12:19:35 UTC
+--- base/files/dir_reader_linux.h.orig	2024-06-17 12:56:06 UTC
 +++ base/files/dir_reader_linux.h
-@@ -16,10 +16,16 @@
+@@ -21,10 +21,16 @@
  #include "base/logging.h"
  #include "base/posix/eintr_wrapper.h"
  
@@ -17,7 +17,7 @@
  struct linux_dirent {
    uint64_t        d_ino;
    int64_t         d_off;
-@@ -27,6 +33,7 @@ struct linux_dirent {
+@@ -32,6 +38,7 @@ struct linux_dirent {
    unsigned char   d_type;
    char            d_name[0];
  };
@@ -25,7 +25,7 @@
  
  class DirReaderLinux {
   public:
-@@ -61,7 +68,11 @@ class DirReaderLinux {
+@@ -66,7 +73,11 @@ class DirReaderLinux {
      if (offset_ != size_)
        return true;
  
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
index 614e7b82492d..74298079a794 100644
--- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc
@@ -1,4 +1,4 @@
---- base/files/file_path_watcher_unittest.cc.orig	2024-02-23 21:04:38 UTC
+--- base/files/file_path_watcher_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/files/file_path_watcher_unittest.cc
 @@ -847,7 +847,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
    }
@@ -8,7 +8,7 @@
 +#if !BUILDFLAG(IS_APPLE) && BUILDFLAG(IS_BSD)
    ASSERT_TRUE(WriteFile(file1, "content v2"));
    // Mac implementation does not detect files modified in a directory.
-   // TODO(https://crbug.com/1432064): Expect that no events are fired on Mac.
+   // TODO(crbug.com/40263777): Expect that no events are fired on Mac.
 @@ -1783,7 +1783,7 @@ namespace {
  
  enum Permission { Read, Write, Execute };
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index e0a0c9cadd49..6559c3c4f202 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/files/file_util_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/files/file_util_posix.cc
-@@ -816,33 +816,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -819,33 +819,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
                                  File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc
index 8fbc0fce70ab..3f99964a4440 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_unittest.cc.orig	2024-04-19 13:02:56 UTC
+--- base/files/file_util_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/files/file_util_unittest.cc
-@@ -3870,7 +3870,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3835,7 +3835,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -9,7 +9,7 @@
  TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
    FilePath file_path("/proc/cpuinfo");
    std::string data = "temp";
-@@ -4651,7 +4651,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4568,7 +4568,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
                  NULL);
  #else
      size_t bytes_written =
diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc
index ed2de441c529..4927724361f5 100644
--- a/www/chromium/files/patch-base_linux__util.cc
+++ b/www/chromium/files/patch-base_linux__util.cc
@@ -1,14 +1,6 @@
---- base/linux_util.cc.orig	2023-12-10 06:10:27 UTC
+--- base/linux_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ base/linux_util.cc
-@@ -15,6 +15,7 @@
- 
- #include <iomanip>
- #include <memory>
-+#include <sstream>
- 
- #include "base/base_export.h"
- #include "base/files/dir_reader_posix.h"
-@@ -153,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) {
+@@ -154,10 +154,14 @@ void SetLinuxDistro(const std::string& distro) {
  }
  
  bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
index fda45153671e..5fd5df784d36 100644
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -1,6 +1,6 @@
---- base/logging_unittest.cc.orig	2024-01-30 07:53:34 UTC
+--- base/logging_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/logging_unittest.cc
-@@ -32,7 +32,7 @@
+@@ -41,7 +41,7 @@
  #include "base/posix/eintr_wrapper.h"
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -9,7 +9,7 @@
  #include <ucontext.h>
  #endif
  
-@@ -570,14 +570,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -579,14 +579,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
    // need the arch-specific boilerplate below, which is inspired by breakpad.
    // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
    uintptr_t crash_addr = 0;
diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
index f6675773b436..68e87b1fc924 100644
--- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
+++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc
@@ -1,6 +1,6 @@
---- base/memory/madv_free_discardable_memory_posix.cc.orig	2023-05-31 08:12:17 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -311,6 +311,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
  
  bool MadvFreeDiscardableMemoryPosix::IsResident() const {
    DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_APPLE)
    std::vector<char> vec(allocated_pages_);
  #else
-@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -326,6 +330,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
        return false;
    }
    return true;
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
index 3f38e80838c5..9a4f08183597 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc
@@ -1,6 +1,6 @@
---- base/posix/unix_domain_socket.cc.orig	2024-04-19 13:02:56 UTC
+--- base/posix/unix_domain_socket.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/posix/unix_domain_socket.cc
-@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
+@@ -56,7 +56,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
  
  // static
  bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
@@ -9,7 +9,7 @@
    const int enable = 1;
    return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
  #else
-@@ -77,7 +77,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+@@ -82,7 +82,7 @@ bool UnixDomainSocket::SendMsg(int fd,
  
      struct cmsghdr* cmsg;
      msg.msg_control = control_buffer;
@@ -18,7 +18,7 @@
      msg.msg_controllen = checked_cast<socklen_t>(control_len);
  #else
      msg.msg_controllen = control_len;
-@@ -85,7 +85,7 @@ bool UnixDomainSocket::SendMsg(int fd,
+@@ -90,7 +90,7 @@ bool UnixDomainSocket::SendMsg(int fd,
      cmsg = CMSG_FIRSTHDR(&msg);
      cmsg->cmsg_level = SOL_SOCKET;
      cmsg->cmsg_type = SCM_RIGHTS;
@@ -27,7 +27,7 @@
      cmsg->cmsg_len = checked_cast<u_int>(CMSG_LEN(sizeof(int) * fds.size()));
  #else
      cmsg->cmsg_len = CMSG_LEN(sizeof(int) * fds.size());
-@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -154,7 +154,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
  
    const size_t kControlBufferSize =
        CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
@@ -36,7 +36,7 @@
        // macOS does not support ucred.
        // macOS supports xucred, but this structure is insufficient.
        + CMSG_SPACE(sizeof(struct ucred))
-@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -182,7 +182,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
          wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
          wire_fds_len = payload_len / sizeof(int);
        }
@@ -45,7 +45,7 @@
        // macOS does not support SCM_CREDENTIALS.
        if (cmsg->cmsg_level == SOL_SOCKET &&
            cmsg->cmsg_type == SCM_CREDENTIALS) {
-@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
+@@ -216,6 +216,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
      socklen_t pid_size = sizeof(pid);
      if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
        pid = -1;
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
index 6d36a5d31542..c0912994822b 100644
--- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc
@@ -1,6 +1,6 @@
---- base/posix/unix_domain_socket_unittest.cc.orig	2023-03-09 06:31:50 UTC
+--- base/posix/unix_domain_socket_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/posix/unix_domain_socket_unittest.cc
-@@ -10,6 +10,8 @@
+@@ -15,6 +15,8 @@
  #include <sys/types.h>
  #include <unistd.h>
  
diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h
index e324410eccaa..8850e2dec39d 100644
--- a/www/chromium/files/patch-base_process_internal__linux.h
+++ b/www/chromium/files/patch-base_process_internal__linux.h
@@ -1,6 +1,6 @@
---- base/process/internal_linux.h.orig	2024-04-19 13:02:56 UTC
+--- base/process/internal_linux.h.orig	2024-05-21 18:07:39 UTC
 +++ base/process/internal_linux.h
-@@ -138,6 +138,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
+@@ -140,6 +140,9 @@ TimeDelta ClockTicksToTimeDelta(int64_t clock_ticks);
  // arguments to the lambda.
  template <typename Lambda>
  void ForEachProcessTask(base::ProcessHandle process, Lambda&& lambda) {
@@ -10,7 +10,7 @@
    // Iterate through the different threads tracked in /proc/<pid>/task.
    FilePath fd_path = GetProcPidDir(process).Append("task");
  
-@@ -157,6 +160,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
+@@ -159,6 +162,7 @@ void ForEachProcessTask(base::ProcessHandle process, L
      FilePath task_path = fd_path.Append(tid_str);
      lambda(tid, task_path);
    }
diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h
index 36e7c6deb10a..c219b3cbf5fe 100644
--- a/www/chromium/files/patch-base_process_kill.h
+++ b/www/chromium/files/patch-base_process_kill.h
@@ -1,6 +1,6 @@
---- base/process/kill.h.orig	2024-02-23 21:04:38 UTC
+--- base/process/kill.h.orig	2024-06-17 12:56:06 UTC
 +++ base/process/kill.h
-@@ -121,7 +121,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
+@@ -123,7 +123,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
  BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
      ProcessHandle handle, int* exit_code);
  
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index eae1fdd9a2af..a1d5e38a63eb 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig	2024-02-23 21:04:38 UTC
+--- base/process/launch_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/process/launch_posix.cc
-@@ -61,6 +61,9 @@
+@@ -66,6 +66,9 @@
  #error "macOS should use launch_mac.cc"
  #endif
  
diff --git a/www/chromium/files/patch-base_process_memory__linux.cc b/www/chromium/files/patch-base_process_memory__linux.cc
index 52e97d5d62fa..8d493b02d714 100644
--- a/www/chromium/files/patch-base_process_memory__linux.cc
+++ b/www/chromium/files/patch-base_process_memory__linux.cc
@@ -1,4 +1,4 @@
---- base/process/memory_linux.cc.orig	2024-01-30 07:53:34 UTC
+--- base/process/memory_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/process/memory_linux.cc
 @@ -28,6 +28,7 @@ void __libc_free(void*);
  
@@ -24,7 +24,7 @@
    std::set_new_handler(&ReleaseReservationOrTerminate);
    // If we're using glibc's allocator, the above functions will override
 @@ -51,8 +54,10 @@ void EnableTerminationOnOutOfMemory() {
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
+ #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
    allocator_shim::SetCallNewHandlerOnMallocFailure(true);
  #endif
 +#endif
@@ -41,4 +41,4 @@
 +#endif
  
  bool UncheckedMalloc(size_t size, void** result) {
- #if BUILDFLAG(USE_ALLOCATOR_SHIM)
+ #if PA_BUILDFLAG(USE_ALLOCATOR_SHIM)
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 97fd27ed293a..e5aebecf99bb 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig	2024-04-19 13:02:56 UTC
+--- base/process/process_metrics.cc.orig	2024-05-21 18:07:39 UTC
 +++ base/process/process_metrics.cc
 @@ -17,7 +17,7 @@ namespace base {
  namespace {
@@ -35,9 +35,9 @@
  double ProcessMetrics::GetPlatformIndependentCPUUsage(
      TimeDelta cumulative_cpu) {
    TimeTicks time = TimeTicks::Now();
-@@ -130,10 +129,9 @@ std::optional<double> ProcessMetrics::GetPlatformIndep
-   }
-   return GetPlatformIndependentCPUUsage(cpu_usage.value());
+@@ -129,10 +128,9 @@ ProcessMetrics::GetPlatformIndependentCPUUsage() {
+     return GetPlatformIndependentCPUUsage(cpu_usage);
+   });
  }
 -#endif
  
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index 3bc7936f205c..6c4db4d063fe 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- base/process/process_metrics.h.orig	2024-04-19 13:02:56 UTC
+--- base/process/process_metrics.h.orig	2024-05-21 18:07:39 UTC
 +++ base/process/process_metrics.h
 @@ -38,7 +38,7 @@
  #endif
@@ -18,7 +18,7 @@
  // Minor and major page fault counts since the process creation.
  // Both counts are process-wide, and exclude child processes.
  //
-@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -116,7 +116,7 @@ class BASE_EXPORT ProcessMetrics {
    // convenience wrapper for CreateProcessMetrics().
    static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
  
@@ -27,8 +27,8 @@
    // Resident Set Size is a Linux/Android specific memory concept. Do not
    // attempt to extend this to other platforms.
    BASE_EXPORT size_t GetResidentSetSize() const;
-@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics {
-   [[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage();
+@@ -150,7 +150,7 @@ class BASE_EXPORT ProcessMetrics {
+   base::expected<TimeDelta, ProcessCPUUsageError> GetCumulativeCPUUsage();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
 -    BUILDFLAG(IS_AIX)
@@ -36,7 +36,7 @@
    // Emits the cumulative CPU usage for all currently active threads since they
    // were started into the output parameter (replacing its current contents).
    // Threads that have already terminated will not be reported. Thus, the sum of
-@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -195,7 +195,7 @@ class BASE_EXPORT ProcessMetrics {
    int GetOpenFdSoftLimit() const;
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -45,7 +45,7 @@
    // Bytes of swap as reported by /proc/[pid]/status.
    uint64_t GetVmSwapBytes() const;
  
-@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -216,7 +216,7 @@ class BASE_EXPORT ProcessMetrics {
  #endif  // !BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -54,7 +54,7 @@
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if BUILDFLAG(IS_APPLE)
-@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics {
+@@ -238,12 +238,10 @@ class BASE_EXPORT ProcessMetrics {
    // Used to store the previous times and CPU usage counts so we can
    // compute the CPU usage between calls.
    TimeTicks last_cpu_time_;
@@ -68,7 +68,7 @@
    // Same thing for idle wakeups.
    TimeTicks last_idle_wakeups_time_;
    uint64_t last_absolute_idle_wakeups_;
-@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -284,7 +282,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||      \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -77,7 +77,7 @@
  // Data about system-wide memory consumption. Values are in KB. Available on
  // Windows, Mac, Linux, Android and Chrome OS.
  //
-@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -319,7 +317,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -86,7 +86,7 @@
    // This provides an estimate of available memory as described here:
    // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
    // NOTE: this is ONLY valid in kernels 3.14 and up.  Its value will always
-@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -334,7 +332,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
  #endif
  
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -95,7 +95,7 @@
    int buffers = 0;
    int cached = 0;
    int active_anon = 0;
-@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -371,7 +369,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
          // BUILDFLAG(IS_FUCHSIA)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -104,7 +104,7 @@
  // Parse the data found in /proc/<pid>/stat and return the sum of the
  // CPU-related ticks.  Returns -1 on parse error.
  // Exposed for testing.
-@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -566,7 +564,7 @@ class BASE_EXPORT SystemMetrics {
    FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
  
    size_t committed_memory_;
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
index b1034b768cb5..72062da66c7f 100644
--- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics_freebsd.cc.orig	2024-04-20 08:27:55 UTC
+--- base/process/process_metrics_freebsd.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/process/process_metrics_freebsd.cc
-@@ -3,42 +3,57 @@
+@@ -3,44 +3,58 @@
  // found in the LICENSE file.
  
  #include "base/process/process_metrics.h"
@@ -45,8 +45,10 @@
    return WrapUnique(new ProcessMetrics(process));
  }
  
--std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
-+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
+-base::expected<double, ProcessCPUUsageError>
+-ProcessMetrics::GetPlatformIndependentCPUUsage() {
++base::expected<TimeDelta, ProcessCPUUsageError>
++ProcessMetrics::GetCumulativeCPUUsage() {
    struct kinfo_proc info;
 -  int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
 -  size_t length = sizeof(info);
@@ -56,22 +58,23 @@
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
 +
    if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
--    return std::nullopt;
-+    return std::optional(TimeDelta());
+-    return base::unexpected(ProcessCPUUsageError::kSystemError);
++    return base::ok(TimeDelta());
  
--  return std::optional(double{info.ki_pctcpu} / FSCALE * 100.0);
-+  return std::optional(Microseconds(info.ki_runtime));
+-  return base::ok(double{info.ki_pctcpu} / FSCALE * 100.0);
++  return base::ok(Microseconds(info.ki_runtime));
  }
  
--std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
--  NOTREACHED();
--  return std::nullopt;
+-base::expected<TimeDelta, ProcessCPUUsageError>
+-ProcessMetrics::GetCumulativeCPUUsage() {
+-  NOTREACHED_IN_MIGRATION();
+-  return base::unexpected(ProcessCPUUsageError::kNotImplemented);
 -}
 -
  size_t GetSystemCommitCharge() {
    int mib[2], pagesize;
    unsigned long mem_total, mem_free, mem_inactive;
-@@ -60,6 +75,230 @@ size_t GetSystemCommitCharge() {
+@@ -62,6 +76,230 @@ size_t GetSystemCommitCharge() {
    pagesize = getpagesize();
  
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
diff --git a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
index 00db4dd3406c..6a9b8f8d9fdf 100644
--- a/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__openbsd.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics_openbsd.cc.orig	2024-04-19 13:02:56 UTC
+--- base/process/process_metrics_openbsd.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/process/process_metrics_openbsd.cc
-@@ -6,73 +6,49 @@
+@@ -6,75 +6,50 @@
  
  #include <stddef.h>
  #include <stdint.h>
@@ -8,11 +8,11 @@
  #include <sys/param.h>
  #include <sys/sysctl.h>
 +#include <sys/vmmeter.h>
- #include <optional>
  
 +#include <kvm.h>
 +
  #include "base/memory/ptr_util.h"
+ #include "base/types/expected.h"
 +#include "base/values.h"
 +#include "base/notreached.h"
  
@@ -21,8 +21,9 @@
 -namespace {
 +ProcessMetrics::ProcessMetrics(ProcessHandle process) : process_(process) {}
  
--static std::optional<int> GetProcessCPU(pid_t pid) {
-+std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
+-base::expected<int, ProcessCPUUsageError> GetProcessCPU(pid_t pid) {
++base::expected<TimeDelta, ProcessCPUUsageError>
++ProcessMetrics::GetCumulativeCPUUsage() {
    struct kinfo_proc info;
 -  size_t length;
 -  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
@@ -31,7 +32,7 @@
 +  struct timeval tv;
  
 -  if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
--    return std::nullopt;
+-    return base::unexpected(ProcessCPUUsageError::kSystemError);
 -  }
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
 +                sizeof(struct kinfo_proc), 1 };
@@ -39,15 +40,14 @@
 -  mib[5] = (length / sizeof(struct kinfo_proc));
 -
    if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) {
--    return std::nullopt;
-+    return std::optional(TimeDelta());
+     return base::unexpected(ProcessCPUUsageError::kSystemError);
    }
  
--  return std::optional(info.p_pctcpu);
+-  return base::ok(info.p_pctcpu);
 +  tv.tv_sec = info.p_rtime_sec;
 +  tv.tv_usec = info.p_rtime_usec;
 +
-+  return std::optional(Microseconds(TimeValToMicroseconds(tv)));
++  return base::ok(Microseconds(TimeValToMicroseconds(tv)));
  }
  
 -}  // namespace
@@ -58,27 +58,29 @@
    return WrapUnique(new ProcessMetrics(process));
  }
  
--std::optional<double> ProcessMetrics::GetPlatformIndependentCPUUsage() {
+-base::expected<double, ProcessCPUUsageError>
+-ProcessMetrics::GetPlatformIndependentCPUUsage() {
 -  TimeTicks time = TimeTicks::Now();
 -
 -  if (last_cpu_time_.is_zero()) {
 -    // First call, just set the last values.
 -    last_cpu_time_ = time;
--    return std::optional(0.0);
+-    return base::ok(0.0);
 -  }
 -
--  const std::optional<int> cpu = GetProcessCPU(process_);
+-  const base::expected<int, ProcessCPUUsageError> cpu = GetProcessCPU(process_);
 -  if (!cpu.has_value()) {
--    return std::nullopt;
+-    return base::unexpected(cpu.error());
 -  }
 -
 -  last_cpu_time_ = time;
--  return std::optional(double{cpu.value()} / FSCALE * 100.0);
+-  return base::ok(double{cpu.value()} / FSCALE * 100.0);
 -}
 -
--std::optional<TimeDelta> ProcessMetrics::GetCumulativeCPUUsage() {
--  NOTREACHED();
--  return std::nullopt;
+-base::expected<TimeDelta, ProcessCPUUsageError>
+-ProcessMetrics::GetCumulativeCPUUsage() {
+-  NOTREACHED_IN_MIGRATION();
+-  return base::unexpected(ProcessCPUUsageError::kNotImplemented);
 -}
 -
 -ProcessMetrics::ProcessMetrics(ProcessHandle process)
@@ -92,7 +94,7 @@
    struct vmtotal vmtotal;
    unsigned long mem_total, mem_free, mem_inactive;
    size_t len = sizeof(vmtotal);
-@@ -84,9 +60,136 @@ size_t GetSystemCommitCharge() {
+@@ -86,9 +61,136 @@ size_t GetSystemCommitCharge() {
    mem_free = vmtotal.t_free;
    mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
  
diff --git a/www/chromium/files/patch-base_process_process__metrics__unittest.cc b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
index ec3a90134860..15de769cead3 100644
--- a/www/chromium/files/patch-base_process_process__metrics__unittest.cc
+++ b/www/chromium/files/patch-base_process_process__metrics__unittest.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics_unittest.cc.orig	2024-04-19 13:02:56 UTC
+--- base/process/process_metrics_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/process/process_metrics_unittest.cc
-@@ -56,7 +56,8 @@
+@@ -62,7 +62,8 @@
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||      \
      BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index bd6418d952c0..e9be8080309e 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_posix.cc.orig	2023-09-13 12:11:42 UTC
+--- base/process/process_posix.cc.orig	2024-05-21 18:07:39 UTC
 +++ base/process/process_posix.cc
 @@ -23,10 +23,15 @@
  #include "base/trace_event/base_tracing.h"
@@ -17,16 +17,16 @@
  #if BUILDFLAG(CLANG_PROFILING)
  #include "base/test/clang_profiling.h"
  #endif
-@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
-   return ret_pid > 0;
+@@ -99,7 +104,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
  }
+ #endif
  
 -#if BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  // Using kqueue on Mac so that we can wait on non-child processes.
  // We can't use kqueues on child processes because we need to reap
  // our own children using wait.
-@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
+@@ -376,7 +381,7 @@ bool Process::WaitForExitWithTimeoutImpl(base::Process
    const bool exited = (parent_pid < 0);
  
    if (!exited && parent_pid != our_pid) {
@@ -35,7 +35,7 @@
      // On Mac we can wait on non child processes.
      return WaitForSingleNonChildProcess(handle, timeout);
  #else
-@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const {
+@@ -413,7 +418,56 @@ void Process::Exited(int exit_code) const {
  
  int Process::GetOSPriority() const {
    DCHECK(IsValid());
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 9779c7b34427..f5d178b107b4 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,6 +1,6 @@
---- base/profiler/stack_sampling_profiler_test_util.cc.orig	2024-04-19 13:02:56 UTC
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -37,7 +37,7 @@
+@@ -42,7 +42,7 @@
  // Fortunately, it provides _alloca, which functions identically.
  #include <malloc.h>
  #define alloca _alloca
diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
index e2957f5e2403..78aebb739b51 100644
--- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
+++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc
@@ -1,9 +1,9 @@
---- base/profiler/stack_sampling_profiler_unittest.cc.orig	2024-03-22 08:19:40 UTC
+--- base/profiler/stack_sampling_profiler_unittest.cc.orig	2024-05-21 18:07:39 UTC
 +++ base/profiler/stack_sampling_profiler_unittest.cc
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
+ 
  #include <intrin.h>
  #include <malloc.h>
- #include <windows.h>
 -#else
 +#elif !BUILDFLAG(IS_BSD)
  #include <alloca.h>
diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
index 3bbeceda7a02..ac755db803ce 100644
--- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
+++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc
@@ -1,6 +1,6 @@
---- base/profiler/thread_delegate_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/profiler/thread_delegate_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/profiler/thread_delegate_posix.cc
-@@ -14,7 +14,7 @@
+@@ -19,7 +19,7 @@
  #include "base/process/process_handle.h"
  #include "build/build_config.h"
  
@@ -9,7 +9,7 @@
  #include "base/profiler/stack_base_address_posix.h"
  #endif
  
-@@ -23,7 +23,7 @@ namespace base {
+@@ -28,7 +28,7 @@ namespace base {
  std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
      SamplingProfilerThreadToken thread_token) {
    std::optional<uintptr_t> base_address;
diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h
index 49fb9cdeae61..ad924acf0a09 100644
--- a/www/chromium/files/patch-base_rand__util.h
+++ b/www/chromium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig	2024-02-23 21:04:38 UTC
+--- base/rand_util.h.orig	2024-06-17 12:56:06 UTC
 +++ base/rand_util.h
-@@ -149,7 +149,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -147,7 +147,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index 1b2a99d867ab..903da2cdc4db 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- base/rand_util_posix.cc.orig	2024-03-22 08:19:40 UTC
+--- base/rand_util_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/rand_util_posix.cc
-@@ -23,7 +23,7 @@
+@@ -28,7 +28,7 @@
  #include "base/time/time.h"
  #include "build/build_config.h"
  
@@ -8,8 +8,8 @@
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
  #include "third_party/lss/linux_syscall_support.h"
  #elif BUILDFLAG(IS_MAC)
- // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
-@@ -40,6 +40,7 @@ namespace base {
+ // TODO(crbug.com/40641285): Waiting for this header to appear in the iOS SDK.
+@@ -45,6 +45,7 @@ namespace base {
  
  namespace {
  
@@ -17,7 +17,7 @@
  #if BUILDFLAG(IS_AIX)
  // AIX has no 64-bit support for O_CLOEXEC.
  static constexpr int kOpenFlags = O_RDONLY;
-@@ -64,10 +65,11 @@ class URandomFd {
+@@ -69,10 +70,11 @@ class URandomFd {
   private:
    const int fd_;
  };
@@ -30,15 +30,15 @@
  // TODO(pasko): Unify reading kernel version numbers in:
  // mojo/core/channel_linux.cc
  // chrome/browser/android/seccomp_support_detector.cc
-@@ -177,6 +179,7 @@ bool UseBoringSSLForRandBytes() {
+@@ -182,6 +184,7 @@ bool UseBoringSSLForRandBytes() {
  namespace {
  
- void RandBytes(span<uint8_t> output, bool avoid_allocation) {
+ void RandBytesInternal(span<uint8_t> output, bool avoid_allocation) {
 +#if !BUILDFLAG(IS_BSD)
  #if !BUILDFLAG(IS_NACL)
    // The BoringSSL experiment takes priority over everything else.
    if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
-@@ -215,6 +218,9 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca
+@@ -220,6 +223,9 @@ void RandBytesInternal(span<uint8_t> output, bool avoi
    const int urandom_fd = GetUrandomFD();
    const bool success = ReadFromFD(urandom_fd, as_writable_chars(output));
    CHECK(success);
@@ -48,8 +48,8 @@
  }
  
  }  // namespace
-@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) {
-   RandBytes(make_span(static_cast<uint8_t*>(output), output_length));
+@@ -239,9 +245,11 @@ void RandBytes(span<uint8_t> output) {
+   RandBytesInternal(output, /*avoid_allocation=*/false);
  }
  
 +#if !BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
index bc70a714257b..ab608cca3ea4 100644
--- a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
+++ b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
@@ -1,6 +1,6 @@
---- base/strings/safe_sprintf_unittest.cc.orig	2023-03-09 06:31:50 UTC
+--- base/strings/safe_sprintf_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/strings/safe_sprintf_unittest.cc
-@@ -733,6 +733,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
+@@ -740,6 +740,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
  #endif
  }
  
@@ -8,7 +8,7 @@
  TEST(SafeSPrintfTest, EmitNULL) {
    char buf[40];
  #if defined(__GNUC__)
-@@ -749,6 +750,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
+@@ -756,6 +757,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
  #pragma GCC diagnostic pop
  #endif
  }
diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index 6559c634202b..facc847067d6 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig	2024-04-19 13:02:56 UTC
+--- base/synchronization/lock_impl.h.orig	2024-05-21 18:07:39 UTC
 +++ base/synchronization/lock_impl.h
-@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
+@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
  }
  
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
  
  #if DCHECK_IS_ON()
  BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
+@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
    dcheck_unlock_result(rv);
  #endif
  }
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index b7ab4e2fdd19..3be2c25e6497 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig	2024-04-19 13:02:56 UTC
+--- base/system/sys_info.h.orig	2024-05-21 18:07:39 UTC
 +++ base/system/sys_info.h
-@@ -322,6 +322,8 @@ class BASE_EXPORT SysInfo {
+@@ -325,6 +325,8 @@ class BASE_EXPORT SysInfo {
    static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
@@ -9,7 +9,7 @@
   private:
    friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-@@ -334,7 +336,7 @@ class BASE_EXPORT SysInfo {
+@@ -337,7 +339,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
index 81e026100278..1a629e711c27 100644
--- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_freebsd.cc.orig	2022-09-01 17:22:07 UTC
+--- base/system/sys_info_freebsd.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/system/sys_info_freebsd.cc
 @@ -9,30 +9,106 @@
  #include <sys/sysctl.h>
@@ -35,7 +35,7 @@
 +    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
 +
 +  if (r == -1) {
-     NOTREACHED();
+     NOTREACHED_IN_MIGRATION();
      return 0;
    }
 -  return static_cast<int64_t>(pages) * page_size;
@@ -93,7 +93,7 @@
    size_t size = sizeof(limit);
 +
    if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
-     NOTREACHED();
+     NOTREACHED_IN_MIGRATION();
      return 0;
    }
 +
diff --git a/www/chromium/files/patch-base_system_sys__info__openbsd.cc b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
index 0821a62e1fdb..6d5c06c8a7d0 100644
--- a/www/chromium/files/patch-base_system_sys__info__openbsd.cc
+++ b/www/chromium/files/patch-base_system_sys__info__openbsd.cc
@@ -1,4 +1,4 @@
---- base/system/sys_info_openbsd.cc.orig	2024-02-23 21:04:38 UTC
+--- base/system/sys_info_openbsd.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/system/sys_info_openbsd.cc
 @@ -3,7 +3,6 @@
  // found in the LICENSE file.
@@ -68,7 +68,7 @@
 +  if (shmmax)
 +    goto out;
    if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
-     NOTREACHED();
+     NOTREACHED_IN_MIGRATION();
      return 0;
    }
 -  return static_cast<uint64_t>(limit);
diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
index 2e91e2f920e1..ae98c7bba6da 100644
--- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig	2024-01-30 07:53:34 UTC
+--- base/test/launcher/test_launcher.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/test/launcher/test_launcher.cc
-@@ -69,6 +69,7 @@
+@@ -74,6 +74,7 @@
  #include "testing/gtest/include/gtest/gtest.h"
  
  #if BUILDFLAG(IS_POSIX)
diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc
index 044e4903e8b6..748a590e144a 100644
--- a/www/chromium/files/patch-base_test_test__file__util__posix.cc
+++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/test/test_file_util_posix.cc.orig	2024-03-22 08:19:40 UTC
+--- base/test/test_file_util_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/test/test_file_util_posix.cc
-@@ -89,7 +89,7 @@ void SyncPageCacheToDisk() {
+@@ -91,7 +91,7 @@ void SyncPageCacheToDisk() {
  }
  
  #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index 27a45b8c27e2..c0019656f523 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,6 +1,6 @@
---- base/threading/platform_thread.h.orig	2024-04-19 13:02:56 UTC
+--- base/threading/platform_thread.h.orig	2024-06-17 12:56:06 UTC
 +++ base/threading/platform_thread.h
-@@ -46,6 +46,8 @@ typedef DWORD PlatformThreadId;
+@@ -49,6 +49,8 @@ typedef DWORD PlatformThreadId;
  typedef zx_koid_t PlatformThreadId;
  #elif BUILDFLAG(IS_APPLE)
  typedef mach_port_t PlatformThreadId;
diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
index eaa3272483dc..0fe6767c49a0 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -1,13 +1,12 @@
---- base/threading/platform_thread_posix.cc.orig	2024-04-19 13:02:56 UTC
+--- base/threading/platform_thread_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/threading/platform_thread_posix.cc
-@@ -78,12 +78,12 @@ void* ThreadFunc(void* params) {
+@@ -77,11 +77,11 @@ void* ThreadFunc(void* params) {
      if (!thread_params->joinable)
        base::DisallowSingleton();
  
--#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN)
-+#if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(USE_STARSCAN) && !BUILDFLAG(IS_BSD)
-     partition_alloc::internal::PCScan::NotifyThreadCreated(
-         partition_alloc::internal::GetStackPointer());
+-#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
++#if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_BSD)
+     partition_alloc::internal::StackTopRegistry::Get().NotifyThreadCreated();
  #endif
  
 -#if !BUILDFLAG(IS_NACL)
@@ -15,7 +14,7 @@
  #if BUILDFLAG(IS_APPLE)
      PlatformThread::SetCurrentThreadRealtimePeriodValue(
          delegate->GetRealtimePeriod());
-@@ -267,6 +267,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
+@@ -265,6 +265,8 @@ PlatformThreadId PlatformThreadBase::CurrentId() {
    return reinterpret_cast<int32_t>(pthread_self());
  #elif BUILDFLAG(IS_POSIX) && BUILDFLAG(IS_AIX)
    return pthread_self();
@@ -24,7 +23,7 @@
  #elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_AIX)
    return reinterpret_cast<int64_t>(pthread_self());
  #endif
-@@ -357,7 +359,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
+@@ -355,7 +357,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
  
  // static
  bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
@@ -33,7 +32,7 @@
    return false;
  #else
    if (from >= to) {
-@@ -378,6 +380,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -376,6 +378,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
                                MessagePumpType pump_type_hint) {
  #if BUILDFLAG(IS_NACL)
    NOTIMPLEMENTED();
@@ -43,7 +42,7 @@
  #else
    if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
      return;
-@@ -400,7 +405,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+@@ -398,7 +403,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
  
  // static
  ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
index 0ca9042b35b8..abccd59835cb 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_unittest.cc.orig	2023-11-03 10:09:45 UTC
+--- base/threading/platform_thread_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/threading/platform_thread_unittest.cc
-@@ -32,7 +32,7 @@
+@@ -38,7 +38,7 @@
  #include "base/time/time.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #include <sys/syscall.h>
  #include <sys/types.h>
-@@ -423,7 +423,7 @@ TEST(PlatformThreadTest,
+@@ -429,7 +429,7 @@ TEST(PlatformThreadTest,
  // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
  // proprerty changes for a given platform.
  TEST(PlatformThreadTest, CanChangeThreadType) {
@@ -18,7 +18,7 @@
    // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
    // able to increase priority to any level unless we are root (euid == 0).
    bool kCanIncreasePriority = false;
-@@ -706,12 +706,16 @@ INSTANTIATE_TEST_SUITE_P(
+@@ -713,12 +713,16 @@ INSTANTIATE_TEST_SUITE_P(
  
  #endif  // BUILDFLAG(IS_APPLE)
  
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index f5a71b0579e1..6bb0e9b118ae 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,6 +1,6 @@
---- base/trace_event/malloc_dump_provider.cc.orig	2024-04-19 13:02:56 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/trace_event/malloc_dump_provider.cc
-@@ -24,6 +24,8 @@
+@@ -29,6 +29,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,16 +9,16 @@
  #else
  #include <malloc.h>
  #endif
-@@ -181,7 +183,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
  
- #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
-     (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
+ #if (PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
+     (!PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
 -     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA))
 +     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD))
  void ReportMallinfoStats(ProcessMemoryDump* pmd,
                           size_t* total_virtual_size,
                           size_t* resident_size,
-@@ -366,6 +368,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -391,6 +393,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
                       &allocated_objects_count);
  #elif BUILDFLAG(IS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc
index f1f228e38e7b..ec706c906681 100644
--- a/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc
+++ b/www/chromium/files/patch-base_trace__event_memory__dump__manager.cc
@@ -1,6 +1,6 @@
---- base/trace_event/memory_dump_manager.cc.orig	2022-03-25 21:59:56 UTC
+--- base/trace_event/memory_dump_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/trace_event/memory_dump_manager.cc
-@@ -82,7 +82,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
+@@ -87,7 +87,7 @@ const char* const MemoryDumpManager::kSystemAllocatorP
  #if defined(MALLOC_MEMORY_TRACING_SUPPORTED)
      MallocDumpProvider::kAllocatedObjects;
  #else
diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
index c27d7848a4e2..2bf231c3eae4 100644
--- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
+++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
@@ -1,6 +1,6 @@
---- base/trace_event/process_memory_dump.cc.orig	2024-04-19 13:02:56 UTC
+--- base/trace_event/process_memory_dump.cc.orig	2024-06-17 12:56:06 UTC
 +++ base/trace_event/process_memory_dump.cc
-@@ -113,7 +113,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
+@@ -118,7 +118,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
  #if BUILDFLAG(IS_WIN)
    std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
        new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@@ -9,12 +9,12 @@
    std::unique_ptr<char[]> vec(new char[max_vec_size]);
  #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
    std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
-@@ -135,7 +135,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
+@@ -140,7 +140,7 @@ std::optional<size_t> ProcessMemoryDump::CountResident
  
      for (size_t i = 0; i < page_count; i++)
        resident_page_count += vec[i].VirtualAttributes.Valid;
 -#elif BUILDFLAG(IS_FUCHSIA)
 +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/851760): Implement counting resident bytes.
+     // TODO(crbug.com/42050620): Implement counting resident bytes.
      // For now, log and avoid unused variable warnings.
      NOTIMPLEMENTED_LOG_ONCE();
diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
index 9b8cdbc413ed..fa9d87daf851 100644
--- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn
+++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- build/config/BUILDCONFIG.gn.orig	2023-01-11 09:17:16 UTC
+--- build/config/BUILDCONFIG.gn.orig	2024-05-21 18:07:39 UTC
 +++ build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
@@ -10,7 +10,7 @@
               (current_cpu != "s390x" && current_cpu != "s390" &&
                current_cpu != "ppc64" && current_cpu != "ppc" &&
                current_cpu != "mips" && current_cpu != "mips64" &&
-@@ -225,6 +226,10 @@ if (host_toolchain == "") {
+@@ -231,6 +232,10 @@ if (host_toolchain == "") {
      host_toolchain = "//build/toolchain/aix:$host_cpu"
    } else if (host_os == "zos") {
      host_toolchain = "//build/toolchain/zos:$host_cpu"
@@ -21,7 +21,7 @@
    } else {
      assert(false, "Unsupported host_os: $host_os")
    }
-@@ -268,6 +273,8 @@ if (target_os == "android") {
+@@ -274,6 +279,8 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/aix:$target_cpu"
  } else if (target_os == "zos") {
    _default_toolchain = "//build/toolchain/zos:$target_cpu"
@@ -30,7 +30,7 @@
  } else {
    assert(false, "Unsupported target_os: $target_os")
  }
-@@ -302,7 +309,11 @@ is_android = current_os == "android"
+@@ -308,7 +315,11 @@ is_android = current_os == "android"
  is_chromeos = current_os == "chromeos"
  is_fuchsia = current_os == "fuchsia"
  is_ios = current_os == "ios"
diff --git a/www/chromium/files/patch-build_config_clang_BUILD.gn b/www/chromium/files/patch-build_config_clang_BUILD.gn
index eb48e938557e..6cc0ef6ff99b 100644
--- a/www/chromium/files/patch-build_config_clang_BUILD.gn
+++ b/www/chromium/files/patch-build_config_clang_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/clang/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- build/config/clang/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ build/config/clang/BUILD.gn
-@@ -203,7 +203,7 @@ template("clang_lib") {
+@@ -214,7 +214,7 @@ template("clang_lib") {
  
  # Adds a dependency on the Clang runtime library clang_rt.builtins.
  clang_lib("compiler_builtins") {
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 8b70ade32cb0..096b85a28469 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,6 +1,6 @@
---- build/config/compiler/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- build/config/compiler/BUILD.gn.orig	2024-06-18 16:34:35 UTC
 +++ build/config/compiler/BUILD.gn
-@@ -204,7 +204,7 @@ declare_args() {
+@@ -199,7 +199,7 @@ declare_args() {
    # This greatly reduces the size of debug builds, at the cost of
    # debugging information which is required by some specialized
    # debugging tools.
@@ -9,7 +9,7 @@
  }
  
  declare_args() {
-@@ -268,13 +268,16 @@ config("default_include_dirs") {
+@@ -251,13 +251,16 @@ config("default_include_dirs") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -27,7 +27,7 @@
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -515,6 +518,10 @@ config("compiler") {
+@@ -499,6 +502,10 @@ config("compiler") {
      }
    }
  
@@ -37,8 +37,8 @@
 +
    # Linux-specific compiler flags setup.
    # ------------------------------------
-   if (use_gold) {
-@@ -590,7 +597,7 @@ config("compiler") {
+   if (use_icf && (!is_apple || use_lld)) {
+@@ -545,7 +552,7 @@ config("compiler") {
      ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
    }
  
@@ -47,7 +47,7 @@
      cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
      if (save_reproducers_on_lld_crash && use_lld) {
        ldflags += [
-@@ -1180,7 +1187,7 @@ config("compiler_cpu_abi") {
+@@ -1173,7 +1180,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -56,7 +56,7 @@
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1195,7 +1202,7 @@ config("compiler_cpu_abi") {
+@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -65,7 +65,7 @@
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1530,7 +1537,7 @@ config("compiler_deterministic") {
+@@ -1523,7 +1530,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -74,7 +74,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1582,7 +1589,7 @@ config("compiler_deterministic") {
+@@ -1575,7 +1582,7 @@ config("compiler_deterministic") {
  }
  
  config("clang_revision") {
@@ -83,35 +83,26 @@
      update_args = [
        "--print-revision",
        "--verify-version=$clang_version",
-@@ -1890,9 +1897,6 @@ config("default_warnings") {
+@@ -1889,9 +1896,6 @@ config("default_warnings") {
  
-         # TODO(crbug.com/1494809): Evaluate and possibly enable.
+         # TODO(crbug.com/40286317): Evaluate and possibly enable.
          "-Wno-vla-extension",
 -
--        # TODO(https://crbug.com/1490607): Fix and re-enable.
+-        # TODO(crbug.com/40284799): Fix and re-enable.
 -        "-Wno-thread-safety-reference-return",
        ]
  
        cflags_cc += [
-@@ -1900,7 +1904,7 @@ config("default_warnings") {
+@@ -1899,7 +1903,7 @@ config("default_warnings") {
          "-Wenum-compare-conditional",
        ]
  
 -      if (!is_nacl) {
-+      if (!is_nacl && !is_bsd) {
++      if (!is_nacl && !is_openbsd) {
          cflags_cc += [
-           # TODO(https://crbug.com/1513724): Fix and re-enable.
+           # TODO(crbug.com/41486292): Fix and re-enable.
            "-Wno-c++11-narrowing-const-reference",
-@@ -2089,7 +2093,7 @@ config("no_chromium_code") {
-       # third-party libraries.
-       "-Wno-c++11-narrowing",
-     ]
--    if (!is_nacl) {
-+    if (!is_nacl && !is_freebsd) {
-       cflags += [
-         # Disabled for similar reasons as -Wunused-variable.
-         "-Wno-unused-but-set-variable",
-@@ -2597,7 +2601,7 @@ config("afdo_optimize_size") {
+@@ -2616,7 +2620,7 @@ config("afdo_optimize_size") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -120,7 +111,7 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2624,7 +2628,7 @@ config("afdo") {
+@@ -2643,7 +2647,7 @@ config("afdo") {
        cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
@@ -129,7 +120,7 @@
      cflags = [ "-fauto-profile=${auto_profile_path}" ]
      inputs = [ auto_profile_path ]
    }
-@@ -2788,7 +2792,8 @@ config("symbols") {
+@@ -2808,7 +2812,8 @@ config("symbols") {
      configs += [ "//build/config:compress_debug_sections" ]
    }
  
@@ -137,5 +128,5 @@
 +  if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos" &&
 +      !is_bsd) {
      if (is_apple) {
-       # TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
+       # TODO(crbug.com/40117949): Investigate missing debug info on mac.
        # Make sure we don't use constructor homing on mac.
diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni
index 324901afb617..01d2b5e47998 100644
--- a/www/chromium/files/patch-build_config_rust.gni
+++ b/www/chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig	2024-04-19 13:02:56 UTC
+--- build/config/rust.gni.orig	2024-05-21 18:07:39 UTC
 +++ build/config/rust.gni
-@@ -277,6 +277,10 @@ if (is_linux || is_chromeos) {
+@@ -272,6 +272,10 @@ if (is_linux || is_chromeos) {
    }
  }
  
diff --git a/www/chromium/files/patch-build_linux_unbundle_libwebp.gn b/www/chromium/files/patch-build_linux_unbundle_libwebp.gn
deleted file mode 100644
index e1ff6cffbd63..000000000000
--- a/www/chromium/files/patch-build_linux_unbundle_libwebp.gn
+++ /dev/null
@@ -1,27 +0,0 @@
---- build/linux/unbundle/libwebp.gn.orig	2024-04-20 08:27:55 UTC
-+++ build/linux/unbundle/libwebp.gn
-@@ -22,6 +22,8 @@ shim_headers("libwebp_shim") {
-     "webp/mux.h",
-     "webp/mux_types.h",
-     "webp/types.h",
-+    "webp/sharpyuv/sharpyuv.h",
-+    "webp/sharpyuv/sharpyuv_csp.h",
-   ]
- }
- 
-@@ -30,6 +32,14 @@ source_set("libwebp_webp") {
-   public_configs = [ ":system_libwebp" ]
- }
- 
-+source_set("libwebp_sharpyuv") {
-+  deps = [ ":libwebp_shim" ]
-+  public_configs = [ ":system_libwebp" ]
-+}
-+
- group("libwebp") {
--  deps = [ ":libwebp_webp" ]
-+  deps = [
-+    ":libwebp_webp",
-+    ":libwebp_sharpyuv",
-+  ]
- }
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
index f017ad1a10fd..cc391fbfe404 100644
--- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
+++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- build/toolchain/gcc_toolchain.gni.orig	2024-03-22 08:19:40 UTC
+--- build/toolchain/gcc_toolchain.gni.orig	2024-06-17 12:56:06 UTC
 +++ build/toolchain/gcc_toolchain.gni
 @@ -57,6 +57,13 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,8 +14,8 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -890,22 +897,12 @@ template("gcc_toolchain") {
- # use_gold too.
+@@ -878,22 +885,12 @@ template("gcc_toolchain") {
+ # actually just be doing a native compile.
  template("clang_toolchain") {
    gcc_toolchain(target_name) {
 -    _path = "$clang_base_path/bin"
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index 2fede71e2bcf..5cfcc2b55e09 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- cc/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ cc/BUILD.gn
-@@ -681,7 +681,7 @@ cc_test_static_library("test_support") {
+@@ -677,7 +677,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -9,7 +9,7 @@
      data_deps = [ "//third_party/mesa_headers" ]
    }
    if (skia_use_dawn) {
-@@ -940,7 +940,6 @@ cc_test("cc_unittests") {
+@@ -936,7 +936,6 @@ cc_test("cc_unittests") {
    data = [ "//components/test/data/viz/" ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
index a7f93a9ada50..55db67777245 100644
--- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,4 +1,4 @@
---- chrome/app/chrome_command_ids.h.orig	2023-09-13 12:11:42 UTC
+--- chrome/app/chrome_command_ids.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/app/chrome_command_ids.h
 @@ -68,12 +68,12 @@
  #define IDC_TOGGLE_MULTITASK_MENU       34050
@@ -9,7 +9,7 @@
  #define IDC_USE_SYSTEM_TITLE_BAR        34051
  #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #define IDC_RESTORE_WINDOW              34052
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 3b8e559bce55..46365f7478ac 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig	2024-05-01 07:03:57 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -146,7 +146,7 @@
+@@ -137,7 +137,7 @@
  #include "components/about_ui/credit_utils.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/nacl/common/nacl_paths.h"
  #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
  #endif
-@@ -189,20 +189,20 @@
+@@ -180,21 +180,21 @@
  #include "v8/include/v8.h"
  #endif
  
@@ -21,6 +21,7 @@
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/nix/scoped_xdg_activation_token_injector.h"
+ #include "ui/linux/display_server_utils.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -34,7 +35,7 @@
  #include "chrome/browser/policy/policy_path_parser.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -249,7 +249,7 @@
+@@ -241,7 +241,7 @@
  #include "base/scoped_add_feature_flags.h"
  #include "ui/base/ui_base_features.h"
  #include "ui/ozone/public/ozone_platform.h"
@@ -43,7 +44,7 @@
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #endif
  #endif  // BUILDFLAG(IS_OZONE)
-@@ -349,7 +349,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -341,7 +341,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
  // and resources loaded.
  bool SubprocessNeedsResourceBundle(const std::string& process_type) {
    return
@@ -52,16 +53,16 @@
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -434,7 +434,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -426,7 +426,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // Show the man page if --help or -h is on the command line.
  void HandleHelpSwitches(const base::CommandLine& command_line) {
    if (command_line.HasSwitch(switches::kHelp) ||
-@@ -480,7 +480,7 @@ void SetCrashpadUploadConsentPostLogin() {
+@@ -472,7 +472,7 @@ void SetCrashpadUploadConsentPostLogin() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -70,7 +71,7 @@
  void SIGTERMProfilingShutdown(int signal) {
    content::Profiling::Stop();
    struct sigaction sigact;
-@@ -562,7 +562,7 @@ std::optional<int> AcquireProcessSingleton(
+@@ -554,7 +554,7 @@ std::optional<int> AcquireProcessSingleton(
    // process can be exited.
    ChromeProcessSingleton::CreateInstance(user_data_dir);
  
@@ -79,7 +80,7 @@
    // Read the xdg-activation token and set it in the command line for the
    // duration of the notification in order to ensure this is propagated to an
    // already running browser process if it exists.
-@@ -646,7 +646,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -638,7 +638,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -88,7 +89,7 @@
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -765,7 +765,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
  #endif
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -97,17 +98,17 @@
    // Record the startup process creation time on supported platforms. On Android
    // this is recorded in ChromeMainDelegateAndroid.
    startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -964,7 +964,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
+@@ -957,7 +957,7 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitia
  #if BUILDFLAG(IS_OZONE)
    // Initialize Ozone platform and add required feature flags as per platform's
    // properties.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint();
+   ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
  #endif
    ui::OzonePlatform::PreEarlyInitialization();
-@@ -1162,7 +1162,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
-       chrome::GetChannel() == version_info::Channel::DEV;
+@@ -1150,7 +1150,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+   const bool is_canary_dev = IsCanaryDev();
    const bool emit_crashes =
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
@@ -115,25 +116,16 @@
        is_canary_dev;
  #else
        false;
-@@ -1181,7 +1181,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
-   // for more context.
-   base::sequence_manager::internal::ThreadController::InitializeFeatures(
-       /*record_sample_metadata=*/is_canary_dev);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
-   base::MessagePumpLibevent::InitializeFeatures();
- #elif BUILDFLAG(IS_MAC)
-   base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1330,7 +1330,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
+@@ -1305,7 +1305,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  
-   // TODO(crbug.com/1052397): Revisit the macro expression once build flag
+   // TODO(crbug.com/40118868): Revisit the macro expression once build flag
    // switch of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -1360,7 +1360,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
+@@ -1335,7 +1335,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  #if BUILDFLAG(IS_CHROMEOS)
    chromeos::dbus_paths::RegisterPathProvider();
  #endif
@@ -142,7 +134,7 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -1757,7 +1757,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1722,7 +1722,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
    }
  
@@ -151,7 +143,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
      if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1858,7 +1858,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1821,7 +1821,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
  
    // This entry is not needed on Linux, where the NaCl loader
    // process is launched via nacl_helper instead.
diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn
index 87575ea436c1..d18f857d1600 100644
--- a/www/chromium/files/patch-chrome_browser_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/BUILD.gn.orig	2024-04-25 21:17:54 UTC
+--- chrome/browser/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/BUILD.gn
-@@ -6554,6 +6554,13 @@ static_library("browser") {
+@@ -6708,6 +6708,13 @@ static_library("browser") {
      }
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index 1933395a868c..af8c638ff9e5 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/about_flags.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/about_flags.cc
-@@ -234,7 +234,7 @@
+@@ -238,7 +238,7 @@
  #include "ui/ui_features.h"
  #include "url/url_features.h"
  
@@ -9,7 +9,7 @@
  #include "base/allocator/buildflags.h"
  #endif
  
-@@ -322,7 +322,7 @@
+@@ -328,7 +328,7 @@
  #include "device/vr/public/cpp/features.h"
  #endif
  
@@ -18,16 +18,16 @@
  #include "ui/ozone/public/ozone_switches.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
  
-@@ -331,7 +331,7 @@
+@@ -337,7 +337,7 @@
  #include "chrome/browser/win/titlebar_config.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/profile_management/profile_management_features.h"
- #include "components/supervised_user/core/common/features.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -489,7 +489,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+ 
+@@ -482,7 +482,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
      {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
  #endif
  
@@ -36,16 +36,25 @@
  const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
      {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
      {flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1384,7 +1384,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
-      nullptr}};
+@@ -1265,7 +1265,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot
+ };
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ const FeatureEntry::FeatureParam kHistoryEmbeddingsAtKeywordAcceleration[]{
+     {"AtKeywordAcceleration", "true"},
+ };
+@@ -1328,7 +1328,7 @@ const FeatureEntry::FeatureVariation
+ };
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  const FeatureEntry::FeatureParam kShortcutBoostSingleUrl[] = {
      {"ShortcutBoostSearchScore", "0"},
      {"ShortcutBoostNonTopHitThreshold", "0"},
-@@ -3704,7 +3704,7 @@ const flags_ui::FeatureEntry::FeatureVariation
+@@ -3679,7 +3679,7 @@ const flags_ui::FeatureEntry::FeatureVariation
           std::size(kParcelTrackingTestDataOutForDelivery), nullptr},
  };
  
@@ -54,7 +63,7 @@
  const flags_ui::FeatureEntry::FeatureParam
      kDesktopPWAsLinkCapturingDefaultOn[] = {{"on_by_default", "true"}};
  const flags_ui::FeatureEntry::FeatureParam
-@@ -4495,7 +4495,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4511,7 +4511,7 @@ const FeatureEntry kFeatureEntries[] = {
      },
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -63,25 +72,25 @@
      {
          "fluent-overlay-scrollbars",
          flag_descriptions::kFluentOverlayScrollbarsName,
-@@ -4936,7 +4936,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4947,7 +4947,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebAppUniversalInstallDescription, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kWebAppUniversalInstall)},
  #endif  // !BUILDFLAG(IS_ANDROID)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      {"shortcuts-not-apps", flag_descriptions::kShortcutsNotAppsName,
       flag_descriptions::kShortcutsNotAppsDescription,
-      kOsMac | kOsWin | kOsLinux | kOsFuchsia,
-@@ -5061,7 +5061,7 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsMac | kOsWin | kOsLinux,
+@@ -5074,7 +5074,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kWebShare)},
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
      {"pulseaudio-loopback-for-cast",
       flag_descriptions::kPulseaudioLoopbackForCastName,
       flag_descriptions::kPulseaudioLoopbackForCastDescription, kOsLinux,
-@@ -5077,7 +5077,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5090,7 +5090,7 @@ const FeatureEntry kFeatureEntries[] = {
       MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
  #endif  // BUILDFLAG(IS_LINUX)
  
@@ -90,34 +99,34 @@
      {"skip-undecryptable-passwords",
       flag_descriptions::kSkipUndecryptablePasswordsName,
       flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -5981,7 +5981,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6011,7 +6011,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"omnibox-domain-suggestions",
       flag_descriptions::kOmniboxDomainSuggestionsName,
       flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
-@@ -6852,7 +6852,7 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kParallelDownloadingDescription, kOsAll,
-      FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
+@@ -6331,7 +6331,7 @@ const FeatureEntry kFeatureEntries[] = {
+                                     "OrganicRepeatableQueries")},
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     {"enable-async-dns", flag_descriptions::kAsyncDnsName,
-      flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux,
-      FEATURE_VALUE_TYPE(net::features::kAsyncDns)},
-@@ -7857,7 +7857,7 @@ const FeatureEntry kFeatureEntries[] = {
-      FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)},
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+     {"history-embeddings", flag_descriptions::kHistoryEmbeddingsName,
+      flag_descriptions::kHistoryEmbeddingsDescription, kOsDesktop,
+      FEATURE_WITH_PARAMS_VALUE_TYPE(history_embeddings::kHistoryEmbeddings,
+@@ -7949,7 +7949,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCooperativeSchedulingDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kCooperativeScheduling)},
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      {"enable-network-service-sandbox",
       flag_descriptions::kEnableNetworkServiceSandboxName,
       flag_descriptions::kEnableNetworkServiceSandboxDescription,
-@@ -7881,7 +7881,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7973,7 +7973,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(media::kV4L2FlatStatefulVideoDecoder)},
  #endif
  
@@ -126,7 +135,7 @@
      {"enable-family-link-extensions-permissions",
       flag_descriptions::
           kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName,
-@@ -8733,7 +8733,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8810,7 +8810,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -135,16 +144,16 @@
      {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
       flag_descriptions::kGetAllScreensMediaDescription,
       kOsCrOS | kOsLacros | kOsLinux,
-@@ -8775,7 +8775,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8849,7 +8849,7 @@ const FeatureEntry kFeatureEntries[] = {
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
      {
          "ui-debug-tools",
          flag_descriptions::kUIDebugToolsName,
-@@ -9044,7 +9044,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9086,7 +9086,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -153,7 +162,7 @@
      {"policy-indication-for-managed-default-search",
       flag_descriptions::kPolicyIndicationForManagedDefaultSearchName,
       flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription,
-@@ -9340,7 +9340,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9393,7 +9393,7 @@ const FeatureEntry kFeatureEntries[] = {
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -162,7 +171,7 @@
      {"media-session-enter-picture-in-picture",
       flag_descriptions::kMediaSessionEnterPictureInPictureName,
       flag_descriptions::kMediaSessionEnterPictureInPictureDescription,
-@@ -10280,7 +10280,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10303,7 +10303,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsDesktop | kOsAndroid,
       FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)},
  
@@ -171,25 +180,25 @@
      {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName,
       flag_descriptions::kCameraMicEffectsDescription,
       static_cast<unsigned short>(kOsMac | kOsWin | kOsLinux),
-@@ -10318,7 +10318,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10341,7 +10341,7 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)},
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     {"site-search-settings-policy",
-      flag_descriptions::kSiteSearchSettingsPolicyName,
-      flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll,
-@@ -10452,7 +10452,7 @@ const FeatureEntry kFeatureEntries[] = {
-          password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)},
- #endif
+     {"show-featured-enterprise-site-search",
+      flag_descriptions::kShowFeaturedEnterpriseSiteSearchName,
+      flag_descriptions::kShowFeaturedEnterpriseSiteSearchDescription, kOsAll,
+@@ -10456,7 +10456,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kHideIncognitoMediaMetadataDescription, kOsAll,
+      FEATURE_VALUE_TYPE(media::kHideIncognitoMediaMetadata)},
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
      {"third-party-profile-management",
       flag_descriptions::kThirdPartyProfileManagementName,
       flag_descriptions::kThirdPartyProfileManagementDescription,
-@@ -10804,7 +10804,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -10805,7 +10805,7 @@ const FeatureEntry kFeatureEntries[] = {
           trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)},
  #endif
  
@@ -198,7 +207,7 @@
      {"restart-to-gain-access-to-keychain",
       flag_descriptions::kRestartToGainAccessToKeychainName,
       flag_descriptions::kRestartToGainAccessToKeychainDescription,
-@@ -11078,7 +11078,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -11086,7 +11086,7 @@ const FeatureEntry kFeatureEntries[] = {
  
  // Controls the view mode for (history) sync screen.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc b/www/chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc
deleted file mode 100644
index 568fbf176797..000000000000
--- a/www/chromium/files/patch-chrome_browser_accessibility_pdf__ocr__controller.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/accessibility/pdf_ocr_controller.cc.orig	2024-03-22 08:19:40 UTC
-+++ chrome/browser/accessibility/pdf_ocr_controller.cc
-@@ -111,7 +111,7 @@ void AnnounceToScreenReader(const int message_id) {
- // TODO(crbug.com/1442928): Sending announcements results in a failure in
- // `AuraLinuxAccessibilityInProcessBrowserTest::IndexInParentWithModal` and
- // flaky fail when running Chrome.
--#if !BUILDFLAG(IS_LINUX)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
-   const Browser* browser = BrowserList::GetInstance()->GetLastActive();
-   if (!browser) {
-     VLOG(2) << "Browser is not ready to announce";
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index 54e492d2ecef..0e6a61cde5b2 100644
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,11 +1,11 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/apps/platform_apps/platform_app_launch.h
-@@ -39,7 +39,7 @@ content::WebContents* OpenExtensionApplicationTab(Prof
+@@ -38,7 +38,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
+ content::WebContents* OpenExtensionApplicationTab(Profile* profile,
                                                    const std::string& app_id);
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
  // Chrome Apps are deprecated on the |profile|. Returns true if that was the
  // case, or false otherwise.
diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
index a35891fc20c5..a710b0db67b5 100644
--- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
+++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc
@@ -1,6 +1,6 @@
---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2023-03-09 06:31:50 UTC
+--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -90,7 +90,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
+@@ -88,7 +88,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch
        return metrics::OmniboxInputType::QUERY;
  
      case ExternalProtocolHandler::UNKNOWN: {
diff --git a/www/chromium/files/patch-chrome_browser_browser__features.cc b/www/chromium/files/patch-chrome_browser_browser__features.cc
index 763656bbbc11..6a8f7d66b356 100644
--- a/www/chromium/files/patch-chrome_browser_browser__features.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_features.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/browser_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/browser_features.cc
-@@ -76,7 +76,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
+@@ -82,7 +82,7 @@ const base::FeatureParam<bool> kSpareRendererWarmupDel
  BASE_FEATURE(kDestroyProfileOnBrowserClose,
               "DestroyProfileOnBrowserClose",
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT);
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -337,7 +337,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
+@@ -354,7 +354,7 @@ BASE_FEATURE(kSandboxExternalProtocolBlockedWarning,
  BASE_FEATURE(kSupportSearchSuggestionForPrerender2,
               "SupportSearchSuggestionForPrerender2",
  #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index bb269b3a46a0..8a28bb08769a 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/browser_process_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/browser_process_impl.cc
-@@ -220,7 +220,7 @@
+@@ -229,7 +229,7 @@
  #include "chrome/browser/ui/profiles/profile_picker.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h"  // nogncheck
  #endif
  
-@@ -1253,7 +1253,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1284,7 +1284,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
  
    ApplyMetricsReportingPolicy();
  
@@ -18,9 +18,9 @@
    ChromeJsErrorReportProcessor::Create();
  #endif
  
-@@ -1533,7 +1533,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1617,7 +1617,7 @@ void BrowserProcessImpl::Unpin() {
  // Mac is currently not supported.
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
 -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index ecc8b68284cb..32f91a826fcb 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,8 +1,8 @@
---- chrome/browser/browser_process_impl.h.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/browser_process_impl.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/browser_process_impl.h
-@@ -389,7 +389,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -404,7 +404,7 @@ class BrowserProcessImpl : public BrowserProcess,
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 4de90df96d71..a857cf7e71d5 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -129,13 +129,13 @@
+@@ -132,12 +132,12 @@
  #endif  // BUILDFLAG(FULL_SAFE_BROWSING)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -10,13 +10,12 @@
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h"
  #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h"
  #endif
-@@ -224,7 +224,7 @@
+@@ -228,7 +228,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +24,7 @@
  #include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
  #include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
  #include "chrome/browser/ui/webui/discards/discards.mojom.h"
-@@ -834,7 +834,7 @@ void BindScreen2xMainContentExtractor(
+@@ -854,7 +854,7 @@ void BindScreen2xMainContentExtractor(
  #endif
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -34,25 +33,16 @@
  void BindVisualSuggestionsModelProvider(
      content::RenderFrameHost* frame_host,
      mojo::PendingReceiver<
-@@ -1030,7 +1030,7 @@ void PopulateChromeFrameBinders(
+@@ -1050,7 +1050,7 @@ void PopulateChromeFrameBinders(
  #endif  // BUILDFLAG(ENABLE_SPEECH_SERVICE)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (!render_frame_host->GetParent()) {
-     map->Add<chrome::mojom::DraggableRegions>(
-         base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -1038,7 +1038,7 @@ void PopulateChromeFrameBinders(
- #endif
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
        !render_frame_host->GetParentOrOuterDocument()) {
      // The service binder will reject non-primary main frames, but we still need
-@@ -1125,7 +1125,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
        commerce::CommerceInternalsUI>(map);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -61,16 +51,16 @@
    RegisterWebUIControllerInterfaceBinder<
        connectors_internals::mojom::PageHandler,
        enterprise_connectors::ConnectorsInternalsUI>(map);
-@@ -1137,7 +1137,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1148,7 +1148,7 @@ void PopulateChromeWebUIFrameBinders(
+                                          policy::DlpInternalsUI>(map);
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    RegisterWebUIControllerInterfaceBinder<
        app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
  #endif
-@@ -1704,7 +1704,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1759,7 +1759,7 @@ void PopulateChromeWebUIFrameBinders(
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index d12840851581..eb488c766105 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,8 +1,8 @@
---- chrome/browser/chrome_browser_main.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/chrome_browser_main.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_browser_main.cc
-@@ -246,15 +246,15 @@
+@@ -247,15 +247,15 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -19,12 +19,12 @@
  #include "base/nix/xdg_util.h"
  #endif
  
-@@ -287,14 +287,14 @@
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -288,14 +288,14 @@
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS_LACROS)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
  #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
  #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
@@ -36,7 +36,7 @@
  #include "chrome/browser/headless/headless_mode_metrics.h"  // nogncheck
  #include "chrome/browser/headless/headless_mode_util.h"     // nogncheck
  #include "components/headless/select_file_dialog/headless_select_file_dialog.h"
-@@ -361,14 +361,14 @@
+@@ -367,14 +367,14 @@
  #endif  // BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER)
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -53,7 +53,7 @@
  constexpr base::FilePath::CharType kMediaHistoryDatabaseName[] =
      FILE_PATH_LITERAL("Media History");
  
-@@ -523,7 +523,7 @@ void ProcessSingletonNotificationCallbackImpl(
+@@ -539,7 +539,7 @@ void ProcessSingletonNotificationCallbackImpl(
    }
  #endif
  
@@ -62,7 +62,7 @@
    // Set the global activation token sent as a command line switch by another
    // browser process. This also removes the switch after use to prevent any side
    // effects of leaving it in the command line after this point.
-@@ -1089,7 +1089,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1100,7 +1100,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
        browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
      }
  
@@ -71,25 +71,25 @@
      // Create directory for user-level Native Messaging manifest files. This
      // makes it less likely that the directory will be created by third-party
      // software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1137,7 +1137,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -1148,7 +1148,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS_LACROS)
++    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    metrics::DesktopSessionDurationTracker::Initialize();
    ProfileActivityMetricsRecorder::Initialize();
    TouchModeStatsTracker::Initialize(
-@@ -1328,7 +1328,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
+@@ -1333,7 +1333,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
  #endif  // BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    // Delete the media history database if it still exists.
-   // TODO(crbug.com/1198344): Remove this.
+   // TODO(crbug.com/40177301): Remove this.
    base::ThreadPool::PostTask(
-@@ -1377,7 +1377,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
+@@ -1382,7 +1382,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile* 
        *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -98,7 +98,7 @@
    if (headless::IsHeadlessMode()) {
      headless::ReportHeadlessActionMetrics();
    }
-@@ -1485,7 +1485,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
+@@ -1492,7 +1492,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl(
    // In headless mode provide alternate SelectFileDialog factory overriding
    // any platform specific SelectFileDialog implementation that may have been
    // set.
@@ -107,7 +107,7 @@
    if (headless::IsHeadlessMode()) {
      headless::HeadlessSelectFileDialogFactory::SetUp();
    }
-@@ -2030,7 +2030,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
+@@ -2043,7 +2043,7 @@ bool ChromeBrowserMainParts::ProcessSingletonNotificat
  
    // Drop the request if headless mode is in effect or the request is from
    // a headless Chrome process.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index 80dcc921f211..f23a6c76207f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-05-01 07:03:57 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
-@@ -175,7 +175,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
+@@ -58,7 +58,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
  
  // static
  void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // On the desktop, we fix the platform name if necessary.
-   // See https://crbug.com/1246928.
    auto* const command_line = base::CommandLine::ForCurrentProcess();
+   auto env = base::Environment::Create();
+   std::string desktop_startup_id;
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index c341ed44a5cd..82c435ff265e 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_browser_main_linux.cc
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  #include "device/bluetooth/dbus/bluez_dbus_thread_manager.h"
  #include "ui/base/l10n/l10n_util.h"
  
@@ -9,7 +9,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
  
-@@ -71,7 +71,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
+@@ -72,7 +72,9 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if !BUILDFLAG(IS_CHROMEOS)
@@ -19,7 +19,7 @@
  
    // 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
-@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
+@@ -98,7 +100,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag
    ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop();
  }
  
@@ -28,7 +28,7 @@
  void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {
    ChromeBrowserMainPartsPosix::PostMainMessageLoopRun();
    ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
-@@ -135,7 +137,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
+@@ -137,7 +139,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
  #endif  // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
  
  void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
index 2a8765abda83..d49cdb3adb6f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -1,8 +1,8 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_browser_main_posix.cc
 @@ -79,7 +79,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa
    } else {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 7f9cb252ad26..805202b52e4d 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,17 +1,17 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_content_browser_client.cc
-@@ -460,7 +460,7 @@
+@@ -468,7 +468,7 @@
  #include "storage/browser/file_system/external_mount_points.h"
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/chrome_browser_main_linux.h"
  #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
  #elif BUILDFLAG(IS_ANDROID)
-@@ -569,12 +569,12 @@
+@@ -578,12 +578,12 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
@@ -24,7 +24,7 @@
  #include "components/crash/core/app/crash_switches.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -585,7 +585,7 @@
+@@ -594,7 +594,7 @@
  #include "chrome/browser/apps/link_capturing/web_app_link_capturing_delegate.h"
  #endif
  
@@ -33,7 +33,7 @@
  #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h"
  #include "chrome/browser/enterprise/profile_management/oidc_auth_response_capture_navigation_throttle.h"
  #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
-@@ -593,7 +593,7 @@
+@@ -602,7 +602,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -42,8 +42,8 @@
  #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -609,7 +609,7 @@
- #include "components/lens/lens_features.h"
+@@ -617,7 +617,7 @@
+ #include "chrome/browser/ui/lens/lens_side_panel_navigation_helper.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -51,7 +51,7 @@
  #include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
  #elif BUILDFLAG(IS_OZONE)
  #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1474,7 +1474,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+@@ -1516,7 +1516,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
  #if BUILDFLAG(IS_CHROMEOS)
    registry->RegisterBooleanPref(prefs::kNativeClientForceAllowed, false);
  #endif  // BUILDFLAG(IS_CHROMEOS)
@@ -60,7 +60,7 @@
    registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
                                  true);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1598,7 +1598,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1640,7 +1640,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
    main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
        is_integration_test, &startup_data_);
@@ -69,16 +69,16 @@
    main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
        is_integration_test, &startup_data_);
  #elif BUILDFLAG(IS_ANDROID)
-@@ -1635,7 +1635,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1674,7 +1674,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
        std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    main_parts->AddParts(
        std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
  #else
-@@ -1656,7 +1656,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1695,7 +1695,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
  #endif
  
@@ -87,7 +87,7 @@
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
  #elif BUILDFLAG(IS_OZONE)
    main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1675,7 +1675,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1714,7 +1714,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
  
    chrome::AddMetricsExtraParts(main_parts.get());
  
@@ -96,7 +96,7 @@
    main_parts->AddParts(
        std::make_unique<
            chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2515,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2551,7 +2551,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
                                      client_info->client_id);
    }
  #elif BUILDFLAG(IS_POSIX)
@@ -105,16 +105,16 @@
    pid_t pid;
    if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
      command_line->AppendSwitchASCII(
-@@ -2847,7 +2847,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
-   ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
-       command_line);
+@@ -2886,7 +2886,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+     }
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && !BUILDFLAG(IS_BSD)
    // Opt into a hardened stack canary mitigation if it hasn't already been
    // force-disabled.
    if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4551,7 +4551,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4651,7 +4651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
    }
  }
  
@@ -123,7 +123,7 @@
  void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
      const base::CommandLine& command_line,
      int child_process_id,
-@@ -5109,7 +5109,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5205,7 +5205,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
          &throttles);
    }
  
@@ -132,7 +132,7 @@
    MaybeAddThrottle(
        WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
        &throttles);
-@@ -5123,7 +5123,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5219,7 +5219,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -141,7 +141,7 @@
    MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -5162,7 +5162,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5258,7 +5258,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
              handle));
    }
  
@@ -150,7 +150,7 @@
    MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
                         MaybeCreateThrottleFor(handle),
                     &throttles);
-@@ -7137,7 +7137,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -7243,7 +7243,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
  bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
  // This enterprise policy is supported on Android, but the feature will not be
  // launched there.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index 09f934d3be83..cdebb12053a0 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -500,7 +500,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -507,7 +507,7 @@ class ChromeContentBrowserClient : public content::Con
    bool IsPluginAllowedToUseDevChannelAPIs(
        content::BrowserContext* browser_context,
        const GURL& url) override;
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
index 3480496cccdd..2958ef48c55e 100644
--- a/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
+++ b/www/chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc
@@ -1,15 +1,15 @@
---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2024-03-27 13:31:02 UTC
+--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
  #include "third_party/widevine/cdm/buildflags.h"
  #include "third_party/widevine/cdm/widevine_cdm_common.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/path_service.h"
+ #include "chrome/common/chrome_paths.h"
  #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
- #endif
- 
-@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
+@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto::
  const char ImageLoaderComponentName[] = "WidevineCdm";
  #endif
  
@@ -18,7 +18,16 @@
  // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
  // zygote is locked down. As a result there is no need to register the CDM
  // with Chrome as it can't be used until Chrome is restarted.
-@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
+@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version
+ }
+ #endif  // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the
+ // zygote is locked down. To locate the Widevine CDM at startup, a hint file
+ // is used. Update the hint file with the new Widevine CDM path.
+@@ -398,7 +398,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat
      return;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
index e5e00061d6ab..0c2fbf343089 100644
--- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc
@@ -1,9 +1,9 @@
---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2022-02-28 16:54:41 UTC
+--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc
 @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform
    return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>(
        local_state);
- #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
+ #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
    return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state);
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index 6f39ad9b49ca..d27e83c460d2 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1700,7 +1700,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1714,7 +1714,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
  bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferredForFile(
      const base::FilePath& path) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
    if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
      return !download_prefs_->ShouldOpenPdfInSystemReader();
    }
-@@ -1819,7 +1819,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1860,7 +1860,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
      content::CheckDownloadAllowedCallback check_download_allowed_cb) {
    DCHECK_CURRENTLY_ON(BrowserThread::UI);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
    // Don't download pdf if it is a file URL, as that might cause an infinite
    // download loop if Chrome is not the system pdf viewer.
    if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) {
-@@ -1865,7 +1865,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1906,7 +1906,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
    DCHECK(download_item->IsSavePackageDownload());
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
index 2f0723813bcb..a77f446e340e 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,11 +1,11 @@
---- chrome/browser/download/download_commands.cc.orig	2023-04-05 11:05:06 UTC
+--- chrome/browser/download/download_commands.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/download/download_commands.cc
 @@ -26,7 +26,7 @@
  #include "ui/base/clipboard/scoped_clipboard_writer.h"
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
@@ -13,8 +13,8 @@
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  
  Browser* DownloadCommands::GetBrowser() const {
    if (!model_)
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h
index edbc1392ce5a..b0cbfb893cc3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h
@@ -1,11 +1,11 @@
---- chrome/browser/download/download_commands.h.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/download/download_commands.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/download/download_commands.h
-@@ -63,7 +63,7 @@ class DownloadCommands {
+@@ -66,7 +66,7 @@ class DownloadCommands {
    void ExecuteCommand(Command command);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    bool IsDownloadPdf() const;
    bool CanOpenPdfInSystemViewer() const;
    Browser* GetBrowser() const;
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 7797d68c90b6..290acf7d02e3 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/download/download_item_model.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/download/download_item_model.cc
-@@ -752,7 +752,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -799,7 +799,7 @@ bool DownloadItemModel::IsCommandChecked(
               download_crx_util::IsExtensionDownload(*download_);
      case DownloadCommands::ALWAYS_OPEN_TYPE:
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
        if (download_commands->CanOpenPdfInSystemViewer()) {
          DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
          return prefs->ShouldOpenPdfInSystemReader();
-@@ -798,7 +798,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -847,7 +847,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
                                           DownloadCommands::ALWAYS_OPEN_TYPE);
        DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
        if (download_commands->CanOpenPdfInSystemViewer()) {
          prefs->SetShouldOpenPdfInSystemReader(!is_checked);
          SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1189,7 +1189,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1236,7 +1236,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
      return;
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index e2e9c3914f64..99ecdfcb620d 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/download/download_prefs.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/download/download_prefs.cc
 @@ -11,6 +11,7 @@
  #include <vector>
@@ -37,7 +37,7 @@
    should_open_pdf_in_system_reader_ =
        prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
  #endif
-@@ -306,7 +311,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -304,7 +309,7 @@ void DownloadPrefs::RegisterProfilePrefs(
    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
                                   default_download_path);
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
    registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
  #endif
  #if BUILDFLAG(IS_ANDROID)
-@@ -473,7 +478,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -469,7 +474,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
  void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
    if (should_open_pdf_in_system_reader_ == should_open)
      return;
-@@ -505,7 +510,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -501,7 +506,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
  
  void DownloadPrefs::ResetAutoOpenByUser() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
    SetShouldOpenPdfInSystemReader(false);
  #endif
    auto_open_by_user_.clear();
-@@ -545,7 +550,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -538,7 +543,7 @@ void DownloadPrefs::SaveAutoOpenState() {
  bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
  #if BUILDFLAG(IS_CHROMEOS)
    return false;  // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
    return ShouldOpenPdfInSystemReader();
  #else
    return false;
-@@ -697,7 +702,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -690,7 +695,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
  #else
    // If the stored download directory is an absolute path, we presume it's
    // correct; there's not really much more validation we can do here.
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
index 9b7bb5a36928..4a947d47e411 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc
-@@ -150,7 +150,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
+@@ -151,7 +151,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
    const char* verification_key = kKeyWindowsVerification;
  #elif BUILDFLAG(IS_MAC)
    const char* verification_key = kKeyMacVerification;
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
index 7d1c563ad09f..fcb9573085cc 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_connectors__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/enterprise/connectors/connectors_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/connectors/connectors_service.cc
-@@ -564,7 +564,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
+@@ -565,7 +565,7 @@ bool ConnectorsService::ConnectorsEnabled() const {
  
    Profile* profile = Profile::FromBrowserContext(context_);
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
index 4eb285d38ba2..796dbd31bf2c 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc
@@ -1,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
 @@ -23,7 +23,7 @@
  #include "components/policy/core/common/management/management_service.h"
@@ -17,8 +17,8 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  policy::CloudPolicyStore* GetUserCloudPolicyStore(Profile* profile) {
    policy::CloudPolicyManager* user_policy_manager =
-       profile->GetUserCloudPolicyManager();
-@@ -104,7 +104,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
+       profile->GetCloudPolicyManager();
+@@ -101,7 +101,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
    DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
    DependsOn(policy::ManagementServiceFactory::GetInstance());
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
index cdc383179c1f..807671888d97 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
 @@ -11,7 +11,7 @@ namespace enterprise_connectors {
  
  BrowserCrashEventRouter::BrowserCrashEventRouter(
      content::BrowserContext* context) {
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
    CrashReportingContext* crash_reporting_context =
        CrashReportingContext::GetInstance();
    Profile* profile = Profile::FromBrowserContext(context);
@@ -13,8 +13,8 @@
  }
  
  BrowserCrashEventRouter::~BrowserCrashEventRouter() {
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
    CrashReportingContext* crash_reporting_context =
        CrashReportingContext::GetInstance();
    crash_reporting_context->RemoveProfile(this);
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
index 89fffff10498..e4d80ab76388 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.cc
@@ -1,11 +1,11 @@
---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.cc
 @@ -18,7 +18,7 @@
  
  namespace enterprise_connectors {
  
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
  
  namespace {
  
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
index 52e7d98c7add..e547fb68901f 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_identifiers_profile__id__delegate__impl.cc
@@ -1,20 +1,20 @@
---- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig	2023-01-11 09:17:16 UTC
+--- chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/identifiers/profile_id_delegate_impl.cc
-@@ -12,7 +12,7 @@
+@@ -13,7 +13,7 @@
  #include "components/enterprise/browser/identifiers/identifiers_prefs.h"
  #include "components/prefs/pref_service.h"
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include "components/enterprise/browser/controller/browser_dm_token_storage.h"
  #if BUILDFLAG(IS_WIN)
  #include "base/strings/utf_string_conversions.h"
-@@ -36,7 +36,7 @@ void CreateProfileGUID(PrefService* prefs) {
+@@ -94,7 +94,7 @@ std::string ProfileIdDelegateImpl::GetDeviceId() {
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  // Gets the device ID from the BrowserDMTokenStorage.
- std::string GetId() {
+ std::string ProfileIdDelegateImpl::GetId() {
    std::string device_id =
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc b/www/chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
index 106bd4aaaa5e..ce799e41d54c 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_profile__management_profile__management__navigation__throttle.cc
@@ -1,7 +1,7 @@
---- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.cc
 @@ -67,8 +67,8 @@ base::flat_map<std::string, SAMLProfileAttributes>& Ge
-   // TODO(crbug.com/1445072): Add actual domains with attribute names.
+   // TODO(crbug.com/40267996): Add actual domains with attribute names.
    profile_attributes->insert(std::make_pair(
        "supported.test",
 -      SAMLProfileAttributes("placeholderName", "placeholderDomain",
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc b/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc
index 3ae6cb960840..196c2b1d0f53 100644
--- a/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc
+++ b/www/chromium/files/patch-chrome_browser_enterprise_watermark_watermark__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/enterprise/watermark/watermark_view.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/enterprise/watermark/watermark_view.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/enterprise/watermark/watermark_view.cc
-@@ -33,7 +33,7 @@ const gfx::Font& WatermarkFont() {
+@@ -36,7 +36,7 @@ gfx::Font WatermarkFont() {
        "Segoe UI",
  #elif BUILDFLAG(IS_MAC)
        "SF Pro Text",
@@ -9,7 +9,7 @@
        "Ubuntu",
  #elif BUILDFLAG(IS_CHROMEOS)
        "Google Sans",
-@@ -45,7 +45,7 @@ const gfx::Font& WatermarkFont() {
+@@ -47,7 +47,7 @@ gfx::Font WatermarkFont() {
  }
  
  gfx::Font::Weight WatermarkFontWeight() {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index a79290ef12de..e9b3f4a32e26 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/BUILD.gn
-@@ -1384,6 +1384,10 @@ static_library("extensions") {
+@@ -1391,6 +1391,10 @@ static_library("extensions") {
      deps += [ "//chrome/services/printing/public/mojom" ]
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index cd22ff4c2f1e..60831bad0a33 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
  #include "components/reporting/util/statusor.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <optional>
  
  #include "base/strings/string_util.h"
-@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -150,7 +150,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
    return info;
  }
  
@@ -18,7 +18,7 @@
  
  device_signals::SignalsAggregationRequest CreateAggregationRequest(
      device_signals::SignalName signal_name) {
-@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
  
  // getPersistentSecret
  
@@ -27,7 +27,7 @@
  
  EnterpriseReportingPrivateGetPersistentSecretFunction::
      EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
  }
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
index 308f32b4efcd..b77998ba58fb 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_management_chrome__management__api__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/management/chrome_management_api_delegate.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -408,7 +408,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
+@@ -405,7 +405,7 @@ bool ChromeManagementAPIDelegate::LaunchAppFunctionDel
    apps::LaunchContainer launch_container =
        GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
    Profile* profile = Profile::FromBrowserContext(context);
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
index 835ab8925c96..a022ae90883f 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
@@ -1,8 +1,8 @@
---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
 @@ -84,7 +84,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index 54023892bd1c..6ad32153f215 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -605,7 +605,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
+@@ -610,7 +610,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
  }
  
  void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
index 24f295a38112..a5967f4300ca 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
 @@ -284,7 +284,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
    } else if (strcmp(os, "linux") == 0) {
@@ -8,6 +8,6 @@
 +    info->os = extensions::api::runtime::PlatformOs::kLinux;
 +  } else if (strcmp(os, "freebsd") == 0) {
 +    info->os = extensions::api::runtime::PlatformOs::kLinux;
-   } else if (strcmp(os, "fuchsia") == 0) {
-     info->os = extensions::api::runtime::PlatformOs::kFuchsia;
    } else {
+     NOTREACHED() << "Platform not supported: " << os;
+     return false;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index 069e140c367e..845800df52a4 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -204,7 +204,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -197,7 +197,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
        settings_api::PrefType::kBoolean;
  
@@ -9,7 +9,7 @@
    (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
        settings_api::PrefType::kBoolean;
  #endif
-@@ -213,7 +213,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -208,7 +208,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
    // Appearance settings.
    (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::kString;
    (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::kNumber;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
index 8458dbdf455c..14cf501e9fa6 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -1,9 +1,9 @@
---- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/tabs/tabs_api.cc
 @@ -890,7 +890,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
  // minimized.
- // TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
- // TODO(crbug.com/1410400): Find a fix for wayland as well.
+ // TODO(crbug.com/40254339): Remove this workaround when linux is fixed.
+ // TODO(crbug.com/40254339): Find a fix for wayland as well.
 -#if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(IS_OZONE_X11)
    if (new_window->initial_show_state() == ui::SHOW_STATE_MINIMIZED) {
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
index c4cf225a7414..0792af53ceea 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -934,7 +934,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
+@@ -897,7 +897,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
  #if BUILDFLAG(IS_CHROMEOS)
        RequestExtensionApproval(contents);
        return;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index a8f648531454..041eaa13dfc7 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,15 +1,15 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/extensions/external_provider_impl.cc
-@@ -830,7 +830,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -831,7 +831,7 @@ void ExternalProviderImpl::CreateExternalProviders(
    if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
      provider_list->push_back(std::make_unique<ExternalProviderImpl>(
          service,
          base::MakeRefCounted<ExternalPrefLoader>(
-@@ -858,7 +858,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -859,7 +859,7 @@ void ExternalProviderImpl::CreateExternalProviders(
          bundled_extension_creation_flags));
  
      // Define a per-user source of external extensions.
diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index c81fa23e5192..81227df0c407 100644
--- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -317,7 +317,7 @@ const struct {
+@@ -315,7 +315,7 @@ const struct {
       FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
       kDontBlockChildren},
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
index 8f7d4918c91a..1e6bf04818cd 100644
--- a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
+++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h
@@ -1,8 +1,8 @@
---- chrome/browser/first_run/first_run_dialog.h.orig	2022-11-30 08:12:58 UTC
+--- chrome/browser/first_run/first_run_dialog.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/first_run/first_run_dialog.h
 @@ -12,7 +12,7 @@
  // Hide this function on platforms where the dialog does not exist.
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 6b4a13f8a04c..2d2d74b36a40 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/flag_descriptions.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/flag_descriptions.cc
-@@ -2946,7 +2946,7 @@ const char kCbdTimeframeRequiredDescription[] =
+@@ -2923,7 +2923,7 @@ const char kCbdTimeframeRequiredDescription[] =
      "value to the list.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,16 @@
  const char kPolicyIndicationForManagedDefaultSearchName[] =
      "Enable policy indication for managed Default Search provider";
  const char kPolicyIndicationForManagedDefaultSearchDescription[] =
-@@ -3259,7 +3259,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
+@@ -3220,7 +3220,7 @@ const char kShowAutofillTypePredictionsDescription[] =
+     "text.";
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ const char kShowFeaturedEnterpriseSiteSearchName[] =
+     "Show featured Enterprise site search engines in Omnibox";
+ const char kShowFeaturedEnterpriseSiteSearchDescription[] =
+@@ -3245,7 +3245,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[]
      "but in the same SiteInstanceGroup, and thus the same process.";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +27,7 @@
  const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy";
  const char kSiteSearchSettingsPolicyDescription[] =
      "Allow site search engines to be defined by the SiteSearchSettings policy.";
-@@ -7496,7 +7496,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
+@@ -7485,7 +7485,7 @@ const char kLacrosMergeIcuDataFileDescription[] =
      "Enables sharing common areas of icudtl.dat between Ash and Lacros.";
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -27,7 +36,7 @@
  const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
  const char kGetAllScreensMediaDescription[] =
      "When enabled, the getAllScreensMedia API for capturing multiple screens "
-@@ -7756,7 +7756,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] 
+@@ -7753,7 +7753,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] 
  
  // Linux -----------------------------------------------------------------------
  
@@ -36,25 +45,24 @@
  const char kOzonePlatformHintChoiceDefault[] = "Default";
  const char kOzonePlatformHintChoiceAuto[] = "Auto";
  const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -7804,7 +7804,7 @@ const char kZeroCopyVideoCaptureDescription[] =
+@@ -7801,14 +7801,14 @@ const char kZeroCopyVideoCaptureDescription[] =
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
  const char kFollowingFeedSidepanelDescription[] =
      "Enables the following feed in the sidepanel.";
-@@ -7819,7 +7819,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] 
-     "instead of JSON.";
- #endif
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         //  BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  const char kEnableNetworkServiceSandboxName[] =
      "Enable the network service sandbox.";
  const char kEnableNetworkServiceSandboxDescription[] =
-@@ -7851,7 +7851,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -7840,7 +7840,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
      "Bluetooth";
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -63,26 +71,17 @@
  const char kSkipUndecryptablePasswordsName[] =
      "Skip undecryptable passwords to use the available decryptable "
      "passwords.";
-@@ -7871,7 +7871,7 @@ const char kRestartToGainAccessToKeychainDescription[]
-     "to restart Chrome to gain access to computer's password manager.";
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kAsyncDnsName[] = "Async DNS resolver";
- const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -7972,7 +7972,7 @@ const char kElementCaptureDescription[] =
+@@ -7980,7 +7980,7 @@ const char kElementCaptureDescription[] =
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  const char kUIDebugToolsName[] = "Debugging tools for UI";
  const char kUIDebugToolsDescription[] =
      "Enables additional keyboard shortcuts to help debugging.";
-@@ -8021,7 +8021,7 @@ const char kComposeTextSelectionDescription[] =
-     "Enables feature for different heuristics for selecting text for Compose";
+@@ -8041,7 +8041,7 @@ const char kComposeNudgeAtCursorDescription[] =
+     "Shows the Compose proactive nudge at the cursor location";
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index 5b361c39b876..5b37626cc3de 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,6 +1,6 @@
---- chrome/browser/flag_descriptions.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/flag_descriptions.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/flag_descriptions.h
-@@ -1709,7 +1709,7 @@ extern const char kCbdTimeframeRequiredName[];
+@@ -1702,7 +1702,7 @@ extern const char kCbdTimeframeRequiredName[];
  extern const char kCbdTimeframeRequiredDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,16 @@
  extern const char kPolicyIndicationForManagedDefaultSearchName[];
  extern const char kPolicyIndicationForManagedDefaultSearchDescription[];
  #endif
-@@ -1890,7 +1890,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
+@@ -1873,7 +1873,7 @@ extern const char kShowAutofillTypePredictionsName[];
+ extern const char kShowAutofillTypePredictionsDescription[];
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kShowFeaturedEnterpriseSiteSearchName[];
+ extern const char kShowFeaturedEnterpriseSiteSearchDescription[];
+ #endif
+@@ -1888,7 +1888,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[]
  extern const char kSiteInstanceGroupsForDataUrlsDescription[];
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +27,7 @@
  extern const char kSiteSearchSettingsPolicyName[];
  extern const char kSiteSearchSettingsPolicyDescription[];
  #endif
-@@ -4323,7 +4323,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+@@ -4347,7 +4347,7 @@ extern const char kLacrosMergeIcuDataFileName[];
  extern const char kLacrosMergeIcuDataFileDescription[];
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -27,7 +36,7 @@
  extern const char kGetAllScreensMediaName[];
  extern const char kGetAllScreensMediaDescription[];
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -4471,7 +4471,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
+@@ -4502,7 +4502,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip
  
  // Linux ---------------------------------------------------------------------
  
@@ -36,7 +45,7 @@
  extern const char kOzonePlatformHintChoiceDefault[];
  extern const char kOzonePlatformHintChoiceAuto[];
  extern const char kOzonePlatformHintChoiceX11[];
-@@ -4513,7 +4513,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -4544,7 +4544,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
  extern const char kWebBluetoothConfirmPairingSupportDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
  
@@ -45,42 +54,33 @@
  extern const char kSkipUndecryptablePasswordsName[];
  extern const char kSkipUndecryptablePasswordsDescription[];
  
-@@ -4524,13 +4524,13 @@ extern const char kRestartToGainAccessToKeychainName[]
- extern const char kRestartToGainAccessToKeychainDescription[];
+@@ -4556,13 +4556,13 @@ extern const char kRestartToGainAccessToKeychainDescri
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kAsyncDnsName[];
- extern const char kAsyncDnsDescription[];
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
- 
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kFollowingFeedSidepanelName[];
  extern const char kFollowingFeedSidepanelDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -4541,7 +4541,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
- extern const char kEnableProtoApiForClassifyUrlDescription[];
- #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+         //  BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kEnableNetworkServiceSandboxName[];
  extern const char kEnableNetworkServiceSandboxDescription[];
  
-@@ -4618,7 +4618,7 @@ extern const char kElementCaptureDescription[];
+@@ -4658,7 +4658,7 @@ extern const char kElementCaptureDescription[];
  
  #if BUILDFLAG(IS_WIN) ||                                      \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  extern const char kUIDebugToolsName[];
  extern const char kUIDebugToolsDescription[];
  
-@@ -4652,7 +4652,7 @@ extern const char kComposeTextSelectionName[];
- extern const char kComposeTextSelectionDescription[];
+@@ -4701,7 +4701,7 @@ extern const char kComposeNudgeAtCursorName[];
+ extern const char kComposeNudgeAtCursorDescription[];
  #endif  // BUILDFLAG(ENABLE_COMPOSE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
index 1a16f17b16d4..eb9d2e65790b 100644
--- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
+++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h
@@ -1,11 +1,11 @@
---- chrome/browser/intranet_redirect_detector.h.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/intranet_redirect_detector.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/intranet_redirect_detector.h
 @@ -25,7 +25,7 @@ class SimpleURLLoader;
  class PrefRegistrySimple;
  
  #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
--      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA))
-+      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD))
+-      BUILDFLAG(IS_CHROMEOS))
++      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  #error "IntranetRedirectDetector should only be built on Desktop platforms."
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
index 8a5730d4b31a..8e21f635cdea 100644
--- a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
+++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/audio_service_util.cc.orig	2023-01-11 09:17:16 UTC
+--- chrome/browser/media/audio_service_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/media/audio_service_util.cc
 @@ -21,7 +21,7 @@
  
@@ -11,7 +11,7 @@
    const policy::PolicyMap& policies =
 @@ -43,7 +43,7 @@ bool GetPolicyOrFeature(const char* policy_name, const
  bool IsAudioServiceSandboxEnabled() {
- // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
+ // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
  // built with OS_CHROMEOS instead of OS_LINUX.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
index d6993459de66..1b0bb02f8332 100644
--- a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/media/router/discovery/BUILD.gn.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/media/router/discovery/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/media/router/discovery/BUILD.gn
-@@ -81,7 +81,7 @@ static_library("discovery") {
+@@ -82,7 +82,7 @@ static_library("discovery") {
    ]
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
  
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
index 7c249c855c29..3452d716158d 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_desktop__media__picker__controller.cc
@@ -1,9 +1,9 @@
---- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/media/webrtc/desktop_media_picker_controller.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/media/webrtc/desktop_media_picker_controller.cc
-@@ -92,7 +92,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
-   } else {
-     return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
-   }
+@@ -89,7 +89,7 @@ bool DesktopMediaPickerController::IsSystemAudioCaptur
+ #if BUILDFLAG(IS_MAC)
+  return request_source == Params::RequestSource::kCast ||
+      base::FeatureList::IsEnabled(media::kMacLoopbackAudioForScreenShare);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (request_source == Params::RequestSource::kCast) {
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
index d6e5ac50ed26..e184d7b552d7 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,8 +1,8 @@
---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -100,7 +100,7 @@ std::string GetLogUploadProduct() {
+@@ -101,7 +101,7 @@ std::string GetLogUploadProduct() {
    const char product[] = "Chrome_Mac";
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
index c1c011309544..57fc7e19cf6e 100644
--- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
 @@ -25,10 +25,10 @@
  #include "components/webrtc_logging/browser/text_log_list.h"
@@ -30,4 +30,4 @@
 +#endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  
  void WebRtcLoggingController::OnRtpPacket(
-     std::unique_ptr<uint8_t[]> packet_header,
+     base::HeapArray<uint8_t> packet_header,
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc
index bc2d99a75472..c7ed75864c01 100644
--- a/www/chromium/files/patch-chrome_browser_memory__details.cc
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -1,4 +1,4 @@
---- chrome/browser/memory_details.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/memory_details.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/memory_details.cc
 @@ -38,7 +38,7 @@
  #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h"
@@ -9,7 +9,7 @@
  #include "content/public/browser/zygote_host/zygote_host_linux.h"
  #endif
  
-@@ -335,7 +335,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
+@@ -334,7 +334,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
            });
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 7a10eb391d30..8f1688bee047 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,8 +1,8 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -80,8 +80,10 @@
+@@ -81,8 +81,10 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
@@ -30,7 +30,7 @@
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -858,7 +860,7 @@ void RecordStartupMetrics() {
+@@ -862,7 +864,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -39,7 +39,7 @@
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1154,11 +1156,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
    }
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 58076d199092..b137d2c357be 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -194,7 +194,7 @@
+@@ -195,7 +195,7 @@
  #include "chrome/notification_helper/notification_helper_constants.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "components/metrics/motherboard_metrics_provider.h"
  #endif
  
-@@ -211,7 +211,7 @@
+@@ -212,7 +212,7 @@
  #include "chrome/browser/metrics/power/power_metrics_provider_mac.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "chrome/browser/metrics/bluetooth_metrics_provider.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -577,7 +577,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
+@@ -534,7 +534,7 @@ void ChromeMetricsServiceClient::RegisterPrefs(PrefReg
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
    metrics::structured::StructuredMetricsService::RegisterPrefs(registry);
  
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -749,7 +749,7 @@ void ChromeMetricsServiceClient::Initialize() {
+@@ -706,7 +706,7 @@ void ChromeMetricsServiceClient::Initialize() {
      RegisterUKMProviders();
    }
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -36,7 +36,7 @@
    metrics::structured::Recorder::GetInstance()->SetUiTaskRunner(
        base::SequencedTaskRunner::GetCurrentDefault());
  #endif
-@@ -796,7 +796,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -757,7 +757,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::CPUMetricsProvider>());
  
@@ -45,8 +45,8 @@
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<metrics::MotherboardMetricsProvider>());
  #endif
-@@ -881,7 +881,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -842,7 +842,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -54,7 +54,7 @@
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
-@@ -991,7 +991,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -944,7 +944,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
        std::make_unique<PowerMetricsProvider>());
  #endif
  
@@ -63,8 +63,8 @@
    metrics_service_->RegisterMetricsProvider(
        metrics::CreateDesktopSessionMetricsProvider());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1170,7 +1170,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -1131,7 +1131,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
@@ -72,7 +72,7 @@
    // This creates the DesktopProfileSessionDurationsServices if it didn't exist
    // already.
    metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext(
-@@ -1513,7 +1513,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
+@@ -1465,7 +1465,7 @@ void ChromeMetricsServiceClient::CreateStructuredMetri
    recorder =
        std::make_unique<metrics::structured::AshStructuredMetricsRecorder>(
            cros_system_profile_provider_.get());
diff --git a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
index 6b9920395e34..b8ffdaaa9d17 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/perf/cpu_identity.cc.orig	2023-02-08 09:03:45 UTC
+--- chrome/browser/metrics/perf/cpu_identity.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/metrics/perf/cpu_identity.cc
-@@ -141,7 +141,7 @@ CPUIdentity GetCPUIdentity() {
+@@ -142,7 +142,7 @@ CPUIdentity GetCPUIdentity() {
    result.release =
  #if BUILDFLAG(IS_CHROMEOS_ASH)
        base::SysInfo::KernelVersion();
diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
index c5e5d9ac4baa..fd4f81fd8690 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
@@ -1,7 +1,7 @@
---- chrome/browser/metrics/power/process_monitor.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/metrics/power/process_monitor.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/metrics/power/process_monitor.cc
-@@ -61,7 +61,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
-   metrics.cpu_usage = process_metrics.GetPlatformIndependentCPUUsage();
+@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
+       process_metrics.GetPlatformIndependentCPUUsage());
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_AIX)
@@ -9,7 +9,7 @@
    metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -79,7 +79,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
+@@ -82,7 +82,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
    }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
    metrics->idle_wakeups *= factor;
  #endif
  
-@@ -167,7 +167,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+@@ -157,7 +157,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
    }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 411f8eb4831d..f2751c8149c5 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,15 +1,15 @@
---- chrome/browser/net/system_network_context_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/net/system_network_context_manager.cc
-@@ -94,7 +94,7 @@
+@@ -97,7 +97,7 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  #include "chrome/common/chrome_paths_internal.h"
  #include "chrome/grit/branded_strings.h"
  #include "ui/base/l10n/l10n_util.h"
-@@ -139,7 +139,7 @@ SystemNetworkContextManager* g_system_network_context_
+@@ -141,7 +141,7 @@ SystemNetworkContextManager* g_system_network_context_
  // received a failed launch for a sandboxed network service.
  bool g_previously_failed_to_launch_sandboxed_service = false;
  
@@ -18,7 +18,7 @@
  // Whether kerberos library loading will work in the network service due to the
  // sandbox.
  bool g_network_service_will_allow_gssapi_library_load = false;
-@@ -147,7 +147,7 @@ bool g_network_service_will_allow_gssapi_library_load 
+@@ -149,7 +149,7 @@ bool g_network_service_will_allow_gssapi_library_load 
  const char* kGssapiDesiredPref =
  #if BUILDFLAG(IS_CHROMEOS)
      prefs::kKerberosEnabled;
@@ -27,7 +27,7 @@
      prefs::kReceivedHttpAuthNegotiateHeader;
  #endif
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -193,7 +193,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -195,7 +195,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
    auth_dynamic_params->basic_over_http_enabled =
        local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
  
@@ -36,7 +36,7 @@
    auth_dynamic_params->delegate_by_kdc_policy =
        local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -208,7 +208,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -210,7 +210,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
        local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -45,7 +45,7 @@
    auth_dynamic_params->allow_gssapi_library_load =
        local_state->GetBoolean(kGssapiDesiredPref);
  #endif  // BUILDFLAG(IS_CHROMEOS)
-@@ -218,7 +218,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -220,7 +220,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
  
  void OnNewHttpAuthDynamicParams(
      network::mojom::HttpAuthDynamicParamsPtr& params) {
@@ -54,7 +54,7 @@
    // The kerberos library is incompatible with the network service sandbox, so
    // if library loading is now enabled, the network service needs to be
    // restarted. It will be restarted unsandboxed because is
-@@ -260,11 +260,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -262,11 +262,11 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    if (g_previously_failed_to_launch_sandboxed_service) {
      return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
    }
@@ -68,7 +68,7 @@
    // The network service sandbox and the kerberos library are incompatible.
    // If kerberos is enabled by policy, disable the network service sandbox.
    if (g_network_service_will_allow_gssapi_library_load ||
-@@ -280,7 +280,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+@@ -282,7 +282,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -77,7 +77,7 @@
    if (local_state &&
        local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
      return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
-@@ -510,7 +510,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+@@ -512,7 +512,7 @@ void SystemNetworkContextManager::DeleteInstance() {
    g_system_network_context_manager = nullptr;
  }
  
@@ -86,7 +86,7 @@
  SystemNetworkContextManager::GssapiLibraryLoadObserver::
      GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
      : owner_(owner) {}
-@@ -568,7 +568,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -570,7 +570,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
    pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
                               auth_pref_callback);
  
@@ -95,7 +95,7 @@
    pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -582,7 +582,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -584,7 +584,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
                               auth_pref_callback);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -104,7 +104,7 @@
    pref_change_registrar_.Add(kGssapiDesiredPref, auth_pref_callback);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
  
-@@ -608,7 +608,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -610,7 +610,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -113,7 +113,7 @@
    pref_change_registrar_.Add(
        prefs::kEnforceLocalAnchorConstraintsEnabled,
        base::BindRepeating(&SystemNetworkContextManager::
-@@ -663,7 +663,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -665,7 +665,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -122,7 +122,7 @@
    registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
                                  false);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -687,7 +687,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -689,7 +689,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
    registry->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, -1);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -131,7 +131,7 @@
    // Note that the default value is not relevant because the pref is only
    // evaluated when it is managed.
    registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
-@@ -696,11 +696,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -698,11 +698,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
  
    registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
  
@@ -145,7 +145,7 @@
    registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -753,7 +753,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+@@ -755,7 +755,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
    OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
    network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
  
@@ -154,7 +154,7 @@
    gssapi_library_loader_observer_.Install(network_service);
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -970,7 +970,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
+@@ -972,7 +972,7 @@ bool SystemNetworkContextManager::IsNetworkSandboxEnab
        break;
    }
  
@@ -163,7 +163,7 @@
    if (!enabled) {
      g_network_service_will_allow_gssapi_library_load = true;
    }
-@@ -1055,7 +1055,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
+@@ -1059,7 +1059,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
index 07f2ef79f77a..f4abe9f4e3cc 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/net/system_network_context_manager.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/net/system_network_context_manager.h
-@@ -200,7 +200,7 @@ class SystemNetworkContextManager {
+@@ -197,7 +197,7 @@ class SystemNetworkContextManager {
    class URLLoaderFactoryForSystem;
    class NetworkProcessLaunchWatcher;
  
@@ -9,7 +9,7 @@
    class GssapiLibraryLoadObserver
        : public network::mojom::GssapiLibraryLoadObserver {
     public:
-@@ -236,7 +236,7 @@ class SystemNetworkContextManager {
+@@ -233,7 +233,7 @@ class SystemNetworkContextManager {
    void UpdateExplicitlyAllowedNetworkPorts();
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,9 +18,9 @@
    // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
    // pref to the enforcement state.
    void UpdateEnforceLocalAnchorConstraintsEnabled();
-@@ -286,7 +286,7 @@ class SystemNetworkContextManager {
- 
+@@ -285,7 +285,7 @@ class SystemNetworkContextManager {
    std::unique_ptr<NetworkAnnotationMonitor> network_annotation_monitor_;
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
index 98758a0def30..c131229a2cec 100644
--- a/www/chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc
+++ b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_file__suggestion_drive__service.cc
@@ -1,5 +1,5 @@
---- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig	2023-09-13 12:11:42 UTC
-+++ chrome/browser/new_tab_page/modules/drive/drive_service.cc
+--- chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc.orig	2024-05-21 18:07:39 UTC
++++ chrome/browser/new_tab_page/modules/file_suggestion/drive_service.cc
 @@ -32,7 +32,7 @@
  #include "services/network/public/cpp/resource_request.h"
  
diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
index cf7943370f20..c779faae22d3 100644
--- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc
@@ -1,11 +1,11 @@
---- chrome/browser/notifications/notification_display_service_impl.cc.orig	2022-05-19 14:06:27 UTC
+--- chrome/browser/notifications/notification_display_service_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/notifications/notification_display_service_impl.cc
 @@ -32,7 +32,7 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #include "chrome/browser/sharing/sharing_notification_handler.h"
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
index 62e505acb141..005dd58be256 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -468,7 +468,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
+@@ -488,7 +488,7 @@ bool ChromePasswordManagerClient::ShowKeyboardReplacin
  
  bool ChromePasswordManagerClient::CanUseBiometricAuthForFilling(
      device_reauth::DeviceAuthenticator* authenticator) {
@@ -9,7 +9,7 @@
    if (!GetLocalStatePrefs() || !GetPrefs() || !authenticator) {
      return false;
    }
-@@ -691,7 +691,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
+@@ -712,7 +712,7 @@ void ChromePasswordManagerClient::NotifyUserCredential
  }
  
  void ChromePasswordManagerClient::NotifyKeychainError() {
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
index 9d3219e5320b..38c618548d81 100644
--- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc
@@ -1,7 +1,7 @@
---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/password_manager/password_reuse_manager_factory.cc
 @@ -137,7 +137,7 @@ PasswordReuseManagerFactory::BuildServiceInstanceForBr
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
index a6bc96224851..eb8f4bd68c0e 100644
--- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc
 @@ -50,7 +50,7 @@
  #include "chrome/browser/policy/browser_dm_token_storage_mac.h"
@@ -18,7 +18,7 @@
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h"
  #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
+@@ -87,7 +87,7 @@ void ChromeBrowserCloudManagementControllerDesktop::
  
  #if BUILDFLAG(IS_MAC)
    storage_delegate = std::make_unique<BrowserDMTokenStorageMac>();
@@ -27,7 +27,7 @@
    storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>();
  #elif BUILDFLAG(IS_WIN)
    storage_delegate = std::make_unique<BrowserDMTokenStorageWin>();
-@@ -261,7 +261,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
+@@ -255,7 +255,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC
  
  std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager>
  ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() {
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index 399f0811eb39..856fec1a3cc6 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -233,19 +233,20 @@
+@@ -234,19 +234,19 @@
  #include "components/spellcheck/browser/pref_names.h"
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -18,13 +18,12 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || \
-+    BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ||
-@@ -260,13 +261,13 @@
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+@@ -260,13 +260,13 @@
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -40,26 +39,26 @@
  #include "components/search_engines/site_search_policy_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS)
-@@ -868,7 +869,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -871,7 +871,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kManagedDefaultGeolocationSetting,
      base::Value::Type::INTEGER },
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
--    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
-+    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+-     || BUILDFLAG(IS_MAC)
++     || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    { key::kRequireOnlineRevocationChecksForLocalAnchors,
      prefs::kCertRevocationCheckingRequiredLocalAnchors,
      base::Value::Type::BOOLEAN },
-@@ -878,7 +879,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -880,7 +880,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif  // #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-         // || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC)
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
--    || BUILDFLAG(IS_FUCHSIA)
-+    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+         // || BUILDFLAG(IS_WIN)  || BUILDFLAG(IS_MAC)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    { key::kFullscreenAllowed,
      prefs::kFullscreenAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1657,7 +1658,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-   },
+@@ -1664,7 +1664,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX)
@@ -67,7 +66,7 @@
    { key::kGSSAPILibraryName,
      prefs::kGSSAPILibraryName,
      base::Value::Type::STRING },
-@@ -1705,7 +1706,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1715,7 +1715,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -76,7 +75,7 @@
    { key::kNetworkServiceSandboxEnabled,
      prefs::kNetworkServiceSandboxEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1731,12 +1732,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1741,12 +1741,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      prefs::kTotalMemoryLimitMb,
      base::Value::Type::INTEGER },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -91,25 +90,25 @@
    { key::kUnmanagedDeviceSignalsConsentFlowEnabled,
      device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1748,7 +1749,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     base::Value::Type::STRING },
+@@ -1754,7 +1754,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     prefs::kProfileSeparationDomainExceptionList,
+     base::Value::Type::LIST },
  #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
--    || BUILDFLAG(IS_FUCHSIA)
-+    || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kDefaultBrowserSettingEnabled,
      prefs::kDefaultBrowserSettingEnabled,
      base::Value::Type::BOOLEAN },
-@@ -1761,7 +1762,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1766,7 +1766,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-         // || BUILDFLAG(IS_FUCHSIA)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \
--    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    || BUILDFLAG(IS_CHROMEOS)
++    || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kAutoplayAllowed,
      prefs::kAutoplayAllowed,
      base::Value::Type::BOOLEAN },
-@@ -1862,7 +1863,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1867,7 +1867,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::BOOLEAN },
  #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
  
@@ -118,16 +117,16 @@
    { key::kAlternativeBrowserPath,
      browser_switcher::prefs::kAlternativeBrowserPath,
      base::Value::Type::STRING },
-@@ -1969,7 +1970,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1972,7 +1972,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      base::Value::Type::LIST },
- #endif  // BUILDFLAG(IS_CHROMEOS)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    { key::kAuthNegotiateDelegateByKdcPolicy,
      prefs::kAuthNegotiateDelegateByKdcPolicy,
      base::Value::Type::BOOLEAN },
-@@ -1994,7 +1995,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -1997,7 +1997,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
  #endif // BUILDFLAG(ENABLE_EXTENSIONS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -136,7 +135,7 @@
    { key::kEnforceLocalAnchorConstraintsEnabled,
      prefs::kEnforceLocalAnchorConstraintsEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2052,7 +2053,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2055,7 +2055,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      ash::prefs::kUrlParameterToAutofillSAMLUsername,
      base::Value::Type::STRING },
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -145,25 +144,25 @@
    { key::kTabDiscardingExceptions,
      performance_manager::user_tuning::prefs::kManagedTabDiscardingExceptions,
      base::Value::Type::LIST },
-@@ -2080,7 +2081,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     prefs::kCloudApAuthEnabled,
-     base::Value::Type::INTEGER },
+@@ -2084,7 +2084,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     prefs::kUiAutomationProviderEnabled,
+     base::Value::Type::BOOLEAN },
  #endif  // BUILDFLAG(IS_WIN)
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kOutOfProcessSystemDnsResolutionEnabled,
      prefs::kOutOfProcessSystemDnsResolutionEnabled,
      base::Value::Type::BOOLEAN },
-@@ -2109,7 +2110,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
-     prefs::kManagedPrivateNetworkAccessRestrictionsEnabled,
-     base::Value::Type::BOOLEAN },
+@@ -2118,7 +2118,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+     base::Value::Type::INTEGER },
+ #endif
  #if BUILDFLAG(ENABLE_EXTENSIONS)
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    { key::kExtensionInstallTypeBlocklist,
      extensions::pref_names::kExtensionInstallTypeBlocklist,
      base::Value::Type::LIST},
-@@ -2130,7 +2131,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
+@@ -2139,7 +2139,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = 
      optimization_guide::model_execution::prefs::kWallpaperSearchEnterprisePolicyAllowed,
      base::Value::Type::INTEGER},
  #endif
@@ -172,16 +171,16 @@
    { key::kChromeForTestingAllowed,
      prefs::kChromeForTestingAllowed,
      base::Value::Type::BOOLEAN },
-@@ -2251,7 +2252,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2267,7 +2267,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    // Policies for all platforms - End
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_ASH)
 +    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(
-       std::make_unique<performance_manager::MemorySaverPolicyHandler>());
-   // Note: This needs to be created after `DefaultSearchPolicyHandler`.
-@@ -2259,7 +2260,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+   handlers->AddHandler(std::make_unique<IntRangePolicyHandler>(
+       key::kMemorySaverModeSavings,
+       performance_manager::user_tuning::prefs::kMemorySaverModeAggressiveness,
+@@ -2283,7 +2283,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
          // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -190,7 +189,7 @@
    handlers->AddHandler(
        std::make_unique<SiteSearchPolicyHandler>(chrome_schema));
  
-@@ -2468,7 +2469,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2489,7 +2489,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -199,7 +198,7 @@
    handlers->AddHandler(
        std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
    handlers->AddHandler(
-@@ -2526,7 +2527,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2547,7 +2547,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
        key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
        chrome_schema));
  
@@ -208,16 +207,7 @@
    handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
    handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
    handlers->AddHandler(
-@@ -2575,7 +2576,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
-           SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED,
-           SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)));
- 
--#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   handlers->AddHandler(
-       std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2613,7 +2614,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2661,7 +2661,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
    std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
        signin_legacy_policies;
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -226,7 +216,7 @@
    signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
        key::kForceBrowserSignin, prefs::kForceBrowserSignin,
        base::Value::Type::BOOLEAN));
-@@ -2970,7 +2971,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3018,7 +3018,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif
  
  #if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -235,7 +225,7 @@
    handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
    handlers->AddHandler(
        std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2978,7 +2979,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -3026,7 +3026,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
@@ -244,16 +234,16 @@
    handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
        key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
        base::Value::Type::BOOLEAN));
-@@ -2995,7 +2996,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
-       /*new_policy_handler=*/std::make_unique<
+@@ -3044,7 +3044,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            first_party_sets::FirstPartySetsOverridesPolicyHandler>(
            key::kRelatedWebsiteSetsOverrides, chrome_schema)));
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    handlers->AddHandler(std::make_unique<PrivacySandboxPolicyHandler>());
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -3022,7 +3023,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+@@ -3067,7 +3067,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
            base::Value::Type::BOOLEAN)));
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
index 90e7b8d7afcc..47328c771d14 100644
--- a/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2023-10-11 18:22:24 UTC
+--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/policy/policy_value_and_status_aggregator.cc
 @@ -53,7 +53,7 @@
  #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
@@ -9,12 +9,3 @@
  #include "components/policy/core/common/cloud/profile_cloud_policy_manager.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  
-@@ -99,7 +99,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
- #else  // BUILDFLAG(IS_CHROMEOS_ASH)
-   policy::CloudPolicyManager* cloud_policy_manager =
-       profile->GetUserCloudPolicyManager();
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!cloud_policy_manager) {
-     cloud_policy_manager = profile->GetProfileCloudPolicyManager();
-   }
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index de849528cb42..12b6c2071fdc 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2024-05-01 07:03:57 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
-@@ -488,18 +488,18 @@
+@@ -489,18 +489,18 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
  #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
@@ -18,11 +18,11 @@
  #endif
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) 
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #endif
  
-@@ -534,7 +534,7 @@
+@@ -535,7 +535,7 @@
  #include "chrome/browser/sessions/session_service_log.h"
  #endif
  
@@ -31,16 +31,16 @@
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1722,7 +1722,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
-   registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
- #endif
+@@ -1861,7 +1861,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+                                 true);
+ #endif  // BUILDFLAG(ENABLE_PDF)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2067,12 +2067,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -2213,12 +2213,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
index 2d0b781e49c8..1ef535cc7643 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -1,4 +1,4 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
 @@ -184,7 +184,7 @@ const char* const kPersistentPrefNames[] = {
      prefs::kShowFullscreenToolbar,
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index 5f8466eaf8aa..aee535df533e 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  #include "printing/printing_context.h"
  #include "printing/printing_features.h"
  
@@ -9,7 +9,7 @@
  #include "content/public/common/content_switches.h"
  #endif
  
-@@ -861,7 +861,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
+@@ -862,7 +862,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
          host.BindNewPipeAndPassReceiver(),
          content::ServiceProcessHost::Options()
              .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
@@ -18,7 +18,7 @@
              .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
  #endif
              .Pass());
-@@ -1038,7 +1038,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -1039,7 +1039,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
        return kNoClientsRegisteredResetOnIdleTimeout;
  
      case ClientType::kQueryWithUi:
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index 3a73d18b0cbf..e2b4846052ba 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -321,7 +321,7 @@
+@@ -329,7 +329,7 @@
  #include "chromeos/constants/chromeos_features.h"
  #endif
  
@@ -9,8 +9,8 @@
  #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event_factory.h"
  #endif
  
-@@ -412,18 +412,18 @@
- 
+@@ -413,18 +413,18 @@
+ #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS_ASH)
@@ -31,7 +31,7 @@
  #include "chrome/browser/browser_switcher/browser_switcher_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_provisioning_service_factory.h"
  #include "chrome/browser/enterprise/client_certificates/certificate_store_factory.h"
-@@ -658,7 +658,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -660,7 +660,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    DiceBoundSessionCookieServiceFactory::GetInstance();
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
  #endif  // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
@@ -40,7 +40,7 @@
    browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
  #endif
    browser_sync::UserEventServiceFactory::GetInstance();
-@@ -781,29 +781,29 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -785,29 +785,29 @@ void ChromeBrowserMainExtraPartsProfiles::
    enterprise_commands::UserRemoteCommandsServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -76,16 +76,16 @@
    enterprise_signin::EnterpriseSigninServiceFactory::GetInstance();
  #endif
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
-@@ -927,7 +927,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -933,7 +933,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
    metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
  #endif
-@@ -1034,7 +1034,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1038,7 +1038,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if BUILDFLAG(IS_CHROMEOS)
    policy::PolicyCertServiceFactory::GetInstance();
  #endif
@@ -94,7 +94,7 @@
    policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
    policy::UserPolicyOidcSigninServiceFactory::GetInstance();
  #endif
-@@ -1076,7 +1076,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1080,7 +1080,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
    ProfileStatisticsFactory::GetInstance();
  #endif
@@ -103,7 +103,7 @@
    ProfileTokenWebSigninInterceptorFactory::GetInstance();
    OidcAuthenticationSigninInterceptorFactory::GetInstance();
  #endif
-@@ -1095,7 +1095,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -1099,7 +1099,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
    ReduceAcceptLanguageFactory::GetInstance();
    RendererUpdaterFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index 3ab54b78c268..7f5a6d67e465 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/profiles/profile_impl.cc
-@@ -267,6 +267,10 @@
+@@ -262,6 +262,10 @@
  #include "chrome/browser/spellchecker/spellcheck_service.h"
  #endif
  
@@ -11,7 +11,7 @@
  using bookmarks::BookmarkModel;
  using content::BrowserThread;
  using content::DownloadManagerDelegate;
-@@ -600,7 +604,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
+@@ -596,7 +600,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
  #else
    {
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -20,7 +20,7 @@
      ProfileManager* profile_manager = g_browser_process->profile_manager();
      ProfileAttributesEntry* entry =
          profile_manager->GetProfileAttributesStorage()
-@@ -893,7 +897,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
+@@ -890,7 +894,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) 
  }
  
  base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
index a8a348758282..6938f63c32d3 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
 @@ -18,7 +18,7 @@
  #include "net/base/url_util.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
  #endif
  
-@@ -417,7 +417,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
+@@ -434,7 +434,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
      Profile* profile,
      const enterprise_connectors::AnalysisSettings& settings) {
    // Local content analysis is supported only on desktop platforms.
diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
index 2d0449a4bade..e0021e464432 100644
--- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
+++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__install__state.cc
@@ -1,6 +1,6 @@
---- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/screen_ai/screen_ai_install_state.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/screen_ai/screen_ai_install_state.cc
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  #include "services/screen_ai/public/cpp/utilities.h"
  #include "ui/accessibility/accessibility_features.h"
  
@@ -9,12 +9,12 @@
  #include "base/cpu.h"
  #include "base/files/file_util.h"
  #endif
-@@ -35,7 +35,7 @@ const char kMinExpectedVersion[] = "123.1";
+@@ -32,7 +32,7 @@ const int kScreenAICleanUpDelayInDays = 30;
+ const char kMinExpectedVersion[] = "123.1";
+ 
  bool IsDeviceCompatible() {
-   // Check if the CPU has the required instruction set to run the Screen AI
-   // library.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (!base::CPU().has_sse41()) {
-     return false;
-   }
+ #if defined(ARCH_CPU_X86_FAMILY)
+   // Check if the CPU has the required instruction set to run the Screen AI
+   // library.
diff --git a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
index e9a16d721dbc..02340336a6e4 100644
--- a/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
+++ b/www/chromium/files/patch-chrome_browser_screen__ai_screen__ai__service__router.cc
@@ -1,6 +1,6 @@
---- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/screen_ai/screen_ai_service_router.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/screen_ai/screen_ai_service_router.cc
-@@ -281,7 +281,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -280,7 +280,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
    base::FilePath binary_path = state_instance->get_component_binary_path();
  #if BUILDFLAG(IS_WIN)
    std::vector<base::FilePath> preload_libraries = {binary_path};
@@ -9,7 +9,7 @@
    std::vector<std::string> extra_switches = {
        base::StringPrintf("--%s=%s", screen_ai::GetBinaryPathSwitch(),
                           binary_path.MaybeAsASCII().c_str())};
-@@ -295,7 +295,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
+@@ -294,7 +294,7 @@ void ScreenAIServiceRouter::LaunchIfNotRunning() {
            .WithPreloadedLibraries(
                preload_libraries,
                content::ServiceProcessHostPreloadLibraries::GetPassKey())
diff --git a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc
deleted file mode 100644
index 134908a9fb0b..000000000000
--- a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__client__side__trial.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc.orig	2024-02-23 21:04:38 UTC
-+++ chrome/browser/search_engine_choice/search_engine_choice_client_side_trial.cc
-@@ -132,7 +132,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* regis
- void SetUpIfNeeded(const base::FieldTrial::EntropyProvider& entropy_provider,
-                    base::FeatureList* feature_list,
-                    PrefService* local_state) {
--#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-   // Platform not in scope for this client-side trial.
-   return;
- #else
diff --git a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc b/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc
deleted file mode 100644
index 6772968fcc25..000000000000
--- a/www/chromium/files/patch-chrome_browser_search__engine__choice_search__engine__choice__service__factory.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc.orig	2024-02-23 21:04:38 UTC
-+++ chrome/browser/search_engine_choice/search_engine_choice_service_factory.cc
-@@ -11,7 +11,7 @@
- #include "components/country_codes/country_codes.h"
- #include "components/search_engines/search_engine_choice/search_engine_choice_service.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/browser_process.h"
- #include "components/variations/service/variations_service.h"
- #endif
-@@ -21,7 +21,7 @@ namespace {
- std::unique_ptr<KeyedService> BuildSearchEngineChoiceService(
-     content::BrowserContext* context) {
-   int variations_country_id = country_codes::kCountryIDUnknown;
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (g_browser_process->variations_service()) {
-     variations_country_id =
-         country_codes::CountryStringToCountryID(base::ToUpperASCII(
diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
index 943f7cc57732..659c452c1a4b 100644
--- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
+++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc
@@ -1,11 +1,11 @@
---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc
 @@ -15,7 +15,7 @@
  #include "components/send_tab_to_self/features.h"
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h"
  #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h"
  #endif
@@ -13,8 +13,8 @@
  ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile(
      Profile* profile) {
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    for (const std::unique_ptr<ReceivingUiHandler>& handler :
         applicable_handlers_) {
      auto* button_controller =
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
index d3f31c85c9ce..809f628153f2 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/sharing/sharing_handler_registry_impl.cc
-@@ -23,7 +23,7 @@
+@@ -22,7 +22,7 @@
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,8 +9,8 @@
  #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h"
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS)
-@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
-   }
+@@ -74,7 +74,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_shortcuts_icon__badging.cc b/www/chromium/files/patch-chrome_browser_shortcuts_icon__badging.cc
new file mode 100644
index 000000000000..0d25cdec5842
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_shortcuts_icon__badging.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/shortcuts/icon_badging.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/shortcuts/icon_badging.cc
+@@ -59,7 +59,7 @@ enum class BadgeSize {
+ constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {
+     ShortcutSize::k16, ShortcutSize::k32, ShortcutSize::k128,
+     ShortcutSize::k256, ShortcutSize::k512};
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr ShortcutSize kSizesNeededForShortcutCreation[] = {ShortcutSize::k32,
+                                                             ShortcutSize::k128};
+ #elif BUILDFLAG(IS_WIN)
diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
index dad1c4fc114b..ed0df4cb6f7f 100644
--- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
+++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/signin/signin_util.cc.orig	2023-11-03 10:09:45 UTC
+--- chrome/browser/signin/signin_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/signin/signin_util.cc
-@@ -75,7 +75,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
+@@ -80,7 +80,7 @@ CookiesMover::CookiesMover(base::WeakPtr<Profile> sour
  CookiesMover::~CookiesMover() = default;
  
  void CookiesMover::StartMovingCookies() {
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
index 54cd329bac0b..68e314fac116 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_delegate_impl.cc
-@@ -180,7 +180,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
+@@ -185,7 +185,7 @@ void SupervisedUserExtensionsDelegateImpl::RequestExte
        return;
      }
    }
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
index 8a53ba975513..89e2f9d279a9 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.cc
-@@ -305,7 +305,7 @@ void SupervisedUserExtensionsManager::
+@@ -353,7 +353,7 @@ void SupervisedUserExtensionsManager::
      ActivateManagementPolicyAndUpdateRegistration() {
    SetActiveForSupervisedUsers();
    UpdateManagementPolicyRegistration();
@@ -9,7 +9,7 @@
    MaybeMarkExtensionsLocallyParentApproved();
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
  }
-@@ -417,7 +417,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
+@@ -470,7 +470,7 @@ bool SupervisedUserExtensionsManager::ShouldBlockExten
    return false;
  }
  
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void SupervisedUserExtensionsManager::
      MaybeMarkExtensionsLocallyParentApproved() {
-   if (!is_active_policy_for_supervised_users_) {
+   supervised_user::LocallyParentApprovedExtensionsMigrationState
diff --git a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
index cdc61fa4d409..4ec79e3cd212 100644
--- a/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
+++ b/www/chromium/files/patch-chrome_browser_supervised__user_supervised__user__extensions__manager.h
@@ -1,6 +1,6 @@
---- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/supervised_user/supervised_user_extensions_manager.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/supervised_user/supervised_user_extensions_manager.h
-@@ -143,7 +143,7 @@ class SupervisedUserExtensionsManager : public Extensi
+@@ -147,7 +147,7 @@ class SupervisedUserExtensionsManager : public Extensi
    // launched.
    bool ShouldBlockExtension(const std::string& extension_id) const;
  
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
index 38cdbf57b259..a01a56ffc0fc 100644
--- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/sync/chrome_sync_client.cc
-@@ -112,7 +112,7 @@
+@@ -116,7 +116,7 @@
  #endif  // BUILDFLAG(ENABLE_SPELLCHECK)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -8,17 +8,17 @@
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -460,7 +460,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
+ #elif BUILDFLAG(IS_ANDROID)
+@@ -474,7 +474,7 @@ ChromeSyncClient::CreateModelTypeControllers(
+     // platforms.
+     bool enable_tab_group_sync = false;
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     if (base::FeatureList::IsEnabled(features::kTabGroupsSave)) {
-       controllers.push_back(std::make_unique<syncer::ModelTypeController>(
-           syncer::SAVED_TAB_GROUP,
-@@ -473,7 +473,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+     enable_tab_group_sync = true;
+ #elif BUILDFLAG(IS_ANDROID)
+     enable_tab_group_sync = tab_groups::IsTabGroupSyncEnabled(GetPrefService());
+@@ -506,7 +506,7 @@ ChromeSyncClient::CreateModelTypeControllers(
  
  // Chrome prefers OS provided spell checkers where they exist. So only sync the
  // custom dictionary on platforms that typically don't provide one.
@@ -27,12 +27,12 @@
      // Dictionary sync is enabled by default.
      if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
        controllers.push_back(
-@@ -629,7 +629,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
- ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
+@@ -663,7 +663,7 @@ ChromeSyncClient::GetControllerDelegateForModelType(sy
    switch (type) {
+     case syncer::SAVED_TAB_GROUP: {
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-     case syncer::SAVED_TAB_GROUP: {
-       DCHECK(base::FeatureList::IsEnabled(features::kTabGroupsSave));
-       return tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_)
+       auto* keyed_service =
+           tab_groups::SavedTabGroupServiceFactory::GetForProfile(profile_);
+       CHECK(keyed_service);
diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
index 39332951f80b..7e2d92c63f09 100644
--- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
@@ -1,7 +1,7 @@
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- chrome/browser/sync/device_info_sync_client_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/sync/device_info_sync_client_impl.cc
 @@ -41,7 +41,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
- // in lacros-chrome once build flag switch of lacros-chrome is
+ // included in lacros-chrome once build flag switch of lacros-chrome is
  // complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
index 78a5549e0814..63ec3bba7f69 100644
--- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,16 +1,16 @@
---- chrome/browser/sync/sync_service_factory.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/sync/sync_service_factory.cc
-@@ -84,7 +84,7 @@
+@@ -82,7 +82,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-         // BUILDFLAG(IS_WIN)
-@@ -130,7 +130,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
- // TODO(crbug.com/1052397): Reassess whether the following block needs to be
+ #elif BUILDFLAG(IS_ANDROID)
+ #include "chrome/browser/tab_group_sync/tab_group_sync_service_factory.h"
+@@ -133,7 +133,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+ // TODO(crbug.com/40118868): Reassess whether the following block needs to be
  // included in lacros-chrome once build flag switch of lacros-chrome is
  // complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
@@ -18,12 +18,12 @@
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
    syncer::SyncPrefs prefs(profile->GetPrefs());
    local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -264,7 +264,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -269,7 +269,7 @@ SyncServiceFactory::SyncServiceFactory()
    DependsOn(ProfilePasswordStoreFactory::GetInstance());
    DependsOn(PowerBookmarkServiceFactory::GetInstance());
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
 -    BUILDFLAG(IS_WIN)
 +    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
    DependsOn(tab_groups::SavedTabGroupServiceFactory::GetInstance());
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-         // BUILDFLAG(IS_WIN)
+ #elif BUILDFLAG(IS_ANDROID)
+   DependsOn(tab_groups::TabGroupSyncServiceFactory::GetInstance());
diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc
index 466910d9f989..1ead398ac2f1 100644
--- a/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/sync/sync_service_util.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/sync/sync_service_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/sync/sync_service_util.cc
 @@ -9,7 +9,7 @@
  #include "components/sync/base/features.h"
@@ -9,7 +9,7 @@
  #include "components/variations/service/variations_service.h"
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
          // BUILDFLAG(IS_WIN)
-@@ -22,7 +22,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() {
+@@ -21,7 +21,7 @@ bool IsDesktopEnUSLocaleOnlySyncPollFeatureEnabled() {
    }
  
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
index 2b148dfd9876..8cf6eed26a2f 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/themes/theme_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/themes/theme_service.cc
-@@ -74,7 +74,7 @@
+@@ -73,7 +73,7 @@
  #include "extensions/browser/extension_registry_observer.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -330,7 +330,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
+@@ -329,7 +329,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() 
  }
  
  bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
index b83646b2728b..c4c38b2cbbec 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc
@@ -1,8 +1,8 @@
---- chrome/browser/themes/theme_service_factory.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/themes/theme_service_factory.cc
 @@ -27,11 +27,11 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -25,7 +25,7 @@
  
 @@ -117,9 +117,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
index adbbc76dea07..f9514f08390a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
+++ b/www/chromium/files/patch-chrome_browser_ui_actions_chrome__action__id.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/actions/chrome_action_id.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/actions/chrome_action_id.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/actions/chrome_action_id.h
-@@ -510,7 +510,7 @@
+@@ -518,7 +518,7 @@
      IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_ANSWER) \
    E(kActionContentContextQuickAnswersInlineQuery, \
      IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY)
diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
index 7a0eecf699ce..6bf2a58e2bb6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.cc
-@@ -25,7 +25,7 @@ namespace autofill::payments {
+@@ -47,7 +47,7 @@ gfx::Rect GetPopupSizeForVcn3ds() {
  DesktopPaymentsWindowManager::DesktopPaymentsWindowManager(
      ContentAutofillClient* client)
      : client_(CHECK_DEREF(client)) {
@@ -9,7 +9,7 @@
    scoped_observation_.Observe(BrowserList::GetInstance());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
  }
-@@ -48,7 +48,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
+@@ -90,7 +90,7 @@ void DesktopPaymentsWindowManager::WebContentsDestroye
    }
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
index 2561cb2fb1de..1de1c40d6338 100644
--- a/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
+++ b/www/chromium/files/patch-chrome_browser_ui_autofill_payments_desktop__payments__window__manager.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/autofill/payments/desktop_payments_window_manager.h
-@@ -11,7 +11,7 @@
+@@ -14,7 +14,7 @@
  #include "components/autofill/core/browser/payments/payments_window_manager.h"
  #include "content/public/browser/web_contents_observer.h"
  
@@ -9,7 +9,7 @@
  #include "base/scoped_observation.h"
  #include "chrome/browser/ui/browser_list.h"
  #include "chrome/browser/ui/browser_list_observer.h"
-@@ -30,7 +30,7 @@ namespace payments {
+@@ -39,7 +39,7 @@ class PaymentsWindowUserConsentDialogControllerImpl;
  // WebContents of the original tab that the pop-up is created in. If there is a
  // pop-up currently present, `this` will observe the WebContents of that pop-up.
  class DesktopPaymentsWindowManager : public PaymentsWindowManager,
@@ -18,8 +18,8 @@
                                       public BrowserListObserver,
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
                                       public content::WebContentsObserver {
-@@ -47,7 +47,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
-   // content::WebContentsObserver:
+@@ -58,7 +58,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
+       content::NavigationHandle* navigation_handle) override;
    void WebContentsDestroyed() override;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -27,9 +27,9 @@
    // BrowserListObserver:
    void OnBrowserSetLastActive(Browser* browser) override;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-@@ -99,7 +99,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
-   // ContentAutofillClient that owns `this`.
-   const raw_ref<ContentAutofillClient> client_;
+@@ -132,7 +132,7 @@ class DesktopPaymentsWindowManager : public PaymentsWi
+   std::unique_ptr<PaymentsWindowUserConsentDialogControllerImpl>
+       payments_window_user_consent_dialog_controller_;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h
index e698696bd0df..77557745810b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser.h.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/browser.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/browser.h
-@@ -309,7 +309,7 @@ class Browser : public TabStripModelObserver,
+@@ -329,7 +329,7 @@ class Browser : public TabStripModelObserver,
      std::optional<int64_t> display_id;
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index dd887960eb63..757bcb39376f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/browser_command_controller.cc
-@@ -121,7 +121,7 @@
+@@ -127,7 +127,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/text_input_flags.h"
  #include "ui/linux/linux_ui.h"
  #endif
-@@ -303,7 +303,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -309,7 +309,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
  #endif
    }
  
@@ -18,16 +18,16 @@
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    auto* linux_ui = ui::LinuxUi::instance();
-@@ -555,7 +555,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
      case IDC_MINIMIZE_WINDOW:
        browser_->window()->Minimize();
        break;
-@@ -567,7 +567,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
        break;
  #endif
  
@@ -36,9 +36,18 @@
      case IDC_USE_SYSTEM_TITLE_BAR: {
        PrefService* prefs = profile()->GetPrefs();
        prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -1231,12 +1231,12 @@ void BrowserCommandController::InitCommandState() {
+@@ -767,7 +767,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+       break;
+     case IDC_CREATE_SHORTCUT:
+       base::RecordAction(base::UserMetricsAction("CreateShortcut"));
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       if (base::FeatureList::IsEnabled(features::kShortcutsNotApps)) {
+         chrome::CreateDesktopShortcutForActiveWebContents(browser_);
+       } else {
+@@ -1270,12 +1270,12 @@ void BrowserCommandController::InitCommandState() {
  #endif
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
index 3586e16b8daf..2145136c91d6 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__ui__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_ui_prefs.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/browser_ui_prefs.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/browser_ui_prefs.cc
-@@ -168,7 +168,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
+@@ -175,7 +175,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistry
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeFallbacks);
    registry->RegisterDictionaryPref(prefs::kHttpsUpgradeNavigations);
    registry->RegisterBooleanPref(prefs::kHttpsOnlyModeAutoEnabled, false);
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index 087e88eacb45..3406b0710a3c 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/chrome_pages.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/chrome_pages.cc
-@@ -82,7 +82,7 @@
+@@ -86,7 +86,7 @@
+ #include "components/signin/public/identity_manager/identity_manager.h"
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/web_applications/web_app_utils.h"
  #endif
  
-@@ -716,7 +716,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -719,7 +719,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  }
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void ShowWebAppSettingsImpl(Browser* browser,
                              Profile* profile,
                              const std::string& app_id,
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
index b0a0b1cc29f9..6f5d4b15a433 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,20 +1,20 @@
---- chrome/browser/ui/chrome_pages.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/chrome_pages.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/chrome_pages.h
-@@ -38,7 +38,7 @@ enum class ConsentLevel;
+@@ -39,7 +39,7 @@ namespace signin {
+ enum class ConsentLevel;
  }  // namespace signin
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  namespace web_app {
  enum class AppSettingsPageEntryPoint;
  }  // namespace web_app
-@@ -262,7 +262,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+@@ -196,7 +196,7 @@ void ShowShortcutCustomizationApp(Profile* profile,
+                                   const std::string& category);
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Show chrome://app-settings/<app-id> page.
  void ShowWebAppSettings(Browser* browser,
                          const std::string& app_id,
diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
deleted file mode 100644
index d7e06cd7da05..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2023-11-03 10:09:45 UTC
-+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
-@@ -19,7 +19,7 @@
- 
- // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
- // here.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const int ExclusiveAccessBubble::kPaddingPx = 8;
- #else
- const int ExclusiveAccessBubble::kPaddingPx = 15;
diff --git a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
index 4c2ab86e90f7..24a7420bda47 100644
--- a/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
-@@ -1989,7 +1989,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
-                  OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
-              ? omnibox::kShareWinChromeRefreshIcon
-              : omnibox::kShareWinIcon;
+@@ -1978,7 +1978,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
+   return omnibox::kShareMacChromeRefreshIcon;
+ #elif BUILDFLAG(IS_WIN)
+   return omnibox::kShareWinChromeRefreshIcon;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   return OmniboxFieldTrial::IsChromeRefreshIconsEnabled() ||
-                  OmniboxFieldTrial::IsChromeRefreshActionChipIconsEnabled()
-              ? omnibox::kShareLinuxChromeRefreshIcon
+   return omnibox::kShareLinuxChromeRefreshIcon;
+ #else
+   return omnibox::kShareChromeRefreshIcon;
diff --git a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
index e3cbf96a4300..f91070cd4d5e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_passwords_manage__passwords__ui__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/passwords/manage_passwords_ui_controller.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
-@@ -88,7 +88,7 @@ int ManagePasswordsUIController::save_fallback_timeout
+@@ -92,7 +92,7 @@ int ManagePasswordsUIController::save_fallback_timeout
  
  namespace {
  
@@ -9,7 +9,7 @@
  // Should be kept in sync with constant declared in
  // bubble_controllers/relaunch_chrome_bubble_controller.cc.
  constexpr int kMaxNumberOfTimesKeychainErrorBubbleIsShown = 3;
-@@ -477,7 +477,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
+@@ -475,7 +475,7 @@ void ManagePasswordsUIController::OnBiometricAuthBefor
  }
  
  void ManagePasswordsUIController::OnKeychainError() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
index fd03ba152ecd..4c4eb52ca760 100644
--- a/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
+++ b/www/chromium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2023-04-05 11:05:06 UTC
+--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h
-@@ -37,7 +37,7 @@ class SharingHubBubbleController {
+@@ -36,7 +36,7 @@ class SharingHubBubbleController {
+   // Returns true if the omnibox icon should be shown.
    virtual bool ShouldOfferOmniboxIcon() = 0;
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // This method returns the set of first-party actions, which are actions
    // internal to Chrome. Third-party actions (those outside Chrome) are
    // currently not supported.
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
index 61734cc5ff21..648b44499e2b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin/signin_view_controller.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/signin/signin_view_controller.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/signin/signin_view_controller.cc
-@@ -255,7 +255,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
+@@ -334,7 +334,7 @@ void SigninViewController::ShowModalManagedUserNoticeD
      bool show_link_data_option,
      signin::SigninChoiceCallback callback) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index fb5f9199f7ca..b358ae41f3ed 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -105,7 +105,7 @@ const char* const kBadFlags[] = {
+@@ -107,7 +107,7 @@ const char* const kBadFlags[] = {
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 2895f4aec714..5cad80d82139 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -135,7 +135,7 @@
+@@ -136,7 +136,7 @@
  #include "chrome/credential_provider/common/gcp_strings.h"
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/headless/headless_mode_util.h"
  #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
  #include "components/headless/policy/headless_mode_policy.h"
-@@ -962,7 +962,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -965,7 +965,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
    TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
    ComputeAndRecordLaunchMode(command_line);
  
@@ -18,7 +18,7 @@
    if (headless::IsHeadlessMode() &&
        headless::HeadlessModePolicy::IsHeadlessModeDisabled(
            g_browser_process->local_state())) {
-@@ -1060,7 +1060,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1078,7 +1078,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
      silent_launch = true;
    }
  
@@ -27,7 +27,7 @@
    // Writes open and installed web apps to the specified file without
    // launching a new browser window or tab.
    if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1270,7 +1270,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1288,7 +1288,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
      CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow)
          << "Failed launch with app: couldn't pick a profile";
      std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId);
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
index 0c446528c9c0..39052199a21b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
-@@ -261,7 +261,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+@@ -233,7 +233,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
      // at the state of the MessageLoop.
      Browser::CreateParams params = Browser::CreateParams(profile_, false);
      params.creation_source = Browser::CreationSource::kStartupCreator;
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 7003f7c1edb3..60bf751d5449 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,16 +1,16 @@
---- chrome/browser/ui/tab_helpers.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/tab_helpers.cc
-@@ -233,7 +233,7 @@
+@@ -241,7 +241,7 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
  #include "chrome/browser/ui/browser_finder.h"
  #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -673,12 +673,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -696,12 +696,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
index 5e5fa24fb11f..fe117dd3262b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/task_manager/task_manager_table_model.cc
 @@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r
            ? stringifier_->backgrounded_string()
@@ -18,7 +18,7 @@
      case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
        const int proc1_fd_count =
            observed_task_manager()->GetOpenFdCount(tasks_[row1]);
-@@ -799,7 +799,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
+@@ -806,7 +806,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col
        type = REFRESH_TYPE_KEEPALIVE_COUNT;
        break;
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc b/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
index d5be3643cdb5..2cc2284a71b0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/test/popup_browsertest.cc.orig	2023-07-16 15:47:57 UTC
+--- chrome/browser/ui/test/popup_browsertest.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/test/popup_browsertest.cc
 @@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo
    const display::Display display = GetDisplayNearestBrowser(popup);
@@ -6,7 +6,7 @@
    expected.AdjustToFit(display.work_area());
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate.
+   // TODO(crbug.com/40815883) Desktop Linux window bounds are inaccurate.
    expected.Outset(50);
    EXPECT_TRUE(expected.Contains(popup->window()->GetBounds()))
 @@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent
@@ -15,6 +15,6 @@
      gfx::Rect work_area(display.work_area());
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the
+     // TODO(crbug.com/40815883) Desktop Linux bounds flakily extend outside the
      // work area on trybots, when opening with excessive width and height, e.g.:
      // width=${screen.availWidth+300},height=${screen.availHeight+300} yields:
diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
index 63ca2f127a35..90163ad92783 100644
--- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
@@ -1,17 +1,17 @@
---- chrome/browser/ui/test/test_browser_ui.cc.orig	2023-08-17 07:33:31 UTC
+--- chrome/browser/ui/test/test_browser_ui.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/test/test_browser_ui.cc
 @@ -22,7 +22,7 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
      (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
  #include "content/public/common/content_switches.h"
  #include "ui/base/test/skia_gold_matching_algorithm.h"
-@@ -35,7 +35,7 @@
- // TODO(https://crbug.com/958242) support Mac for pixel tests.
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+@@ -39,7 +39,7 @@
+ // TODO(crbug.com/40625383) support Mac for pixel tests.
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
index 98df7877f2ef..132a00e6f70b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/ui_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/ui_features.cc
-@@ -410,7 +410,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+@@ -446,7 +446,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
               "TopChromeWebUIUsesSpareRenderer",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_ui__features.h b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
index 85f143c1dd55..3eeb0c2d7b72 100644
--- a/www/chromium/files/patch-chrome_browser_ui_ui__features.h
+++ b/www/chromium/files/patch-chrome_browser_ui_ui__features.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/ui_features.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/ui_features.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/ui_features.h
-@@ -264,7 +264,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
+@@ -288,7 +288,7 @@ bool IsToolbarPinningEnabled();
  
  BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index 3c69401f3354..392c5e58f282 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/accelerator_table.cc
 @@ -72,11 +72,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
      {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -27,12 +27,12 @@
       IDC_SHOW_AVATAR_MENU},
  
  // Platform-specific key maps.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
      {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
      {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
      {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
-@@ -250,7 +250,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -249,7 +249,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
  #endif  // !BUILDFLAG(IS_CHROMEOS)
  #endif  // !BUILDFLAG(IS_MAC)
  #if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index aa7648ca1575..2338a25599ce 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
 @@ -59,11 +59,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
                               base::OnceClosure callback) override;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
index 3fd43d757d06..bb568d3dd833 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2022-08-31 12:19:35 UTC
+--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
-@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() {
+@@ -26,7 +26,7 @@ bool IsDesktopEnvironmentUnity() {
    return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
  }
  
@@ -9,7 +9,7 @@
  int GetWindowIconResourceId() {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    switch (chrome::GetChannel()) {
-@@ -67,7 +67,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
+@@ -80,7 +80,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
                                delegate);
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index f665dddc2b33..24fdcfd6f2f2 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2234,7 +2234,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2220,7 +2220,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
    // CrOS cleanup is done.
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
index f8f1cbf0c151..6c2de655970b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
 @@ -54,7 +54,7 @@
  #include "ui/views/window/vector_icons/vector_icons.h"
@@ -11,7 +11,7 @@
  
 @@ -566,7 +566,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
  OpaqueBrowserFrameView::GetFrameButtonStyle() const {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index 344738d48c82..3c32bd36da5d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
  #include "ui/aura/window.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/themes/theme_service.h"
  #include "chrome/browser/themes/theme_service_factory.h"
  #include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
-@@ -89,7 +89,7 @@ constexpr int kContentSettingIconSize = 16;
+@@ -88,7 +88,7 @@ constexpr int kContentSettingIconSize = 16;
  // The height of the controls bar at the top of the window.
  constexpr int kTopControlsHeight = 34;
  
@@ -18,7 +18,7 @@
  // Frame border when window shadow is not drawn.
  constexpr int kFrameBorderThickness = 4;
  #endif
-@@ -184,7 +184,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -180,7 +180,7 @@ class WindowEventObserver : public ui::EventObserver {
  
      gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
  
@@ -27,7 +27,7 @@
      // Calculate input bounds for Linux. This is needed because the input bounds
      // is not necessary the same as the local bounds on Linux.
      if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -585,7 +585,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -579,7 +579,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
          AddChildView(std::move(auto_pip_setting_overlay));
    }
  
@@ -36,7 +36,7 @@
    auto* profile = browser_view->browser()->profile();
    auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
    auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -804,7 +804,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -798,7 +798,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
    for (ContentSettingImageView* view : content_setting_views_)
      view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
  
@@ -45,7 +45,7 @@
    // On Linux the top bar background will be drawn in OnPaint().
    top_bar_container_view_->SetBackground(views::CreateSolidBackground(
        color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -886,7 +886,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -880,7 +880,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
    BrowserNonClientFrameView::RemovedFromWidget();
  }
  
@@ -54,7 +54,7 @@
  gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
      const {
    auto border = FrameBorderInsets();
-@@ -1147,7 +1147,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -1136,7 +1136,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
  // views::View implementations:
  
  void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +63,7 @@
    // Draw the PiP window frame borders and shadows, including the top bar
    // background.
    if (window_frame_provider_) {
-@@ -1281,7 +1281,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -1270,7 +1270,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,7 +72,7 @@
    if (window_frame_provider_) {
      const auto insets = window_frame_provider_->GetFrameThicknessDip();
      const bool tiled = frame()->tiled();
-@@ -1299,7 +1299,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -1288,7 +1288,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
  }
  
  gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
@@ -81,7 +81,7 @@
    return FrameBorderInsets();
  #elif !BUILDFLAG(IS_CHROMEOS_ASH)
    return gfx::Insets(kResizeBorder);
-@@ -1320,7 +1320,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+@@ -1309,7 +1309,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
                     top_height + border_thickness.bottom());
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 239d13d316cf..b86f97296b0e 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
 @@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
      ui::SimpleMenuModel* model) {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -11,7 +11,7 @@
    model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
 @@ -91,7 +91,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
    }
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index 9eacbec0e371..855b7470e448 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2023-07-16 15:47:57 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
 @@ -21,7 +21,7 @@
  #include "chromeos/ui/frame/desks/move_to_desks_menu_model.h"
@@ -20,7 +20,7 @@
      return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
 @@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
  bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
index 60d79c04bd5c..4425f7112468 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_tab__strip__region__view.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
-@@ -196,7 +196,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
+@@ -193,7 +193,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
  
-     // TODO(crbug.com/1052397): Revisit the macro expression once build flag
+     // TODO(crbug.com/40118868): Revisit the macro expression once build flag
      // switch of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
new file mode 100644
index 000000000000..928670cb1235
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_omnibox_omnibox__view__views.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/omnibox/omnibox_view_views.cc.orig	2024-05-21 18:07:39 UTC
++++ chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+@@ -1951,7 +1951,7 @@ void OmniboxViewViews::MaybeAddSendTabToSelfItem(
+ }
+ 
+ void OmniboxViewViews::OnPopupOpened() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // It's not great for promos to overlap the omnibox if the user opens the
+   // drop-down after showing the promo. This especially causes issues on Mac and
+   // Linux due to z-order/rendering issues, see crbug.com/1225046 and
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
index 390cd541a028..e7984ff0b9aa 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_passwords_password__bubble__view__base.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/browser/ui/views/passwords/password_bubble_view_base.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/passwords/password_bubble_view_base.cc
 @@ -34,7 +34,7 @@
  #include "ui/base/metadata/metadata_impl_macros.h"
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/views/passwords/password_relaunch_chrome_view.h"
  #endif
  
-@@ -139,7 +139,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
+@@ -132,7 +132,7 @@ PasswordBubbleViewBase* PasswordBubbleViewBase::Create
    } else if (model_state ==
               password_manager::ui::NOTIFY_RECEIVED_SHARED_CREDENTIALS) {
      view = new SharedPasswordsNotificationView(web_contents, anchor_view);
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
new file mode 100644
index 000000000000..60e6e5366bdb
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/profiles/profile_menu_view.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/ui/views/profiles/profile_menu_view.cc
+@@ -83,7 +83,7 @@
+ #include "ui/strings/grit/ui_strings.h"
+ #include "ui/views/accessibility/view_accessibility.h"
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
+ #endif
+ 
+@@ -589,7 +589,7 @@ void ProfileMenuView::BuildIdentity() {
+         badge_image_model, menu_title_, menu_subtitle_, management_label);
+   } else {
+     std::string profile_user_display_name, profile_user_email;
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     profile_user_display_name = profile->GetPrefs()->GetString(
+         enterprise_signin::prefs::kProfileUserDisplayName);
+     profile_user_email = profile->GetPrefs()->GetString(
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index 39fcfd99ebd1..d5aca4153b06 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,8 +1,8 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -726,7 +726,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -723,7 +723,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
  
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index de6325f6cf96..ca5c0c2991c9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -55,7 +55,7 @@ namespace {
+@@ -58,7 +58,7 @@ namespace {
  
  const int kModalDialogWidth = 448;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -8,8 +8,8 @@
 +    BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  const int kManagedUserNoticeConfirmationDialogWidth = 512;
  const int kManagedUserNoticeConfirmationDialogHeight = 576;
- #endif
-@@ -182,7 +182,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+ const int kManagedUserNoticeConfirmationUpdatedDialogWidth = 900;
+@@ -187,7 +187,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
  // static
  std::unique_ptr<views::WebView>
  SigninViewControllerDelegateViews::CreateManagedUserNoticeConfirmationWebView(
-@@ -328,7 +328,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
+@@ -348,7 +348,7 @@ SigninViewControllerDelegateViews::SigninViewControlle
    SetButtons(ui::DIALOG_BUTTON_NONE);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
    // On the local profile creation dialog, cancelling the dialog (for instance
    // through the VKEY_ESCAPE accelerator) should delete the profile.
    if (delete_profile_on_cancel) {
-@@ -418,7 +418,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
+@@ -438,7 +438,7 @@ void SigninViewControllerDelegateViews::DisplayModal()
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
  void SigninViewControllerDelegateViews::DeleteProfileOnCancel() {
    ProfileAttributesEntry* entry =
        g_browser_process->profile_manager()
-@@ -491,7 +491,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+@@ -511,7 +511,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
index 17a9ce56b7ab..015cabd5d7fa 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
 @@ -73,7 +73,7 @@ class SigninViewControllerDelegateViews
  #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,7 +9,7 @@
    static std::unique_ptr<views::WebView>
    CreateManagedUserNoticeConfirmationWebView(
        Browser* browser,
-@@ -138,7 +138,7 @@ class SigninViewControllerDelegateViews
+@@ -139,7 +139,7 @@ class SigninViewControllerDelegateViews
        InitializeSigninWebDialogUI initialize_signin_web_dialog_ui);
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
index 3d29bcf1be90..87d99e62caec 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tab__search__bubble__host.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tab_search_bubble_host.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/tab_search_bubble_host.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/views/tab_search_bubble_host.cc
-@@ -263,7 +263,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
+@@ -268,7 +268,7 @@ bool TabSearchBubbleHost::ShouldTabSearchRenderBeforeT
  // Mac should have tabsearch on the right side. Windows >= Win10 has the
  // Tab Search button as a FrameCaptionButton, but it still needs to be on the
  // left if it exists.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index b84d4925f3dc..8051814f0b23 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab.cc.orig	2024-04-25 21:17:54 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/tabs/tab.cc
-@@ -621,7 +621,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
+@@ -629,7 +629,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent&
      return;
    }
  
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // Move the hit test area for hovering up so that it is not overlapped by tab
    // hover cards when they are shown.
-   // TODO(crbug.com/978134): Once Linux/CrOS widget transparency is solved,
+   // TODO(crbug.com/41467565): Once Linux/CrOS widget transparency is solved,
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index 6bdbb6c8a919..a413148332a0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -93,7 +93,7 @@
+@@ -95,7 +95,7 @@
  #include "components/remote_cocoa/browser/window.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/aura/client/drag_drop_client.h"
  #endif
  
-@@ -213,7 +213,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -215,7 +215,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
  
  void UpdateSystemDnDDragImage(TabDragContext* attached_context,
                                const gfx::ImageSkia& image) {
@@ -18,7 +18,7 @@
    aura::Window* root_window =
        attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
    if (aura::client::GetDragDropClient(root_window)) {
-@@ -403,7 +403,7 @@ TabDragController::Liveness TabDragController::Init(
+@@ -405,7 +405,7 @@ TabDragController::Liveness TabDragController::Init(
    //     synchronous on desktop Linux, so use that.
    // - ChromeOS Ash
    //     Releasing capture on Ash cancels gestures so avoid it.
@@ -27,16 +27,16 @@
    ref->can_release_capture_ = false;
  #endif
    ref->start_point_in_screen_ =
-@@ -1051,7 +1051,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -1069,7 +1069,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
 +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
      // EndMoveLoop is going to snap the window back to its original location.
      // Hide it so users don't see this. Hiding a window in Linux aura causes
      // it to lose capture so skip it.
-@@ -2103,7 +2103,7 @@ void TabDragController::CompleteDrag() {
+@@ -2151,7 +2151,7 @@ void TabDragController::CompleteDrag() {
        }
  
        // If source window was maximized - maximize the new window as well.
@@ -45,9 +45,9 @@
        // Keeping maximized state breaks snap to Grid on Windows when dragging
        // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
        // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
-@@ -2533,7 +2533,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2581,7 +2581,7 @@ TabDragController::Liveness TabDragController::GetLoca
    }
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
index aa24b62b85dd..07e18e7205b0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -1,11 +1,11 @@
---- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
-@@ -371,7 +371,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+@@ -375,7 +375,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
    // not become active. Setting this to false creates the need to explicitly
    // hide the hovercard on press, touch, and keyboard events.
    SetCanActivate(false);
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    set_accept_events(false);
  #endif
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
index 3beeeac49d80..0c7922d3d485 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_user__education_browser__user__education__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/user_education/browser_user_education_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/user_education/browser_user_education_service.cc
-@@ -790,7 +790,7 @@ void MaybeRegisterChromeFeaturePromos(
+@@ -992,7 +992,7 @@ void MaybeRegisterChromeFeaturePromos(
                      FeaturePromoSpecification::AcceleratorInfo())
                      .SetBubbleArrow(HelpBubbleArrow::kTopLeft)));
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index 3d1d5c2b844b..4f658ba959ea 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,42 +1,42 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -514,7 +514,7 @@ std::string GetFileExtension(FileExtension file_extens
+@@ -515,7 +515,7 @@ std::string GetFileExtension(FileExtension file_extens
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_BSD)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
    SiteConfig config;
    bool is_app_found = false;
-@@ -2101,7 +2101,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -2096,7 +2096,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
    if (app_name.empty()) {
      app_name = GetSiteConfiguration(site).app_name;
    }
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
+   ASSERT_TRUE(override_registration_->test_override().IsShortcutCreated(
        profile(), app_id, app_name));
    ASSERT_TRUE(
-@@ -3415,7 +3415,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -3410,7 +3410,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
            app_state->id, app_state->name);
    ASSERT_TRUE(icon_color.has_value());
    ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
 -#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
+   ASSERT_TRUE(override_registration_->test_override().IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3430,7 +3430,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3425,7 +3425,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
        GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
    ASSERT_TRUE(app_state);
    base::ScopedAllowBlockingForTesting allow_blocking;
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
+   ASSERT_FALSE(override_registration_->test_override().IsRunOnOsLoginEnabled(
        profile(), app_state->id, app_state->name));
  #endif
-@@ -3440,7 +3440,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3435,7 +3435,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
  void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -45,7 +45,7 @@
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -3456,7 +3456,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+@@ -3451,7 +3451,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
  void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
      Site site,
      FileExtension file_extension) {
@@ -54,25 +54,25 @@
    if (!BeforeStateCheckAction(__FUNCTION__)) {
      return;
    }
-@@ -4279,7 +4279,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+@@ -4265,7 +4265,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
      base::FilePath shortcut_dir,
      const std::string& app_name,
      const webapps::AppId& app_id) {
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   return override_registration_->test_override->GetShortcutPath(
+   return override_registration_->test_override().GetShortcutPath(
        profile(), shortcut_dir, app_id, app_name);
  #else
-@@ -4479,7 +4479,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+@@ -4465,7 +4465,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
      const webapps::AppId& id) {
    base::ScopedAllowBlockingForTesting allow_blocking;
    bool is_shortcut_and_icon_correct = false;
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    bool is_shortcut_correct =
-       override_registration_->test_override->IsShortcutCreated(profile, id,
-                                                                name);
-@@ -4523,7 +4523,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+       override_registration_->test_override().IsShortcutCreated(profile, id,
+                                                                 name);
+@@ -4509,7 +4509,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
      do_icon_colors_match =
          (expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
    }
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
index b98497cb15ac..fd6a42b2552a 100644
--- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__dialogs.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/web_applications/web_app_dialogs.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/web_applications/web_app_dialogs.h
 @@ -22,7 +22,7 @@
  #include "ui/gfx/native_widget_types.h"
  
  static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
--              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA));
-+              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD));
+-              BUILDFLAG(IS_CHROMEOS));
++              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD));
  
  class GURL;
  class Profile;
diff --git a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
index 489ecd4cbf54..da946e509acd 100644
--- a/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_web__applications_web__app__ui__manager__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
-@@ -586,7 +586,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
+@@ -578,7 +578,7 @@ void WebAppUiManagerImpl::MaybeShowIPHPromoForAppsLaun
      content::WebContents* web_contents,
      Profile* profile,
      const std::string& app_id) {
@@ -9,7 +9,7 @@
    WebAppProvider* provider = WebAppProvider::GetForWebApps(profile);
    CHECK(provider);
  
-@@ -806,7 +806,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
+@@ -798,7 +798,7 @@ void WebAppUiManagerImpl::ClearWebAppSiteDataIfNeeded(
    }
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
index 158b2c83da35..cb24cbb88a4b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about_about__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/about/about_ui.cc.orig	2024-01-30 07:53:34 UTC
+--- chrome/browser/ui/webui/about/about_ui.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/webui/about/about_ui.cc
-@@ -592,7 +592,7 @@ std::string ChromeURLs(content::BrowserContext* browse
+@@ -593,7 +593,7 @@ std::string ChromeURLs(content::BrowserContext* browse
    return html;
  }
  
@@ -9,7 +9,7 @@
  std::string AboutLinuxProxyConfig() {
    std::string data;
    AppendHeader(&data,
-@@ -646,7 +646,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -648,7 +648,7 @@ void AboutUIHTMLSource::StartDataRequest(
        response =
            ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
      }
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index f3075d8e0560..2a43bc3153db 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -391,7 +391,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+@@ -376,7 +376,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
    app_info->start_url = start_url;
  
    bool deprecated_app = false;
@@ -9,7 +9,7 @@
    auto* context = extension_system_->extension_service()->GetBrowserContext();
    deprecated_app =
        extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
-@@ -454,7 +454,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+@@ -439,7 +439,7 @@ void AppHomePageHandler::FillExtensionInfoList(
        continue;
      }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index ed18e457674c..a19372e4e37d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2024-06-20 12:56:26 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -201,7 +201,7 @@
+@@ -196,7 +196,7 @@
  #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
  #endif
  
-@@ -227,17 +227,17 @@
+@@ -221,17 +221,17 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -30,7 +30,7 @@
  #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
  #endif
  
-@@ -389,7 +389,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -375,7 +375,7 @@ bool IsAboutUI(const GURL& url) {
  #if !BUILDFLAG(IS_ANDROID)
            || url.host_piece() == chrome::kChromeUITermsHost
  #endif
@@ -39,7 +39,7 @@
            || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
  #endif
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -627,7 +627,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -582,7 +582,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
      return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
    if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
      return &NewWebUI<WebUIJsErrorUI>;
  #endif
-@@ -683,7 +683,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    if (url.host_piece() == chrome::kChromeUINaClHost)
      return &NewWebUI<NaClUI>;
  #endif
@@ -57,7 +57,7 @@
       defined(TOOLKIT_VIEWS)) ||                         \
      defined(USE_AURA)
    if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -738,27 +738,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -686,26 +686,26 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
    }
  #endif
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -84,9 +84,8 @@
    if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
      return &NewWebUI<BrowserSwitchUI>;
  #endif
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost)
      return &NewWebUI<WebAppSettingsUI>;
  #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
index 6a43726189a2..daf00823639b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
 @@ -7,7 +7,7 @@
  #include "build/build_config.h"
@@ -18,7 +18,7 @@
  
  connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
      BPKUR::KeyTrustLevel trust_level) {
-@@ -189,7 +189,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co
+@@ -173,7 +173,7 @@ connectors_internals::mojom::CertificateMetadataPtr Co
  }  // namespace
  
  connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
index 2fab48becb48..2742bed924c7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/management/management_ui.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/webui/management/management_ui.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/webui/management/management_ui.cc
-@@ -98,11 +98,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
+@@ -99,11 +99,11 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
        {kManagementOnFileTransferVisibleData,
         IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
  #endif  // BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
new file mode 100644
index 000000000000..92aa4a1661bb
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.cc
@@ -0,0 +1,17 @@
+--- chrome/browser/ui/webui/management/management_ui_constants.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/ui/webui/management/management_ui_constants.cc
+@@ -78,12 +78,12 @@ const char kProfileReportingBrowser[] = "profileReport
+ const char kProfileReportingExtension[] = "profileReportingExtension";
+ const char kProfileReportingPolicy[] = "profileReportingPolicy";
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
+ const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kManagementDeviceSignalsDisclosure[] =
+     "managementDeviceSignalsDisclosure";
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h
new file mode 100644
index 000000000000..c2362da00fca
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__constants.h
@@ -0,0 +1,19 @@
+--- chrome/browser/ui/webui/management/management_ui_constants.h.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/ui/webui/management/management_ui_constants.h
+@@ -8,14 +8,14 @@
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Constants defining the IDs for the localized strings sent to the page as
+ // load time data.
+ extern const char kManagementScreenCaptureEvent[];
+ extern const char kManagementScreenCaptureData[];
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kManagementDeviceSignalsDisclosure[];
+ #endif  // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index 340597042cc1..315a38d04c05 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,48 +1,24 @@
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -95,7 +95,7 @@
- #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -58,7 +58,7 @@
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/webui/web_ui_util.h"
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
  #include "components/device_signals/core/browser/user_permission_service.h"  // nogncheck
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -191,12 +191,12 @@ enum class ReportingType {
-   kLegacyTech,
- };
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
- const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kManagementDeviceSignalsDisclosure[] =
-     "managementDeviceSignalsDisclosure";
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -830,7 +830,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
-              GetReportingTypeValue(report_definition.reporting_type));
-     report_sources->Append(std::move(data));
+@@ -354,7 +354,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
+       report_sources->Append(std::move(data));
+     }
    }
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Insert the device signals consent disclosure at the end of browser
    // reporting section.
    auto* user_permission_service = GetUserPermissionService();
-@@ -1118,7 +1118,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
-                                   kManagementOnPageVisitedVisibleData, &info);
-   }
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
-     AddThreatProtectionPermission(kManagementScreenCaptureEvent,
-                                   kManagementScreenCaptureData, &info);
-@@ -1202,7 +1202,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
+@@ -532,7 +532,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
        ->policy_service();
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
index 0b93311c4f4b..94ece6e35a7f 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.h
@@ -1,24 +1,7 @@
---- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/webui/management/management_ui_handler.h
-@@ -24,14 +24,14 @@
- #include "extensions/common/extension_id.h"
- #include "url/gurl.h"
- 
--#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Constants defining the IDs for the localized strings sent to the page as
- // load time data.
- extern const char kManagementScreenCaptureEvent[];
- extern const char kManagementScreenCaptureData[];
- #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kManagementDeviceSignalsDisclosure[];
- #endif  // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -119,7 +119,7 @@ class StatusCollector;
- class SystemLogUploader;
+@@ -31,7 +31,7 @@ namespace policy {
+ class PolicyService;
  }  // namespace policy
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -26,7 +9,7 @@
  namespace device_signals {
  class UserPermissionService;
  }  // namespace device_signals
-@@ -179,7 +179,7 @@ class ManagementUIHandler : public content::WebUIMessa
+@@ -72,7 +72,7 @@ class ManagementUIHandler : public content::WebUIMessa
    base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
    base::Value::List GetApplicationsInfo(Profile* profile) const;
    virtual policy::PolicyService* GetPolicyService();
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
new file mode 100644
index 000000000000..9da8f22966d5
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_searchbox_searchbox__handler.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/ui/webui/searchbox/searchbox_handler.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/ui/webui/searchbox/searchbox_handler.cc
+@@ -105,7 +105,7 @@ const char* kMacShareIconResourceName =
+ #elif BUILDFLAG(IS_WIN)
+ const char* kWinShareIconResourceName =
+     "//resources/cr_components/searchbox/icons/win_share.svg";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char* kLinuxShareIconResourceName =
+     "//resources/cr_components/searchbox/icons/share.svg";
+ #else
+@@ -165,7 +165,7 @@ static void DefineChromeRefreshRealboxIcons() {
+ #elif BUILDFLAG(IS_WIN)
+   kWinShareIconResourceName =
+       "//resources/cr_components/searchbox/icons/win_share_cr23.svg";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   kLinuxShareIconResourceName =
+       "//resources/cr_components/searchbox/icons/share_cr23.svg";
+ #else
+@@ -670,7 +670,7 @@ std::string SearchboxHandler::ActionVectorIconToResour
+       icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
+     return kWinShareIconResourceName;
+   }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (icon.name == omnibox::kShareIcon.name ||
+       icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
+     return kLinuxShareIconResourceName;
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index ac49a8f73a28..a740c5ce0038 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -138,7 +138,7 @@
- #include "ash/webui/settings/public/constants/routes.mojom.h"
+@@ -136,7 +136,7 @@
+ #include "chrome/browser/ui/chrome_pages.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -9,7 +9,7 @@
  #include "ui/display/screen.h"
  #endif
  
-@@ -157,7 +157,7 @@
+@@ -155,7 +155,7 @@
  #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
  #endif
  
@@ -18,16 +18,7 @@
  #include "ui/linux/linux_ui_factory.h"
  #include "ui/ozone/public/ozone_platform.h"
  #endif
-@@ -260,7 +260,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
- 
-   html_source->AddBoolean("isChildAccount", profile->IsChild());
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
- #else
-   bool allow_qt_theme = false;
-@@ -290,7 +290,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+@@ -272,7 +272,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
        {"focusHighlightLabel",
         IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
  #endif
@@ -36,7 +27,7 @@
        {"overscrollHistoryNavigationTitle",
         IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
        {"overscrollHistoryNavigationSubtitle",
-@@ -433,7 +433,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
        {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
        {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
        {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@@ -45,7 +36,7 @@
        {"gtkTheme", IDS_SETTINGS_GTK_THEME},
        {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
        {"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -422,7 +422,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
  #else
        {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
  #endif
@@ -54,9 +45,9 @@
        {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
  #endif
  #if BUILDFLAG(IS_MAC)
-@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -445,7 +445,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
diff --git a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
index c5ca00256bad..d89ef8603053 100644
--- a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/ui/window_sizer/window_sizer.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/ui/window_sizer/window_sizer.cc
-@@ -216,7 +216,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
+@@ -210,7 +210,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
        browser, window_bounds, show_state);
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
new file mode 100644
index 000000000000..63b3e1b78bf7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_visited__url__ranking_visited__url__ranking__service__factory.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/visited_url_ranking/visited_url_ranking_service_factory.cc
+@@ -35,7 +35,7 @@
+ #include "components/visited_url_ranking/public/visited_url_ranking_service.h"
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/visited_url_ranking/desktop_tab_model_url_visit_data_fetcher.h"
+ #endif
+ 
+@@ -80,7 +80,7 @@ VisitedURLRankingServiceFactory::BuildServiceInstanceF
+ 
+   std::map<Fetcher, std::unique_ptr<URLVisitDataFetcher>> data_fetchers;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   data_fetchers.emplace(
+       Fetcher::kTabModel,
+       std::make_unique<visited_url_ranking::DesktopTabModelURLVisitDataFetcher>(
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc b/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
deleted file mode 100644
index a5b3ad64c4d7..000000000000
--- a/www/chromium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig	2024-02-23 21:04:38 UTC
-+++ chrome/browser/web_applications/commands/install_app_locally_command.cc
-@@ -75,7 +75,7 @@ void InstallAppLocallyCommand::StartWithLock(
-   options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
-       web_app->CanUserUninstallWebApp();
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-   options.os_hooks[web_app::OsHookType::kUrlHandlers] = true;
- #else
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
index daa2195539c9..0f03c647d19f 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/web_applications/extensions/extension_status_utils.cc
 @@ -25,7 +25,7 @@ namespace {
  
@@ -9,7 +9,7 @@
  // TODO(b/268221237): Remove this allow-list.
  const char kDefaultAllowedExtensionIds[] =
      "alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -114,7 +114,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
        extension_id);
  }
  
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
index 34caa5afede8..0c8c0325709e 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
-@@ -92,7 +92,7 @@ class OsIntegrationTestOverride
-   virtual const base::FilePath& chrome_apps_folder() = 0;
+@@ -99,7 +99,7 @@ class OsIntegrationTestOverride
+   virtual base::FilePath chrome_apps_folder() = 0;
    virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
                                            bool enable_on_login) = 0;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   virtual const base::FilePath& desktop() = 0;
-   virtual const base::FilePath& startup() = 0;
-   virtual const base::FilePath& applications_dir() = 0;
+   virtual base::Environment* environment() = 0;
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
index 37de3416c8b8..73430975a9bd 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
@@ -1,4 +1,4 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2023-09-13 12:11:42 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
 @@ -65,7 +65,7 @@ namespace {
  
@@ -11,7 +11,7 @@
  const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512};
 @@ -227,7 +227,7 @@ std::unique_ptr<ShortcutInfo> BuildShortcutInfoWithout
  
- // TODO(crbug.com/1416965): Implement tests on Linux for using shortcuts_menu
+ // TODO(crbug.com/40257107): Implement tests on Linux for using shortcuts_menu
  // actions.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
index 0745dcde1a70..e567be72c4d7 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_policy_web__app__policy__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/web_applications/policy/web_app_policy_manager.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/web_applications/policy/web_app_policy_manager.cc
-@@ -111,7 +111,7 @@ namespace web_app {
+@@ -101,7 +101,7 @@ namespace web_app {
  
  BASE_FEATURE(kDesktopPWAsForceUnregisterOSIntegration,
               "DesktopPWAsForceUnregisterOSIntegration",
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
index c2a25f4fb3d6..771573330164 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -1,6 +1,15 @@
---- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2024-02-23 21:04:38 UTC
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
-@@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
+@@ -46,7 +46,7 @@
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/nix/xdg_util.h"
+ #endif
+ 
+@@ -131,7 +131,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
  }
  #endif
  
@@ -9,7 +18,7 @@
  // Performs a blocking read of app icons from the disk.
  SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager,
                                                 const webapps::AppId& app_id,
-@@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor
+@@ -266,7 +266,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor
        GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
    CHECK(base::PathExists(app_folder_shortcut_path));
    return base::DeletePathRecursively(app_folder_shortcut_path);
@@ -18,7 +27,7 @@
    base::FilePath desktop_shortcut_path =
        GetShortcutPath(profile, desktop(), app_id, app_name);
    LOG(INFO) << desktop_shortcut_path;
-@@ -264,7 +264,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM
+@@ -306,7 +306,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM
  }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -27,7 +36,7 @@
  bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() {
    if (desktop_.IsValid()) {
      return desktop_.Delete();
-@@ -278,7 +278,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab
+@@ -320,7 +320,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab
      Profile* profile,
      const webapps::AppId& app_id,
      const std::string& app_name) {
@@ -36,16 +45,16 @@
    std::string shortcut_filename =
        "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
    return base::PathExists(startup().Append(shortcut_filename));
-@@ -334,7 +334,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan
+@@ -376,7 +376,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan
    is_file_handled =
        shell_integration::CanApplicationHandleURL(app_path, test_file_url);
    base::DeleteFile(test_file_path);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   base::FilePath user_applications_dir =
-       applications_dir().Append("applications");
+   base::FilePath user_applications_dir = applications();
    bool database_update_called = false;
-@@ -378,7 +378,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
+   for (const LinuxFileRegistration& command : linux_file_registration_) {
+@@ -419,7 +419,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
      return std::nullopt;
    }
    return GetIconTopLeftColorFromShortcutFile(shortcut_path);
@@ -54,7 +63,7 @@
    WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
    if (!provider) {
      return std::nullopt;
-@@ -428,7 +428,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
+@@ -469,7 +469,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
        app_installed_profiles.end()) {
      return shortcut_path;
    }
@@ -63,7 +72,7 @@
    std::string shortcut_filename =
        "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
    base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -454,7 +454,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated(
+@@ -495,7 +495,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated(
    base::FilePath app_shortcut_path =
        GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
    return base::PathExists(app_shortcut_path);
@@ -72,48 +81,39 @@
    base::FilePath desktop_shortcut_path =
        GetShortcutPath(profile, desktop(), app_id, app_name);
    return base::PathExists(desktop_shortcut_path);
-@@ -643,7 +643,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat
+@@ -683,7 +683,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat
  }
  #endif  // BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const base::FilePath& OsIntegrationTestOverrideImpl::desktop() {
+ base::FilePath OsIntegrationTestOverrideImpl::desktop() {
    return desktop_.GetPath();
  }
-@@ -678,7 +678,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
- #elif BUILDFLAG(IS_MAC)
-     bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
-     CHECK(success);
+@@ -734,7 +734,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+   success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(
+       outer_temp_dir_.GetPath());
+   CHECK(success);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
-     CHECK(success);
-     success = startup_.CreateUniqueTempDirUnderPath(base_path);
-@@ -699,7 +699,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
- #elif BUILDFLAG(IS_MAC)
-     bool success = chrome_apps_folder_.CreateUniqueTempDir();
-     CHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     bool success = desktop_.CreateUniqueTempDir();
-     CHECK(success);
-     success = startup_.CreateUniqueTempDir();
-@@ -709,7 +709,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+   success = desktop_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
+   CHECK(success);
+   success = startup_.CreateUniqueTempDirUnderPath(outer_temp_dir_.GetPath());
+@@ -747,7 +747,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+   CHECK(success);
  #endif
-   }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto callback = base::BindRepeating([](base::FilePath filename_in,
                                           std::string xdg_command,
                                           std::string file_contents) {
-@@ -756,7 +756,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr
-       }
-     }
-   }
+@@ -819,7 +819,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr
+   EXPECT_TRUE(!startup_.IsValid() || startup_.Delete());
+ #elif BUILDFLAG(IS_MAC)
+   EXPECT_TRUE(!chrome_apps_folder_.IsValid() || chrome_apps_folder_.Delete());
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Reset the file handling callback.
-   SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting(
-       UpdateMimeInfoDatabaseOnLinuxCallback());
+   EXPECT_TRUE(!desktop_.IsValid() || desktop_.Delete());
+   EXPECT_TRUE(!startup_.IsValid() || startup_.Delete());
+   EXPECT_TRUE(!xdg_data_home_dir_.IsValid() || xdg_data_home_dir_.Delete());
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
index 1b98f5226b73..6f5bdfc7fad7 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
-@@ -38,7 +38,7 @@ class ShellLinkItem;
+@@ -40,7 +40,7 @@ class ShellLinkItem;
  
  namespace web_app {
  
@@ -9,7 +9,7 @@
  struct LinuxFileRegistration {
    base::FilePath file_name;
    std::string xdg_command;
-@@ -112,7 +112,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+@@ -122,7 +122,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
    bool DeleteApplicationMenuDirOnWin();
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -18,16 +18,16 @@
    bool DeleteDesktopDirOnLinux();
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -231,7 +231,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
-   const base::FilePath& chrome_apps_folder() override;
+@@ -242,7 +242,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+   base::FilePath chrome_apps_folder() override;
    void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
                                    bool enable_on_login) override;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   const base::FilePath& desktop() override;
-   const base::FilePath& startup() override;
-   const base::FilePath& applications_dir() override;
-@@ -278,7 +278,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+   base::FilePath desktop();
+   base::FilePath startup();
+   base::FilePath applications();
+@@ -322,7 +322,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
    base::ScopedTempDir chrome_apps_folder_;
    std::map<base::FilePath, bool> startup_enabled_;
  
@@ -35,4 +35,4 @@
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    base::ScopedTempDir desktop_;
    base::ScopedTempDir startup_;
-   base::ScopedTempDir applications_dir_;
+   base::ScopedTempDir xdg_data_home_dir_;
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
index 023e12c1a417..983cce1cd48c 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__helpers.cc
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/web_app_helpers.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/web_applications/web_app_helpers.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/web_applications/web_app_helpers.cc
-@@ -146,7 +146,7 @@ bool IsValidWebAppUrl(const GURL& app_url) {
+@@ -145,7 +145,7 @@ bool IsValidWebAppUrl(const GURL& app_url) {
+     return false;
  
    bool allow_extension_apps = true;
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // Stop allowing apps to be extension urls when the shortcuts are separated -
    // they can be extension urls instead.
    allow_extension_apps =
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h
index df98f637be12..d72d40c99aa1 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__info.h
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/web_app_install_info.h.orig	2023-12-10 06:10:27 UTC
+--- chrome/browser/web_applications/web_app_install_info.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/web_applications/web_app_install_info.h
 @@ -35,7 +35,7 @@
  #include "url/gurl.h"
  
  static_assert(BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
--              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA));
-+              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD));
+-              BUILDFLAG(IS_CHROMEOS));
++              BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD));
  
  namespace web_app {
  
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index d8a012492279..23d573f51614 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -859,7 +859,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
+@@ -916,7 +916,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureDisc
      g_observer->ConfiguringCable(request_type);
    }
  
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
new file mode 100644
index 000000000000..cf0e06893b36
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_webauthn_enclave__manager.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/webauthn/enclave_manager.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/browser/webauthn/enclave_manager.cc
+@@ -652,7 +652,7 @@ base::flat_set<std::string> GetGaiaIDs(
+ }
+ 
+ std::string UserVerifyingLabelToString(crypto::UserVerifyingKeyLabel label) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return label;
+ #else
+   return std::string("placeholder");
+@@ -661,7 +661,7 @@ std::string UserVerifyingLabelToString(crypto::UserVer
+ 
+ std::optional<crypto::UserVerifyingKeyLabel> UserVerifyingKeyLabelFromString(
+     std::string saved_label) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return saved_label;
+ #else
+   return std::nullopt;
diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h
index a6c8d6364e88..629b7b62143d 100644
--- a/www/chromium/files/patch-chrome_common_channel__info.h
+++ b/www/chromium/files/patch-chrome_common_channel__info.h
@@ -1,18 +1,20 @@
---- chrome/common/channel_info.h.orig	2023-04-28 17:01:32 UTC
+--- chrome/common/channel_info.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/channel_info.h
-@@ -104,13 +104,13 @@ void ClearChannelForTesting();
+@@ -12,7 +12,7 @@
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace base {
+ class Environment;
+ }
+@@ -100,7 +100,7 @@ void ClearChannelIdForTesting();
  std::string GetChannelSuffixForDataDir();
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  std::string GetChannelSuffixForExtraFlagsEnvVarName();
- #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // Returns the channel-specific filename of the desktop shortcut used to launch
- // the browser.
- std::string GetDesktopName(base::Environment* env);
diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc
index 80ac1fc7cc26..ae8708082323 100644
--- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc
+++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc
@@ -1,6 +1,6 @@
---- chrome/common/channel_info_posix.cc.orig	2023-04-28 17:01:32 UTC
+--- chrome/common/channel_info_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/channel_info_posix.cc
-@@ -92,7 +92,7 @@ std::string GetChannelSuffixForDataDir() {
+@@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() {
    }
  }
  
@@ -9,9 +9,9 @@
  std::string GetChannelSuffixForExtraFlagsEnvVarName() {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
    const auto channel_state = GetChannelImpl();
-@@ -118,7 +118,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() 
+@@ -121,7 +121,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() 
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 9c08a42d5dc8..ad14eab4f557 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,11 +1,11 @@
---- chrome/common/chrome_features.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/chrome_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/chrome_features.cc
 @@ -81,7 +81,7 @@ BASE_FEATURE(kUseAdHocSigningForWebAppShims,
  #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  // Enables or disables the Autofill survey triggered by opening a prompt to
  // save address info.
  BASE_FEATURE(kAutofillAddressSurvey,
@@ -18,7 +18,7 @@
  // Enables the Restart background mode optimization. When all Chrome UI is
  // closed and it goes in the background, allows to restart the browser to
  // discard memory.
-@@ -302,7 +302,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
+@@ -282,7 +282,7 @@ BASE_FEATURE(kDesktopPWAsElidedExtensionsMenu,
  BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
               "DesktopPWAsRunOnOsLogin",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,16 +27,16 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -341,7 +341,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings,
+@@ -324,7 +324,7 @@ BASE_FEATURE(kDesktopPWAsTabStripSettings,
+              "DesktopPWAsTabStripSettings",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
  // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
  // Apps will not launch and will be marked in the UI as deprecated.
-@@ -364,7 +364,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
+@@ -346,7 +346,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
  BASE_FEATURE(kDnsOverHttps,
               "DnsOverHttps",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -380,7 +380,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -362,7 +362,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
  const base::FeatureParam<bool> kDnsOverHttpsShowUiParam{&kDnsOverHttps,
                                                          "ShowUi",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,16 +54,16 @@
                                                          true
  #else
                                                          false
-@@ -918,7 +918,7 @@ BASE_FEATURE(kLacrosSharedComponentsDir,
+@@ -887,7 +887,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+              "KAnonymityServiceStorage",
               base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kLinuxLowMemoryMonitor,
               "LinuxLowMemoryMonitor",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -931,7 +931,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -900,7 +900,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
      &kLinuxLowMemoryMonitor, "critical_level", 255};
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 34deb0d43a6a..b8451a087c3b 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,11 +1,11 @@
---- chrome/common/chrome_features.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/chrome_features.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/chrome_features.h
 @@ -60,13 +60,13 @@ BASE_DECLARE_FEATURE(kUseAdHocSigningForWebAppShims);
  #endif  // BUILDFLAG(IS_MAC)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey);
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey);
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey);
@@ -16,25 +16,25 @@
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -216,7 +216,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -197,7 +197,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsPreventClose);
+ COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
  COMPONENT_EXPORT(CHROME_FEATURES)
  BASE_DECLARE_FEATURE(kShortcutsNotApps);
-@@ -543,7 +543,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
- BASE_DECLARE_FEATURE(kLacrosSharedComponentsDir);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -527,7 +527,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
  
 -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
 +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
  COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -551,7 +551,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -535,7 +535,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
  extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
  #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index b8f02a72325e..90d3b4a6ad4e 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/common/chrome_paths.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/chrome_paths.cc
 @@ -30,7 +30,7 @@
  #include "base/apple/foundation_util.h"
@@ -36,7 +36,7 @@
        if (!GetUserDownloadsDirectorySafe(&cur)) {
          return false;
        }
-@@ -544,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -541,7 +541,7 @@ bool PathProvider(int key, base::FilePath* result) {
          return false;
        }
        break;
@@ -45,7 +45,7 @@
      case chrome::DIR_POLICY_FILES: {
        cur = base::FilePath(policy::kPolicyPath);
        break;
-@@ -555,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -552,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
      ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
       BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
@@ -54,7 +54,7 @@
      case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
        if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
          return false;
-@@ -564,7 +564,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -561,7 +561,7 @@ bool PathProvider(int key, base::FilePath* result) {
        break;
      }
  #endif
@@ -63,8 +63,8 @@
      case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
        cur = base::FilePath(kFilepathSinglePrefExtensions);
        break;
-@@ -612,7 +612,7 @@ bool PathProvider(int key, base::FilePath* result) {
- #endif
+@@ -599,7 +599,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       break;
  
  #if BUILDFLAG(ENABLE_EXTENSIONS) && \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC))
@@ -72,7 +72,7 @@
      case chrome::DIR_NATIVE_MESSAGING:
  #if BUILDFLAG(IS_MAC)
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -626,6 +626,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -613,6 +613,9 @@ bool PathProvider(int key, base::FilePath* result) {
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
        cur = base::FilePath(
            FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index fa4d6225172b..20bdbd7e1980 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,11 +1,11 @@
---- chrome/common/chrome_switches.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/chrome_switches.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/chrome_switches.cc
-@@ -881,14 +881,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -863,14 +863,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
  
  // Causes the browser to launch directly in guest mode.
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 84ac2cd95949..f4f1712721a6 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,11 +1,11 @@
---- chrome/common/chrome_switches.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/chrome_switches.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/chrome_switches.h
-@@ -277,12 +277,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -273,12 +273,12 @@ extern const char kAllowNaClSocketAPI[];
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  extern const char kEnableNewAppMenuIcon[];
  extern const char kGuest[];
  #endif
diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
index b0e90719d0d0..6945c94ffe6e 100644
--- a/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
+++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.cc
@@ -1,6 +1,6 @@
---- chrome/common/media/cdm_registration.cc.orig	2024-03-27 13:31:02 UTC
+--- chrome/common/media/cdm_registration.cc.orig	2024-05-21 18:07:39 UTC
 +++ chrome/common/media/cdm_registration.cc
-@@ -26,11 +26,11 @@
+@@ -30,11 +30,11 @@
  
  #if BUILDFLAG(ENABLE_WIDEVINE)
  #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
@@ -14,7 +14,7 @@
  #include "base/no_destructor.h"
  #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
  #include "media/cdm/supported_audio_codecs.h"
-@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness;
+@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness;
  #if BUILDFLAG(ENABLE_WIDEVINE)
  #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) ||            \
       BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
@@ -23,25 +23,25 @@
  // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
  // |capability|.
  std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
-@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
+@@ -105,7 +105,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
          // BUILDFLAG(IS_CHROMEOS))
  
  #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
 +    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
  // On Linux/ChromeOS we have to preload the CDM since it uses the zygote
- // sandbox. On Windows and Mac, the bundled CDM is handled by the component
- // updater.
-@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() {
+ // sandbox. On Windows and Mac, CDM registration is handled by Component
+ // Update (as the CDM can be loaded only when needed).
+@@ -129,7 +129,7 @@ content::CdmInfo* GetBundledWidevine() {
          // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
  
  #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
 +    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
- // This code checks to see if a component updated Widevine CDM can be found. If
- // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise
- // return nullptr.
-@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
+ // This code checks to see if Component Updater picked a version of the Widevine
+ // CDM to be used last time it ran. (Component Updater may choose the bundled
+ // CDM if there is not a new version available for download.) If there is one
+@@ -171,7 +171,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
        /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
        kWidevineCdmType, base::Version(), base::FilePath());
  
@@ -50,3 +50,12 @@
  #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
    base::Version glibc_version(gnu_get_libc_version());
    DCHECK(glibc_version.IsValid());
+@@ -429,7 +429,7 @@ void RegisterCdmInfo(std::vector<content::CdmInfo>* cd
+   DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms";
+ }
+ 
+-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+ std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting() {
+   std::vector<content::CdmInfo> cdms;
+   AddSoftwareSecureWidevine(&cdms);
diff --git a/www/chromium/files/patch-chrome_common_media_cdm__registration.h b/www/chromium/files/patch-chrome_common_media_cdm__registration.h
new file mode 100644
index 000000000000..a5290b75d0cd
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_media_cdm__registration.h
@@ -0,0 +1,11 @@
+--- chrome/common/media/cdm_registration.h.orig	2024-05-21 18:07:39 UTC
++++ chrome/common/media/cdm_registration.h
+@@ -14,7 +14,7 @@
+ // Register CdmInfo for Content Decryption Modules (CDM) supported.
+ void RegisterCdmInfo(std::vector<content::CdmInfo>* cdms);
+ 
+-#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+ // Returns the software secure Widevine CDM.
+ std::vector<content::CdmInfo> GetSoftwareSecureWidevineForTesting();
+ #endif
diff --git a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
index 0f655eb82788..761be0b3c022 100644
--- a/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
+++ b/www/chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h
@@ -1,8 +1,8 @@
---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2024-03-27 13:31:02 UTC
+--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h
-@@ -15,7 +15,7 @@
+@@ -17,7 +17,7 @@
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
 +#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index 3f8d14cc4b97..2b7d42e752b2 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,15 +1,15 @@
---- chrome/common/pref_names.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/pref_names.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/pref_names.h
-@@ -1288,7 +1288,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
+@@ -1313,7 +1313,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // Linux specific preference on whether we should match the system theme.
  inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
  #endif
-@@ -1428,7 +1428,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
+@@ -1457,7 +1457,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
      "browser.show_update_promotion_info_bar";
  #endif
  
@@ -18,7 +18,7 @@
  // Boolean that is false if we should show window manager decorations.  If
  // true, we draw a custom chrome frame (thicker title bar and blue border).
  inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1997,7 +1997,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
+@@ -2069,7 +2069,7 @@ inline constexpr char kDownloadDefaultDirectory[] =
  inline constexpr char kDownloadDirUpgraded[] = "download.directory_upgrade";
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
  inline constexpr char kOpenPdfDownloadInSystemReader[] =
      "download.open_pdf_in_system_reader";
  #endif
-@@ -2431,14 +2431,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+@@ -2505,14 +2505,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
  inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -44,7 +44,7 @@
  // Records whether the user has seen an HTTP auth "negotiate" header.
  inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
      "net.received_http_auth_negotiate_headers";
-@@ -2516,7 +2516,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
+@@ -2590,7 +2590,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
  inline constexpr char kBasicAuthOverHttpEnabled[] =
      "auth.basic_over_http_enabled";
  
@@ -53,7 +53,7 @@
  // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
  // along with kAuthNegotiateDelegateAllowlist.
  inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3034,7 +3034,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
+@@ -3104,7 +3104,7 @@ inline constexpr char kDeviceWeeklyScheduledSuspend[] 
  
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -62,7 +62,7 @@
  // Defines administrator-set availability of Chrome for Testing.
  inline constexpr char kChromeForTestingAllowed[] = "chrome_for_testing.allowed";
  #endif
-@@ -3584,7 +3584,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
+@@ -3673,7 +3673,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
  inline constexpr char kSandboxExternalProtocolBlocked[] =
      "profile.sandbox_external_protocol_blocked";
  
@@ -71,7 +71,7 @@
  // Boolean that indicates if system notifications are allowed to be used in
  // place of Chrome notifications.
  inline constexpr char kAllowSystemNotifications[] =
-@@ -3633,7 +3633,7 @@ inline constexpr char kCACertificateManagementAllowed[
+@@ -3722,7 +3722,7 @@ inline constexpr char kCACertificateManagementAllowed[
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -80,9 +80,9 @@
  inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] =
      "enforce_local_anchor_constraints_enabled";
  #endif
-@@ -3941,7 +3941,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
- inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] =
-     "new_base_url_inheritance_behavior_allowed";
+@@ -4021,7 +4021,7 @@ inline constexpr char kPrintingOAuth2AuthorizationServ
+     "printing.oauth2_authorization_servers";
+ #endif
  
 -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index 798d05061d7d..e10ec8e52b3c 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,11 +1,11 @@
---- chrome/common/url_constants.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/url_constants.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/url_constants.h
-@@ -848,7 +848,7 @@ inline constexpr char kPhoneHubPermissionLearnMoreURL[
+@@ -888,7 +888,7 @@ inline constexpr char kOutdatedPluginLearnMoreURL[] =
+ inline constexpr char kPhoneHubPermissionLearnMoreURL[] =
      "https://support.google.com/chromebook?p=multidevice";
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // "Learn more" URL for the chrome apps deprecation dialog.
  inline constexpr char kChromeAppsDeprecationLearnMoreURL[] =
      "https://support.google.com/chrome?p=chrome_app_deprecation";
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index c0adbb4040a8..ac1ad914bb41 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,4 +1,4 @@
---- chrome/common/webui_url_constants.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/webui_url_constants.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/webui_url_constants.cc
 @@ -518,18 +518,18 @@ const char kOsUISystemURL[] = "os://system";
  const char kOsUIVersionURL[] = "os://version";
@@ -31,11 +31,11 @@
  const char kChromeUISandboxHost[] = "sandbox";
  #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
  const char kChromeUIBrowserSwitchHost[] = "browser-switch";
  const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  const char kChromeUIIntroHost[] = "intro";
@@ -48,16 +48,42 @@
       defined(TOOLKIT_VIEWS)) ||                         \
      defined(USE_AURA)
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -650,7 +650,7 @@ const char kCookiesSubPagePath[] = "/cookies";
+@@ -649,7 +649,7 @@ const char kTrackingProtectionSubPagePath[] = "/tracki
+ const char kCookiesSubPagePath[] = "/cookies";
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  const char kChromeUIWebAppSettingsHost[] = "app-settings";
  #endif
-@@ -879,7 +879,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -795,21 +795,21 @@ const char* const kChromeHostURLs[] = {
+     kChromeUIAssistantOptInHost,
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+     kChromeUIConnectorsInternalsHost,
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     kChromeUIDiscardsHost,
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     kChromeUIWebAppSettingsHost,
+ #endif
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
+     kChromeUILinuxProxyConfigHost,
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+     kChromeUISandboxHost,
+ #endif
+ #if BUILDFLAG(IS_WIN)
+@@ -876,7 +876,7 @@ const char* const kChromeDebugURLs[] = {
      blink::kChromeUIGpuJavaCrashURL,
      kChromeUIJavaCrashURL,
  #endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index cdb49c4775ac..16d7ec4f5bdd 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig	2024-04-19 13:02:56 UTC
+--- chrome/common/webui_url_constants.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/common/webui_url_constants.h
-@@ -437,24 +437,24 @@ extern const char kOsUISystemURL[];
+@@ -437,23 +437,23 @@ extern const char kOsUISystemURL[];
  extern const char kOsUIVersionURL[];
  #endif
  
@@ -17,19 +17,18 @@
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  extern const char kChromeUIDiscardsHost[];
  extern const char kChromeUIDiscardsURL[];
  #endif
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  extern const char kChromeUIWebAppSettingsURL[];
  extern const char kChromeUIWebAppSettingsHost[];
  #endif
-@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -468,14 +468,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -38,15 +37,15 @@
  extern const char kChromeUISandboxHost[];
  #endif
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
  extern const char kChromeUIBrowserSwitchHost[];
  extern const char kChromeUIBrowserSwitchURL[];
  extern const char kChromeUIIntroHost[];
-@@ -492,7 +492,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -491,7 +491,7 @@ extern const char kChromeUIProfilePickerUrl[];
  extern const char kChromeUIProfilePickerStartupQuery[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
index 89d477a9c262..c4e1b4444b49 100644
--- a/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
+++ b/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h
@@ -1,6 +1,6 @@
---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig	2023-04-05 11:05:06 UTC
+--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig	2024-06-17 12:56:06 UTC
 +++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@
  #include "mojo/public/cpp/bindings/struct_traits.h"
  
  #if !BUILDFLAG(FULL_SAFE_BROWSING) || \
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index d40b51e2da49..d272033e54dd 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,4 +1,4 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/services/printing/print_backend_service_impl.cc
 @@ -49,7 +49,7 @@
  #include "printing/backend/cups_connection_pool.h"
@@ -16,7 +16,7 @@
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  void InstantiateLinuxUiDelegate() {
-   // TODO(crbug.com/809738)  Until a real UI can be used in a utility process,
+   // TODO(crbug.com/40561724)  Until a real UI can be used in a utility process,
    // need to use the stub version.
 @@ -85,7 +85,7 @@ void InstantiateLinuxUiDelegate() {
  #endif
diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
index 167d26944f95..22cc612f4c4d 100644
--- a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
+++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
@@ -1,8 +1,8 @@
---- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- chrome/services/speech/audio_source_fetcher_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/services/speech/audio_source_fetcher_impl.cc
 @@ -132,7 +132,7 @@ void AudioSourceFetcherImpl::Start(
  
-   // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and
+   // TODO(crbug.com/40753481): Check implementation / sandbox policy on Mac and
    // Windows.
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc b/www/chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc
new file mode 100644
index 000000000000..dfa670d7b64e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_base_scoped__channel__override__posix.cc
@@ -0,0 +1,11 @@
+--- chrome/test/base/scoped_channel_override_posix.cc.orig	2024-06-17 12:56:06 UTC
++++ chrome/test/base/scoped_channel_override_posix.cc
+@@ -45,7 +45,7 @@ std::string GetVersionExtra(ScopedChannelOverride::Cha
+       return "beta";
+     case ScopedChannelOverride::Channel::kDev:
+       return "unstable";
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     case ScopedChannelOverride::Channel::kCanary:
+       return "canary";
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
index 41305b1e68f5..41c6e777b01a 100644
--- a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
+++ b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc
@@ -1,8 +1,8 @@
---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2022-09-24 10:57:32 UTC
+--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc
 @@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -11,7 +11,7 @@
  #else
 @@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) {
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index c897d782f2e7..13beda7a8ae4 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,6 +1,15 @@
---- chrome/utility/services.cc.orig	2024-03-22 08:19:40 UTC
+--- chrome/utility/services.cc.orig	2024-06-17 12:56:06 UTC
 +++ chrome/utility/services.cc
-@@ -55,7 +55,7 @@
+@@ -38,7 +38,7 @@
+ #include "services/screen_ai/screen_ai_service_impl.h"  // nogncheck
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/passage_embeddings/passage_embeddings_service.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(LINUX)
+ 
+@@ -61,7 +61,7 @@
  #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -9,48 +18,48 @@
  #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
  #include "chrome/services/file_util/file_util_service.h"  // nogncheck
  #endif
  
 -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))
-+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD)
  #include "chrome/services/file_util/document_analysis_service.h"  // nogncheck
  #endif
  
-@@ -212,7 +212,7 @@ auto RunMacNotificationService(
+@@ -221,7 +221,7 @@ auto RunMacNotificationService(
  }
  #endif  // BUILDFLAG(IS_MAC)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto RunSystemSignalsService(
-     mojo::PendingReceiver<device_signals::mojom::SystemSignalsService>
+ auto RunPassageEmbeddingsService(
+     mojo::PendingReceiver<passage_embeddings::mojom::PassageEmbeddingsService>
          receiver) {
-@@ -272,7 +272,7 @@ auto RunCupsIppParser(
+@@ -288,7 +288,7 @@ auto RunCupsIppParser(
  }
  #endif
  
 -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))
-+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD)
  auto RunDocumentAnalysis(
      mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
    return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -494,7 +494,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunWindowsIconReader);
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   services.Add(RunPassageEmbeddingsService);
    services.Add(RunSystemSignalsService);
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- 
-@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -511,7 +511,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
    services.Add(RunFileUtil);
  #endif
  
 -#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))
-+#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD)
    services.Add(RunDocumentAnalysis);
  #endif
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index 06e27b938b36..67a946b6e7ec 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,15 +1,15 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig	2023-07-16 15:47:57 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2024-05-21 18:07:39 UTC
 +++ chromecast/browser/cast_browser_main_parts.cc
-@@ -90,7 +90,7 @@
- #include "ui/base/ui_base_switches.h"
- #include "ui/gl/gl_switches.h"
+@@ -94,7 +94,7 @@
+ #include "ui/ozone/public/ozone_platform.h"
+ #endif  // BUILDFLAG(IS_OZONE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include <fontconfig/fontconfig.h>
  #include <signal.h>
  #include <sys/prctl.h>
-@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
+@@ -267,7 +267,7 @@ class CastViewsDelegate : public views::ViewsDelegate 
  
  #endif  // defined(USE_AURA)
  
@@ -18,7 +18,7 @@
  
  base::FilePath GetApplicationFontsDir() {
    std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -313,7 +313,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
      {cc::switches::kDisableThreadedAnimation, ""},
  #endif  // BUILDFLAG(IS_ANDROID)
  #endif  // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -27,7 +27,7 @@
  #if defined(ARCH_CPU_X86_FAMILY)
      // This is needed for now to enable the x11 Ozone platform to work with
      // current Linux/NVidia OpenGL drivers.
-@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -490,7 +490,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
      views_delegate_ = std::make_unique<CastViewsDelegate>();
  #endif  // defined(USE_AURA)
  
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index d38b3db68c50..860d180f0ca1 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig	2024-03-22 08:19:40 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig	2024-05-21 18:07:39 UTC
 +++ chromecast/browser/cast_content_browser_client.cc
-@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -431,7 +431,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
                                            switches::kAudioOutputChannels));
      }
    } else if (process_type == switches::kGpuProcess) {
diff --git a/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc b/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
new file mode 100644
index 000000000000..3455960e8260
--- /dev/null
+++ b/www/chromium/files/patch-chromecast_cast__core_runtime_browser_runtime__application__service__impl.cc
@@ -0,0 +1,11 @@
+--- chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc.orig	2024-06-17 12:56:06 UTC
++++ chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
+@@ -335,7 +335,7 @@ CastWebView::Scoped RuntimeApplicationServiceImpl::Cre
+       GetFlagEntry(feature::kCastCoreIsRemoteControlMode,
+                    config_.extra_features(), /*default_value=*/false);
+   params->enabled_for_dev = IsEnabledForDev();
+-#if BUILDFLAG(ENABLE_CAST_RECEIVER) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(ENABLE_CAST_RECEIVER) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+   // cast_receiver::ApplicationControlsImpl constructs an instance of
+   // url_rewrite::UrlRequestRewriteRulesManager. CastWebContentsImpl should NOT
+   // construct its own instance, or UrlRequestRulesReceiver will crash when a
diff --git a/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc
new file mode 100644
index 000000000000..38208f60a6f8
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill_core_browser_payments__data__manager.cc
@@ -0,0 +1,11 @@
+--- components/autofill/core/browser/payments_data_manager.cc.orig	2024-06-17 12:56:06 UTC
++++ components/autofill/core/browser/payments_data_manager.cc
+@@ -1064,7 +1064,7 @@ bool PaymentsDataManager::ShouldShowCardsFromAccountOp
+ // The feature is only for Linux, Windows, Mac, and Fuchsia.
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
+   // This option should only be shown for users that have not enabled the Sync
+   // Feature and that have server credit cards available.
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
deleted file mode 100644
index fe4ae096f6a0..000000000000
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig	2024-04-19 13:02:56 UTC
-+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1063,7 +1063,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
-   // This option should only be shown for users that have not enabled the Sync
-   // Feature and that have server credit cards available.
-   // TODO(crbug.com/40066949): Simplify once ConsentLevel::kSync and
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index b21eb54a1cf2..f9278b461321 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,8 +1,8 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig	2024-04-19 13:02:56 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/autofill/core/common/autofill_payments_features.cc
-@@ -276,7 +276,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards,
+@@ -257,7 +257,7 @@ BASE_FEATURE(kAutofillEnableVirtualCards,
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
index 13366843dfe4..e470b52aa1f9 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_util.cc.orig	2024-03-22 08:19:40 UTC
+--- components/autofill/core/common/autofill_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/autofill/core/common/autofill_util.cc
-@@ -131,7 +131,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
+@@ -132,7 +132,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
  
  bool ShouldAutoselectFirstSuggestionOnArrowDown() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
index 6feb47965aea..ea25995c547a 100644
--- a/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
+++ b/www/chromium/files/patch-components_commerce_core_commerce__feature__list.cc
@@ -1,4 +1,4 @@
---- components/commerce/core/commerce_feature_list.cc.orig	2024-03-22 08:19:40 UTC
+--- components/commerce/core/commerce_feature_list.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/commerce/core/commerce_feature_list.cc
 @@ -168,7 +168,7 @@ BASE_FEATURE(kPriceInsights,
               "PriceInsights",
@@ -9,7 +9,7 @@
  BASE_FEATURE(kPriceInsightsRegionLaunched,
               "PriceInsightsRegionLaunched",
               base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -244,7 +244,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
+@@ -248,7 +248,7 @@ const base::FeatureParam<bool> kDeleteAllMerchantsOnCl
  
  BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
index 62f87c529226..9595cefb0ed1 100644
--- a/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
+++ b/www/chromium/files/patch-components_constrained__window_constrained__window__views.cc
@@ -1,6 +1,6 @@
---- components/constrained_window/constrained_window_views.cc.orig	2024-03-22 08:19:40 UTC
+--- components/constrained_window/constrained_window_views.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/constrained_window/constrained_window_views.cc
-@@ -324,7 +324,7 @@ bool SupportsGlobalScreenCoordinates() {
+@@ -350,7 +350,7 @@ bool SupportsGlobalScreenCoordinates() {
  }
  
  bool PlatformClipsChildrenToViewport() {
diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
index 4145bd618de1..b3d99337265f 100644
--- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,4 +1,4 @@
---- components/crash/core/app/BUILD.gn.orig	2024-03-22 08:19:40 UTC
+--- components/crash/core/app/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ components/crash/core/app/BUILD.gn
 @@ -82,6 +82,10 @@ static_library("app") {
      ]
@@ -29,7 +29,7 @@
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -243,11 +247,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -245,11 +249,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
index a4cb305fab8c..ac1e11d23458 100644
--- a/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
+++ b/www/chromium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
@@ -1,6 +1,6 @@
---- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2023-10-11 18:22:24 UTC
+--- components/device_signals/core/browser/user_permission_service_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/device_signals/core/browser/user_permission_service_impl.cc
-@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
+@@ -93,7 +93,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
           consent_required_by_dependent_policy;
  }
  
diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
index 9c336db88172..f99cdf0c7ec9 100644
--- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
+++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc
@@ -1,6 +1,6 @@
---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2023-12-10 06:10:27 UTC
+--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/discardable_memory/service/discardable_shared_memory_manager.cc
-@@ -172,7 +172,7 @@ uint64_t GetDefaultMemoryLimit() {
+@@ -176,7 +176,7 @@ uint64_t GetDefaultMemoryLimit() {
    // Limits the number of FDs used to 32, assuming a 4MB allocation size.
    uint64_t max_default_memory_limit = 128 * kMegabyte;
  #else
diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index 0fd37b4abc1a..ecc313f02de5 100644
--- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,20 +1,29 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig	2023-09-13 12:11:42 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -84,7 +84,7 @@ const char kDesktop[] =
-     "Safari/537.36";
- #endif  // BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- std::string GetMachine() {
-   struct utsname unixinfo;
-   uname(&unixinfo);
-@@ -192,7 +192,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
-     int value;
-     ASSERT_TRUE(base::StringToInt(pieces[i], &value));
-   }
+@@ -71,7 +71,7 @@ const char kDesktop[] =
+     "X11; CrOS x86_64 14541.0.0"
+ #elif BUILDFLAG(IS_FUCHSIA)
+     "Fuchsia"
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     "X11; Linux x86_64"
+ #elif BUILDFLAG(IS_MAC)
+     "Macintosh; Intel Mac OS X 10_15_7"
+@@ -171,7 +171,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) 
+   ASSERT_EQ("CrOS", pieces[0]);
+   ASSERT_EQ("x86_64", pieces[1]);
+   ASSERT_EQ("14541.0.0", pieces[2]);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Post-UA Reduction there is a single <unifiedPlatform> value for Linux:
    // X11; Linux x86_64
    ASSERT_EQ(2u, pieces.size());
-   ASSERT_EQ("X11", pieces[0]);
+@@ -727,7 +727,7 @@ TEST_F(UserAgentUtilsTest, UserAgentMetadata) {
+ #endif
+ #elif BUILDFLAG(IS_ANDROID)
+   EXPECT_EQ(metadata.platform, "Android");
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   EXPECT_EQ(metadata.platform, "Linux");
+ #elif BUILDFLAG(IS_FREEBSD)
+   EXPECT_EQ(metadata.platform, "FreeBSD");
diff --git a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
index a1261651b91e..cb9a5ac584e7 100644
--- a/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
+++ b/www/chromium/files/patch-components_eye__dropper_eye__dropper__view.cc
@@ -1,6 +1,6 @@
---- components/eye_dropper/eye_dropper_view.cc.orig	2024-02-23 21:04:38 UTC
+--- components/eye_dropper/eye_dropper_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/eye_dropper/eye_dropper_view.cc
-@@ -200,7 +200,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
+@@ -202,7 +202,7 @@ EyeDropperView::EyeDropperView(gfx::NativeView parent,
    // EyeDropper/WidgetDelegate.
    set_owned_by_client();
    SetPreferredSize(GetSize());
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 940471bcf112..69383154fad3 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig	2024-04-19 13:02:56 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/feature_engagement/public/feature_configurations.cc
 @@ -94,7 +94,7 @@ std::optional<FeatureConfig> CreateNewUserGestureInPro
  
@@ -18,22 +18,12 @@
    if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
      std::optional<FeatureConfig> config = FeatureConfig();
      config->valid = true;
-@@ -1393,7 +1393,8 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -1498,7 +1498,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-+    BUILDFLAG(IS_BSD)
+ #endif  // BUILDFLAG(IS_ANDROID)
  
-   if (kIPHAutofillExternalAccountProfileSuggestionFeature.name ==
-       feature->name) {
-@@ -1965,7 +1966,7 @@ std::optional<FeatureConfig> GetClientSideFeatureConfi
-   }
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   if (kIPHDeepScanPromptRemovalFeature.name == feature->name) {
-     std::optional<FeatureConfig> config = FeatureConfig();
-     config->valid = true;
+   if (kIPHAutofillCreditCardBenefitFeature.name == feature->name) {
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index ebc4d1c30bf0..cf17680e5fe7 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig	2024-04-19 13:02:56 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/feature_engagement/public/feature_constants.cc
 @@ -18,7 +18,7 @@ BASE_FEATURE(kIPHDemoMode, "IPH_DemoMode", base::FEATU
  BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
@@ -6,20 +6,20 @@
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHBatterySaverModeFeature,
-              "IPH_BatterySaverMode",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -584,7 +584,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
+ BASE_FEATURE(kEsbDownloadRowPromoFeature,
+              "EsbDownloadRowPromo",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -605,7 +605,8 @@ BASE_FEATURE(kDefaultBrowserTriggerCriteriaExperiment,
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
 +    BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
-              "IPH_AutofillExternalAccountProfileSuggestion",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-@@ -712,7 +713,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
+ BASE_FEATURE(kIPHAutofillCreditCardBenefitFeature,
+              "IPH_AutofillCreditCardBenefit",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -736,7 +737,7 @@ BASE_FEATURE(kIPHScalableIphGamingFeature,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index a2694ce6d6d7..612f6ef60a59 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig	2024-04-19 13:02:56 UTC
+--- components/feature_engagement/public/feature_constants.h.orig	2024-06-17 12:56:06 UTC
 +++ components/feature_engagement/public/feature_constants.h
 @@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kIPHDemoMode);
  BASE_DECLARE_FEATURE(kIPHDummyFeature);
@@ -6,19 +6,20 @@
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kEsbDownloadRowPromoFeature);
  BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
  BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature);
- BASE_DECLARE_FEATURE(kIPHCompanionSidePanelRegionSearchFeature);
-@@ -244,7 +244,7 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp
- 
+@@ -252,7 +252,8 @@ BASE_DECLARE_FEATURE(kDefaultBrowserTriggerCriteriaExp
  #endif  // BUILDFLAG(IS_IOS)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillCreditCardBenefitFeature);
  BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
  BASE_DECLARE_FEATURE(kIPHAutofillManualFallbackFeature);
-@@ -293,7 +293,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea
+@@ -301,7 +302,7 @@ BASE_DECLARE_FEATURE(kIPHScalableIphHelpAppBasedTenFea
  BASE_DECLARE_FEATURE(kIPHScalableIphGamingFeature);
  #endif
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 4e8fc171317d..1fa49ffeb834 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,24 +1,25 @@
---- components/feature_engagement/public/feature_list.cc.orig	2024-04-19 13:02:56 UTC
+--- components/feature_engagement/public/feature_list.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/feature_engagement/public/feature_list.cc
-@@ -147,7 +147,7 @@ const base::Feature* const kAllFeatures[] = {
-     &kIPHiOSOverflowMenuCustomizationFeature,
+@@ -148,7 +148,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSInlineEnhancedSafeBrowsingPromoFeature,
  #endif  // BUILDFLAG(IS_IOS)
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     &kEsbDownloadRowPromoFeature,
      &kIPHBatterySaverModeFeature,
      &kIPHCompanionSidePanelFeature,
-     &kIPHCompanionSidePanelRegionSearchFeature,
-@@ -203,7 +203,7 @@ const base::Feature* const kAllFeatures[] = {
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
+@@ -211,7 +211,8 @@ const base::Feature* const kAllFeatures[] = {
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+     &kIPHAutofillCreditCardBenefitFeature,
      &kIPHAutofillExternalAccountProfileSuggestionFeature,
      &kIPHAutofillManualFallbackFeature,
-@@ -252,7 +252,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -260,7 +261,7 @@ const base::Feature* const kAllFeatures[] = {
      &kIPHScalableIphGamingFeature,
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index e0887e68c85f..93cf26689186 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,24 +1,25 @@
---- components/feature_engagement/public/feature_list.h.orig	2024-04-19 13:02:56 UTC
+--- components/feature_engagement/public/feature_list.h.orig	2024-06-17 12:56:06 UTC
 +++ components/feature_engagement/public/feature_list.h
-@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSOverflowMenuCustomizatio
+@@ -266,7 +266,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSInlineEnhancedSafeBrowsi
  #endif  // BUILDFLAG(IS_IOS)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kEsbDownloadRowPromoFeature, "EsbDownloadRowPromo");
  DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
  DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelFeature, "IPH_CompanionSidePanel");
- DEFINE_VARIATION_PARAM(kIPHCompanionSidePanelRegionSearchFeature,
-@@ -362,7 +362,7 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, 
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
+@@ -370,7 +370,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, 
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillCreditCardBenefitFeature,
+                        "IPH_AutofillCreditCardBenefit");
  DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
-                        "IPH_AutofillExternalAccountProfileSuggestion");
-@@ -448,7 +448,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
+@@ -457,7 +458,7 @@ DEFINE_VARIATION_PARAM(kIPHScalableIphHelpAppBasedTenF
  DEFINE_VARIATION_PARAM(kIPHScalableIphGamingFeature, "IPH_ScalableIphGaming");
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -27,7 +28,7 @@
  DEFINE_VARIATION_PARAM(kIPHDesktopPWAsLinkCapturingLaunch,
                         "IPH_DesktopPWAsLinkCapturingLaunch");
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -598,7 +598,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -606,7 +607,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
          VARIATION_ENTRY(kIPHiOSPromoGenericDefaultBrowserFeature),
          VARIATION_ENTRY(kIPHiOSOverflowMenuCustomizationFeature),
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,16 +37,17 @@
          VARIATION_ENTRY(kIPHBatterySaverModeFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
          VARIATION_ENTRY(kIPHCompanionSidePanelRegionSearchFeature),
-@@ -654,7 +654,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -665,7 +666,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
          // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
  
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
-     BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillCreditCardBenefitFeature),
          VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
          VARIATION_ENTRY(kIPHAutofillManualFallbackFeature),
-@@ -703,7 +703,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -714,7 +716,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
          VARIATION_ENTRY(kIPHScalableIphGamingFeature),
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
diff --git a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
index 444725e2acc4..311885abf56a 100644
--- a/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
+++ b/www/chromium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2023-12-10 06:10:27 UTC
+--- components/feed/core/v2/feed_network_impl_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/feed/core/v2/feed_network_impl_unittest.cc
-@@ -781,8 +781,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
+@@ -753,8 +753,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
  
    EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type());
    EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type());
diff --git a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
index 61de4efc0c09..8d32c7b421af 100644
--- a/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
+++ b/www/chromium/files/patch-components_gwp__asan_client_gwp__asan.cc
@@ -1,6 +1,6 @@
---- components/gwp_asan/client/gwp_asan.cc.orig	2024-04-19 13:02:56 UTC
+--- components/gwp_asan/client/gwp_asan.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/gwp_asan/client/gwp_asan.cc
-@@ -72,7 +72,7 @@ namespace {
+@@ -75,7 +75,7 @@ namespace {
  // ProcessSamplingBoost is the multiplier to increase the
  // ProcessSamplingProbability in scenarios where we want to perform additional
  // testing (e.g., on canary/dev builds).
diff --git a/www/chromium/files/patch-components_live__caption_caption__util.cc b/www/chromium/files/patch-components_live__caption_caption__util.cc
index 05d2735d02ec..1b4eacfc4ef4 100644
--- a/www/chromium/files/patch-components_live__caption_caption__util.cc
+++ b/www/chromium/files/patch-components_live__caption_caption__util.cc
@@ -1,15 +1,6 @@
---- components/live_caption/caption_util.cc.orig	2023-07-16 15:47:57 UTC
+--- components/live_caption/caption_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/live_caption/caption_util.cc
-@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() {
-     return false;
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Check if the CPU has the required instruction set to run the Speech
-   // On-Device API (SODA) library.
-   static bool has_sse41 = base::CPU().has_sse41();
-@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() {
+@@ -144,7 +144,7 @@ std::string GetCaptionSettingsUrl() {
    return "chrome://os-settings/audioAndCaptions";
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-components_media__router_common_media__source.cc b/www/chromium/files/patch-components_media__router_common_media__source.cc
index 11630a22c275..d3a5a0090ee5 100644
--- a/www/chromium/files/patch-components_media__router_common_media__source.cc
+++ b/www/chromium/files/patch-components_media__router_common_media__source.cc
@@ -1,11 +1,11 @@
---- components/media_router/common/media_source.cc.orig	2024-02-23 21:04:38 UTC
+--- components/media_router/common/media_source.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/media_router/common/media_source.cc
-@@ -59,7 +59,7 @@ bool IsSystemAudioCaptureSupported() {
+@@ -57,7 +57,7 @@ bool IsSystemAudioCaptureSupported() {
+   if (!media::IsSystemLoopbackCaptureSupported()) {
+     return false;
    }
- #if BUILDFLAG(IS_MAC)
-   return base::FeatureList::IsEnabled(media::kMacLoopbackAudioForCast);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return base::FeatureList::IsEnabled(media::kPulseaudioLoopbackForCast);
  #else
    return true;
diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc
index dbf14443fba7..4b9dd7d38fd2 100644
--- a/www/chromium/files/patch-components_metrics_metrics__log.cc
+++ b/www/chromium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig	2024-01-30 07:53:34 UTC
+--- components/metrics/metrics_log.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/metrics/metrics_log.cc
-@@ -53,7 +53,7 @@
+@@ -56,7 +56,7 @@
  #include "base/win/current_module.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -142,7 +142,7 @@ void RecordCurrentTime(
+@@ -146,7 +146,7 @@ void RecordCurrentTime(
    }
  }
  
@@ -18,7 +18,7 @@
  metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
      base::nix::SessionType session_type) {
    switch (session_type) {
-@@ -393,7 +393,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -415,7 +415,7 @@ void MetricsLog::RecordCoreSystemProfile(
  // OperatingSystemVersion refers to the ChromeOS release version.
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    os->set_kernel_version(base::SysInfo::KernelVersion());
@@ -27,7 +27,7 @@
    // Linux operating system version is copied over into kernel version to be
    // consistent.
    os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -410,7 +410,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -432,7 +432,7 @@ void MetricsLog::RecordCoreSystemProfile(
    os->set_build_number(base::SysInfo::GetIOSBuildNumber());
  #endif
  
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index 30fba75b837a..3e58cb8edf4c 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig	2024-04-19 13:02:56 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -817,7 +817,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -825,7 +825,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
    // backport, having it behave differently than in stable would be a bigger
    // problem. TODO: Does this work in later macOS releases?
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
index 6f82591d441f..320fd01ff979 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig	2024-04-19 13:02:56 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -781,7 +781,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -782,7 +782,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
  
  TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
index b66b9cb72bea..1651356289ac 100644
--- a/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
+++ b/www/chromium/files/patch-components_optimization__guide_core_optimization__guide__util.cc
@@ -1,6 +1,6 @@
---- components/optimization_guide/core/optimization_guide_util.cc.orig	2024-01-30 07:53:34 UTC
+--- components/optimization_guide/core/optimization_guide_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/optimization_guide/core/optimization_guide_util.cc
-@@ -39,7 +39,7 @@ optimization_guide::proto::Platform GetPlatform() {
+@@ -40,7 +40,7 @@ optimization_guide::proto::Platform GetPlatform() {
    return optimization_guide::proto::PLATFORM_CHROMEOS;
  #elif BUILDFLAG(IS_ANDROID)
    return optimization_guide::proto::PLATFORM_ANDROID;
diff --git a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
index 020622f12c96..306bf245dfba 100644
--- a/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
+++ b/www/chromium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
@@ -1,4 +1,4 @@
---- components/os_crypt/sync/libsecret_util_linux.cc.orig	2023-04-28 17:01:32 UTC
+--- components/os_crypt/sync/libsecret_util_linux.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/os_crypt/sync/libsecret_util_linux.cc
 @@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() {
  
@@ -19,9 +19,9 @@
      // We wanted to use libsecret, but we couldn't load it. Warn, because
      // either the user asked for this, or we autodetected it incorrectly. (Or
      // the system has broken libraries, which is also good to warn about.)
-     // TODO(crbug.com/607435): Channel this message to the user-facing log
+     // TODO(crbug.com/40467093): Channel this message to the user-facing log
 -    VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
-+    VLOG(1) << "Could not load << " << kSecretLib << ": " << dlerror();
++    VLOG(1) << "Could not load " << kSecretLib << ": " << dlerror();
      return false;
    }
  
diff --git a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
index 7339f754fb98..ef635e281c19 100644
--- a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
+++ b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc
@@ -1,6 +1,6 @@
---- components/paint_preview/player/player_compositor_delegate.cc.orig	2024-01-30 07:53:34 UTC
+--- components/paint_preview/player/player_compositor_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/paint_preview/player/player_compositor_delegate.cc
-@@ -455,8 +455,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
+@@ -435,8 +435,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
    auto chrome_version = capture_result_->proto.metadata().chrome_version();
    const auto& current_chrome_version = version_info::GetVersion();
    if (capture_result_->proto.metadata().has_chrome_version() &&
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
index c6578afcb5ee..53252d469fc1 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/features/password_features.cc.orig	2024-04-19 13:02:56 UTC
+--- components/password_manager/core/browser/features/password_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/browser/features/password_features.cc
-@@ -30,7 +30,7 @@ BASE_FEATURE(kButterOnDesktopFollowup,
+@@ -36,7 +36,7 @@ BASE_FEATURE(kClearUndecryptablePasswords,
  
  BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
               "ClearUndecryptablePasswordsInSync",
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -99,7 +99,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable,
+@@ -98,7 +98,7 @@ BASE_FEATURE(kPasswordManualFallbackAvailable,
               "PasswordManualFallbackAvailable",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_FEATURE(kRestartToGainAccessToKeychain,
               "RestartToGainAccessToKeychain",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+ #if BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h
index 049bf94129ef..7969327a5e5d 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h
+++ b/www/chromium/files/patch-components_password__manager_core_browser_features_password__features.h
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/features/password_features.h.orig	2024-04-19 13:02:56 UTC
+--- components/password_manager/core/browser/features/password_features.h.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/browser/features/password_features.h
-@@ -94,7 +94,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
+@@ -82,7 +82,7 @@ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
  // Enables triggering password suggestions through the context menu.
  BASE_DECLARE_FEATURE(kPasswordManualFallbackAvailable);
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
index 9dee653dd7cc..6400703ffaa5 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__form__manager.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/browser/password_form_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- components/password_manager/core/browser/password_form_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/browser/password_form_manager.cc
 @@ -58,7 +58,7 @@
  #include "components/webauthn/android/webauthn_cred_man_delegate.h"
@@ -9,7 +9,7 @@
  #include "components/os_crypt/sync/os_crypt.h"
  #endif
  
-@@ -229,7 +229,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
+@@ -227,7 +227,7 @@ bool ShouldUploadCrowdsourcingVotes(const FormOrDigest
    return false;
  }
  
@@ -18,7 +18,7 @@
  bool ShouldShowKeychainErrorBubble(
      std::optional<PasswordStoreBackendError> backend_error) {
    if (!backend_error.has_value()) {
-@@ -833,7 +833,7 @@ void PasswordFormManager::OnFetchCompleted() {
+@@ -869,7 +869,7 @@ void PasswordFormManager::OnFetchCompleted() {
          error.value().type);
    }
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
index 99848778c074..99e341525f90 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- components/password_manager/core/browser/password_manager.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/password_manager/core/browser/password_manager.cc
-@@ -363,7 +363,7 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -373,7 +373,7 @@ void PasswordManager::RegisterProfilePrefs(
    registry->RegisterListPref(prefs::kPasswordManagerPromoCardsList);
  #endif  // BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
    registry->RegisterBooleanPref(prefs::kPasswordSharingEnabled, true);
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
new file mode 100644
index 000000000000..1c0cb39eb403
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__client.h
@@ -0,0 +1,20 @@
+--- components/password_manager/core/browser/password_manager_client.h.orig	2024-06-17 12:56:06 UTC
++++ components/password_manager/core/browser/password_manager_client.h
+@@ -30,7 +30,7 @@
+ #include "net/cert/cert_status_flags.h"
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/i18n/rtl.h"
+ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
+ #include "ui/gfx/geometry/rect_f.h"
+@@ -505,7 +505,7 @@ class PasswordManagerClient {
+   virtual void RefreshPasswordManagerSettingsIfNeeded() const;
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Creates and show the cross domain confirmation popup.
+   virtual std::unique_ptr<PasswordCrossDomainConfirmationPopupController>
+   ShowCrossDomainConfirmationPopup(const gfx::RectF& element_bounds,
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.cc
new file mode 100644
index 000000000000..d68dde383abf
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_manager_switches.cc.orig	2024-06-17 12:56:06 UTC
++++ components/password_manager/core/browser/password_manager_switches.cc
+@@ -6,7 +6,7 @@
+ 
+ namespace password_manager {
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Specifies which encryption storage backend to use. Possible values are
+ // kwallet, kwallet5, kwallet6, gnome-libsecret, basic.
+ // Any other value will lead to Chrome detecting the best backend automatically.
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h
new file mode 100644
index 000000000000..ece4c189c495
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manager__switches.h
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_manager_switches.h.orig	2024-06-17 12:56:06 UTC
++++ components/password_manager/core/browser/password_manager_switches.h
+@@ -10,7 +10,7 @@
+ 
+ namespace password_manager {
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kPasswordStore[];
+ extern const char kEnableEncryptionSelection[];
+ #endif
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
new file mode 100644
index 000000000000..216a6f416918
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/password_manual_fallback_flow.cc.orig	2024-06-17 12:56:06 UTC
++++ components/password_manager/core/browser/password_manual_fallback_flow.cc
+@@ -192,7 +192,7 @@ void PasswordManualFallbackFlow::DidAcceptSuggestion(
+                          payload.password));
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+       if (payload.is_cross_domain) {
+         cross_domain_confirmation_popup_controller_ =
+             password_client_->ShowCrossDomainConfirmationPopup(
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
new file mode 100644
index 000000000000..e0177f04acc8
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__manual__fallback__flow.h
@@ -0,0 +1,20 @@
+--- components/password_manager/core/browser/password_manual_fallback_flow.h.orig	2024-06-17 12:56:06 UTC
++++ components/password_manager/core/browser/password_manual_fallback_flow.h
+@@ -18,7 +18,7 @@
+ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/password_manager/core/browser/password_cross_domain_confirmation_popup_controller.h"
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -159,7 +159,7 @@ class PasswordManualFallbackFlow : public autofill::Au
+   std::unique_ptr<device_reauth::DeviceAuthenticator> authenticator_;
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<PasswordCrossDomainConfirmationPopupController>
+       cross_domain_confirmation_popup_controller_;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
index e0fd6e5b6ad8..3e4f0f6b5afa 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__async__helper.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2024-02-23 21:04:38 UTC
+--- components/password_manager/core/browser/password_store/login_database_async_helper.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/password_manager/core/browser/password_store/login_database_async_helper.cc
-@@ -135,7 +135,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc
+@@ -149,7 +149,7 @@ LoginsResultOrError LoginDatabaseAsyncHelper::FillMatc
      std::vector<PasswordForm> matched_forms;
      if (!login_db_ ||
          !login_db_->GetLogins(form, include_psl, &matched_forms)) {
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
index 9b73c604369f..40dd4fa34c88 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_password__store_login__database__unittest.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2024-03-22 08:19:40 UTC
+--- components/password_manager/core/browser/password_store/login_database_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/browser/password_store/login_database_unittest.cc
-@@ -2105,7 +2105,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
+@@ -2132,7 +2132,7 @@ INSTANTIATE_TEST_SUITE_P(MigrationToVCurrent,
                           LoginDatabaseMigrationTestBroken,
                           testing::Values(1, 2, 3, 24));
  
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
new file mode 100644
index 000000000000..708006563555
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.cc
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/stub_password_manager_client.cc.orig	2024-05-21 18:07:39 UTC
++++ components/password_manager/core/browser/stub_password_manager_client.cc
+@@ -175,7 +175,7 @@ version_info::Channel StubPasswordManagerClient::GetCh
+ }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<
+     password_manager::PasswordCrossDomainConfirmationPopupController>
+ StubPasswordManagerClient::ShowCrossDomainConfirmationPopup(
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h
new file mode 100644
index 000000000000..6b0f3983dc7b
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_stub__password__manager__client.h
@@ -0,0 +1,11 @@
+--- components/password_manager/core/browser/stub_password_manager_client.h.orig	2024-05-21 18:07:39 UTC
++++ components/password_manager/core/browser/stub_password_manager_client.h
+@@ -74,7 +74,7 @@ class StubPasswordManagerClient : public PasswordManag
+   MockPasswordFeatureManager* GetPasswordFeatureManager();
+   version_info::Channel GetChannel() const override;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<
+       password_manager::PasswordCrossDomainConfirmationPopupController>
+   ShowCrossDomainConfirmationPopup(
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index b9bbf7aa08ea..e7fff686b84d 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig	2024-03-22 08:19:40 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -195,7 +195,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -196,7 +196,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
  }
  
  bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
index 1db403eb1809..710e900fb846 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__pref__names.h
@@ -1,6 +1,6 @@
---- components/password_manager/core/common/password_manager_pref_names.h.orig	2024-04-19 13:02:56 UTC
+--- components/password_manager/core/common/password_manager_pref_names.h.orig	2024-06-17 12:56:06 UTC
 +++ components/password_manager/core/common/password_manager_pref_names.h
-@@ -332,7 +332,7 @@ inline constexpr char kPasswordManagerPromoCardsList[]
+@@ -327,7 +327,7 @@ inline constexpr char kPasswordManagerPromoCardsList[]
  inline constexpr char kPasswordSharingEnabled[] =
      "password_manager.password_sharing_enabled";
  
diff --git a/www/chromium/files/patch-components_performance__manager_public_features.h b/www/chromium/files/patch-components_performance__manager_public_features.h
index d890abe6f25a..130dd84e7838 100644
--- a/www/chromium/files/patch-components_performance__manager_public_features.h
+++ b/www/chromium/files/patch-components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- components/performance_manager/public/features.h.orig	2023-11-03 10:09:45 UTC
+--- components/performance_manager/public/features.h.orig	2024-05-21 18:07:39 UTC
 +++ components/performance_manager/public/features.h
-@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread);
+@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThreadSync);
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
index 2b2a34c5e735..c559672b6890 100644
--- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
+++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc
@@ -1,6 +1,6 @@
---- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2024-04-19 13:02:56 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -413,7 +413,7 @@ class PolicyTestCase {
+@@ -411,7 +411,7 @@ class PolicyTestCase {
      const std::string os("chromeos_lacros");
  #elif BUILDFLAG(IS_IOS)
      const std::string os("ios");
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index 5b90f912cdf3..b65e56465b14 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2024-04-19 13:02:56 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -594,7 +594,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
+@@ -647,7 +647,7 @@ void CloudPolicyClient::FetchPolicy(PolicyFetchReason 
          fetch_request->set_invalidation_payload(invalidation_payload_);
        }
      }
diff --git a/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
index 92f539f394ef..e8c90be5ee08 100644
--- a/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
+++ b/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc
@@ -1,8 +1,8 @@
---- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2022-03-25 21:59:56 UTC
+--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/safe_browsing/content/common/file_type_policies_unittest.cc
 @@ -139,7 +139,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) {
    EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting());
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
index 9025606b4732..dc01edb5cc34 100644
--- a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
+++ b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
@@ -1,6 +1,6 @@
---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2023-12-10 06:10:27 UTC
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
+@@ -118,7 +118,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
  PlatformType GetCurrentPlatformType() {
  #if BUILDFLAG(IS_WIN)
    return WINDOWS_PLATFORM;
diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc
new file mode 100644
index 000000000000..d5f7f803273a
--- /dev/null
+++ b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc
@@ -0,0 +1,11 @@
+--- components/safe_browsing/core/common/features.cc.orig	2024-06-17 12:56:06 UTC
++++ components/safe_browsing/core/common/features.cc
+@@ -160,7 +160,7 @@ BASE_FEATURE(kFriendlierSafeBrowsingSettingsStandardPr
+ BASE_FEATURE(kHashPrefixRealTimeLookups,
+              "SafeBrowsingHashPrefixRealTimeLookups",
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
index 73a9a89910bb..484afca2fe38 100644
--- a/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
+++ b/www/chromium/files/patch-components_search__engines_search__engine__choice_search__engine__choice__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig	2024-04-19 13:02:56 UTC
+--- components/search_engines/search_engine_choice/search_engine_choice_service.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/search_engines/search_engine_choice/search_engine_choice_service.cc
-@@ -437,7 +437,7 @@ void SearchEngineChoiceService::PreprocessPrefsForRepr
+@@ -539,7 +539,7 @@ void SearchEngineChoiceService::ProcessPendingChoiceSc
  
  int SearchEngineChoiceService::GetCountryIdInternal() {
    // `country_codes::kCountryIDAtInstall` may not be set yet.
diff --git a/www/chromium/files/patch-components_search__engines_template__url__service.cc b/www/chromium/files/patch-components_search__engines_template__url__service.cc
index 318b49f0155c..10ed92bc683e 100644
--- a/www/chromium/files/patch-components_search__engines_template__url__service.cc
+++ b/www/chromium/files/patch-components_search__engines_template__url__service.cc
@@ -1,6 +1,6 @@
---- components/search_engines/template_url_service.cc.orig	2024-04-19 13:02:56 UTC
+--- components/search_engines/template_url_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/search_engines/template_url_service.cc
-@@ -2930,7 +2930,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
+@@ -3096,7 +3096,7 @@ bool TemplateURLService::MatchesDefaultSearchProvider(
  std::unique_ptr<EnterpriseSiteSearchManager>
  TemplateURLService::GetEnterpriseSiteSearchManager(PrefService* prefs) {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
index f62411cb27e8..9b43d0429e1d 100644
--- a/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.cc
@@ -1,6 +1,6 @@
---- components/signin/public/base/signin_switches.cc.orig	2024-04-19 13:02:56 UTC
+--- components/signin/public/base/signin_switches.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/signin/public/base/signin_switches.cc
-@@ -132,7 +132,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(
+@@ -135,7 +135,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled() {
  }
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
@@ -9,7 +9,7 @@
  BASE_FEATURE(kMinorModeRestrictionsForHistorySyncOptIn,
               "MinorModeRestrictionsForHistorySyncOptIn",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -141,7 +141,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau
+@@ -144,7 +144,7 @@ constexpr int kMinorModeRestrictionsFetchDeadlineDefau
  #if BUILDFLAG(IS_ANDROID)
      // Based on Signin.AccountCapabilities.UserVisibleLatency
      400;
diff --git a/www/chromium/files/patch-components_signin_public_base_signin__switches.h b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
index 867df2dec5a5..c62b8f7d06b6 100644
--- a/www/chromium/files/patch-components_signin_public_base_signin__switches.h
+++ b/www/chromium/files/patch-components_signin_public_base_signin__switches.h
@@ -1,6 +1,6 @@
---- components/signin/public/base/signin_switches.h.orig	2024-04-19 13:02:56 UTC
+--- components/signin/public/base/signin_switches.h.orig	2024-06-17 12:56:06 UTC
 +++ components/signin/public/base/signin_switches.h
-@@ -123,7 +123,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled(
+@@ -115,7 +115,7 @@ bool IsExplicitBrowserSigninUIOnDesktopEnabled();
  
  // Controls the view mode for (history) sync screen.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-components_soda_soda__util.cc b/www/chromium/files/patch-components_soda_soda__util.cc
new file mode 100644
index 000000000000..2e0dbd31a99c
--- /dev/null
+++ b/www/chromium/files/patch-components_soda_soda__util.cc
@@ -0,0 +1,29 @@
+--- components/soda/soda_util.cc.orig	2024-06-17 12:56:06 UTC
++++ components/soda/soda_util.cc
+@@ -20,7 +20,7 @@
+ #include "base/win/windows_version.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_X86_FAMILY)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_FAMILY)
+ #include "base/cpu.h"
+ #endif
+ 
+@@ -45,7 +45,7 @@ bool IsSupportedChromeOS() {
+ }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsSupportedLinux() {
+ #if defined(ARCH_CPU_X86_FAMILY)
+   // Check if the CPU has the required instruction set to run the Speech
+@@ -76,7 +76,7 @@ bool IsSupportedWin() {
+ bool IsOnDeviceSpeechRecognitionSupported() {
+ #if BUILDFLAG(IS_CHROMEOS)
+   return IsSupportedChromeOS();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return IsSupportedLinux();
+ #elif BUILDFLAG(IS_WIN)
+   return IsSupportedWin();
diff --git a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
index f23e84b504ff..2b36b6f85d94 100644
--- a/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
+++ b/www/chromium/files/patch-components_startup__metric__utils_common_startup__metric__utils.cc
@@ -1,8 +1,8 @@
---- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2024-02-23 21:04:38 UTC
+--- components/startup_metric_utils/common/startup_metric_utils.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/startup_metric_utils/common/startup_metric_utils.cc
 @@ -85,7 +85,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
    // Enabling this logic on OS X causes a significant performance regression.
-   // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are
+   // TODO(crbug.com/40464036): Remove IS_APPLE ifdef once priority changes are
    // ignored on Mac main thread.
 -#if !BUILDFLAG(IS_APPLE)
 +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
new file mode 100644
index 000000000000..875dc3be38db
--- /dev/null
+++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__preferences.cc
@@ -0,0 +1,11 @@
+--- components/supervised_user/core/browser/supervised_user_preferences.cc.orig	2024-06-17 12:56:06 UTC
++++ components/supervised_user/core/browser/supervised_user_preferences.cc
+@@ -153,7 +153,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+       static_cast<int>(FirstTimeInterstitialBannerState::kUnknown));
+   registry->RegisterBooleanPref(prefs::kChildAccountStatusKnown, false);
+ #if BUILDFLAG(ENABLE_EXTENSIONS) && \
+-    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX))
++    (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+   registry->RegisterIntegerPref(
+       prefs::kLocallyParentApprovedExtensionsMigrationState,
+       static_cast<int>(
diff --git a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
index 5deae2c26986..0436dc990832 100644
--- a/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
@@ -1,6 +1,6 @@
---- components/supervised_user/core/browser/supervised_user_service.cc.orig	2024-04-19 13:02:56 UTC
+--- components/supervised_user/core/browser/supervised_user_service.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/supervised_user/core/browser/supervised_user_service.cc
-@@ -170,7 +170,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
+@@ -175,7 +175,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
      const FirstTimeInterstitialBannerState original_state) {
    FirstTimeInterstitialBannerState target_state = original_state;
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.cc b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
index ceaa4133d4b8..f72c5df95bee 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_features.cc
+++ b/www/chromium/files/patch-components_supervised__user_core_common_features.cc
@@ -1,7 +1,7 @@
---- components/supervised_user/core/common/features.cc.orig	2024-04-19 13:02:56 UTC
+--- components/supervised_user/core/common/features.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/supervised_user/core/common/features.cc
-@@ -63,7 +63,7 @@ BASE_FEATURE(kEnableSupervisedUserSkipParentApprovalTo
-              "EnableSupervisedUserSkipParentApprovalToInstallExtensions",
+@@ -59,7 +59,7 @@ BASE_FEATURE(kUpdatedSupervisedUserExtensionApprovalSt
+              "UpdatedSupervisedUserExtensionApprovalStrings",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
  BASE_FEATURE(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop,
               "EnableExtensionsPermissionsForSupervisedUsersOnDesktop",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -74,7 +74,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
+@@ -70,7 +70,7 @@ bool IsSupervisedUserSkipParentApprovalToInstallExtens
  #if BUILDFLAG(IS_CHROMEOS)
    return base::FeatureList::IsEnabled(
        kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_features.h b/www/chromium/files/patch-components_supervised__user_core_common_features.h
index 4b1713457f73..f10afdc03bc1 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_features.h
+++ b/www/chromium/files/patch-components_supervised__user_core_common_features.h
@@ -1,8 +1,8 @@
---- components/supervised_user/core/common/features.h.orig	2024-04-19 13:02:56 UTC
+--- components/supervised_user/core/common/features.h.orig	2024-06-17 12:56:06 UTC
 +++ components/supervised_user/core/common/features.h
-@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kLocalWebApprovals);
- BASE_DECLARE_FEATURE(
-     kEnableSupervisedUserSkipParentApprovalToInstallExtensions);
+@@ -25,7 +25,7 @@ BASE_DECLARE_FEATURE(
+ // Applies new informative strings during the parental extension approval flow.
+ BASE_DECLARE_FEATURE(kUpdatedSupervisedUserExtensionApprovalStrings);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h b/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h
index 782809dbe592..69bf55119eec 100644
--- a/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h
+++ b/www/chromium/files/patch-components_supervised__user_core_common_pref__names.h
@@ -1,6 +1,6 @@
---- components/supervised_user/core/common/pref_names.h.orig	2024-04-19 13:02:56 UTC
+--- components/supervised_user/core/common/pref_names.h.orig	2024-06-17 12:56:06 UTC
 +++ components/supervised_user/core/common/pref_names.h
-@@ -131,7 +131,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat
+@@ -136,7 +136,7 @@ inline constexpr char kFirstTimeInterstitialBannerStat
      "profile.managed.banner_state";
  
  #if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
index be1ef2dc6f9f..a138dae70404 100644
--- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
+++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc
@@ -1,6 +1,6 @@
---- components/sync_device_info/local_device_info_util.cc.orig	2023-09-13 12:11:42 UTC
+--- components/sync_device_info/local_device_info_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/sync_device_info/local_device_info_util.cc
-@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na
+@@ -84,7 +84,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na
  sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
  #if BUILDFLAG(IS_CHROMEOS)
    return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
@@ -9,7 +9,7 @@
    return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
  #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
    switch (ui::GetDeviceFormFactor()) {
-@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
+@@ -109,7 +109,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
    return DeviceInfo::OsType::kChromeOsAsh;
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
    return DeviceInfo::OsType::kChromeOsLacros;
@@ -18,7 +18,7 @@
    return DeviceInfo::OsType::kLinux;
  #elif BUILDFLAG(IS_ANDROID)
    return DeviceInfo::OsType::kAndroid;
-@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
+@@ -128,7 +128,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
  
  DeviceInfo::FormFactor GetLocalDeviceFormFactor() {
  #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_sync_base_features.cc b/www/chromium/files/patch-components_sync_base_features.cc
deleted file mode 100644
index 59a5a0612642..000000000000
--- a/www/chromium/files/patch-components_sync_base_features.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/sync/base/features.cc.orig	2024-04-19 13:02:56 UTC
-+++ components/sync/base/features.cc
-@@ -126,7 +126,7 @@ BASE_FEATURE(kEnablePreferencesAccountStorage,
- BASE_FEATURE(kSyncPollImmediatelyOnEveryStartup,
-              "SyncPollImmediatelyOnEveryStartup2",
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
index 2c23881a9d4d..f839f89f0cae 100644
--- a/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
+++ b/www/chromium/files/patch-components_user__education_views_help__bubble__view.cc
@@ -1,6 +1,6 @@
---- components/user_education/views/help_bubble_view.cc.orig	2024-03-22 08:19:40 UTC
+--- components/user_education/views/help_bubble_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/user_education/views/help_bubble_view.cc
-@@ -1011,7 +1011,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+@@ -997,7 +997,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
  void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
                                                views::Widget* widget) const {
    BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc
new file mode 100644
index 000000000000..abcd386b161a
--- /dev/null
+++ b/www/chromium/files/patch-components_viz_common_features.cc
@@ -0,0 +1,20 @@
+--- components/viz/common/features.cc.orig	2024-06-17 12:56:06 UTC
++++ components/viz/common/features.cc
+@@ -251,7 +251,7 @@ BASE_FEATURE(kBufferQueueImageSetPurgeable,
+              "BufferQueueImageSetPurgeable",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // On platforms using SkiaOutputDeviceBufferQueue and not yet universally using
+ // SkiaRenderer-allocated images, when this is true SkiaRenderer will allocate
+ // and maintain a buffer queue of images for the root render pass, instead of
+@@ -535,7 +535,7 @@ bool ShouldOnBeginFrameThrottleVideo() {
+   return base::FeatureList::IsEnabled(features::kOnBeginFrameThrottleVideo);
+ }
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool ShouldRendererAllocateImages() {
+   return base::FeatureList::IsEnabled(kRendererAllocatesImages);
+ }
diff --git a/www/chromium/files/patch-components_viz_common_features.h b/www/chromium/files/patch-components_viz_common_features.h
new file mode 100644
index 000000000000..148812e7fada
--- /dev/null
+++ b/www/chromium/files/patch-components_viz_common_features.h
@@ -0,0 +1,20 @@
+--- components/viz/common/features.h.orig	2024-06-17 12:56:06 UTC
++++ components/viz/common/features.h
+@@ -74,7 +74,7 @@ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kDrawPredictedI
+ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kAllowUndamagedNonrootRenderPassToSkip);
+ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(
+     kAllowForceMergeRenderPassWithRequireOverlayQuads);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kRendererAllocatesImages);
+ #endif
+ VIZ_COMMON_EXPORT BASE_DECLARE_FEATURE(kBufferQueueImageSetPurgeable);
+@@ -134,7 +134,7 @@ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSched
+ VIZ_COMMON_EXPORT std::optional<double> IsDynamicSchedulerEnabledForClients();
+ VIZ_COMMON_EXPORT int MaxOverlaysConsidered();
+ VIZ_COMMON_EXPORT bool ShouldOnBeginFrameThrottleVideo();
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ VIZ_COMMON_EXPORT bool ShouldRendererAllocateImages();
+ #endif
+ VIZ_COMMON_EXPORT bool IsOnBeginFrameAcksEnabled();
diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc
index 4c63ecd3a9b4..f8955c1b6747 100644
--- a/www/chromium/files/patch-components_viz_host_host__display__client.cc
+++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc
@@ -1,6 +1,6 @@
---- components/viz/host/host_display_client.cc.orig	2024-01-30 07:53:34 UTC
+--- components/viz/host/host_display_client.cc.orig	2024-05-21 18:07:39 UTC
 +++ components/viz/host/host_display_client.cc
-@@ -64,7 +64,7 @@ void HostDisplayClient::AddChildWindowToBrowser(
+@@ -65,7 +65,7 @@ void HostDisplayClient::AddChildWindowToBrowser(
  }
  #endif
  
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc
new file mode 100644
index 000000000000..a4d900371c75
--- /dev/null
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__buffer__queue.cc
@@ -0,0 +1,11 @@
+--- components/viz/service/display_embedder/skia_output_device_buffer_queue.cc.orig	2024-06-17 12:56:06 UTC
++++ components/viz/service/display_embedder/skia_output_device_buffer_queue.cc
+@@ -197,7 +197,7 @@ SkiaOutputDeviceBufferQueue::SkiaOutputDeviceBufferQue
+   capabilities_.only_invalidates_damage_rect = false;
+   capabilities_.number_of_buffers = 3;
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   capabilities_.renderer_allocates_images =
+       ::features::ShouldRendererAllocateImages();
+ #else
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index fc579ddbbd9f..7860e8272dc0 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2024-04-25 21:17:54 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1527,7 +1527,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1522,7 +1522,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                            ->GetVulkanPhysicalDevice(),
                                        VK_IMAGE_TILING_OPTIMAL, vk_format,
                                        si_format, yuv_color_space, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index 3f501b56ec58..e96833abb05a 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,8 +1,8 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig	2024-02-23 21:04:38 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/viz/service/display_embedder/software_output_surface.cc
 @@ -124,7 +124,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
        now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -11,7 +11,7 @@
  #endif
 @@ -153,7 +153,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index 3d8759e36eb0..c7b520747fac 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,8 +1,8 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig	2023-12-10 06:10:27 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig	2024-06-17 12:56:06 UTC
 +++ components/viz/service/display_embedder/software_output_surface.h
 @@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
    gfx::OverlayTransform GetDisplayTransform() override;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -11,7 +11,7 @@
  #endif
 @@ -70,7 +70,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
index 3711cc5ce6a2..2ee5b455ba88 100644
--- a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig	2024-04-19 13:02:56 UTC
+--- components/viz/service/display/skia_renderer.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/viz/service/display/skia_renderer.cc
-@@ -1448,7 +1448,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1442,7 +1442,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index 1a3381f6e758..0171c97c3059 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,4 +1,4 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
 @@ -111,7 +111,7 @@ RootCompositorFrameSinkImpl::Create(
    output_surface->SetNeedsSwapSizeNotifications(
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -649,7 +649,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -656,7 +656,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
    if (display_client_ && enable_swap_completion_callback_) {
      display_client_->DidCompleteSwapWithSize(pixel_size);
    }
diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc
index db478fe22317..35e97f17355f 100644
--- a/www/chromium/files/patch-content_app_content__main.cc
+++ b/www/chromium/files/patch-content_app_content__main.cc
@@ -1,6 +1,6 @@
---- content/app/content_main.cc.orig	2024-02-23 21:04:38 UTC
+--- content/app/content_main.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/app/content_main.cc
-@@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params,
+@@ -206,7 +206,7 @@ RunContentProcess(ContentMainParams params,
  #endif
      base::EnableTerminationOnOutOfMemory();
  
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index b67c231aaef1..6a8c4ce0ff03 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig	2024-03-22 08:19:40 UTC
+--- content/app/content_main_runner_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/app/content_main_runner_impl.cc
-@@ -143,13 +143,13 @@
+@@ -144,18 +144,20 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -16,7 +16,14 @@
  #include "base/files/file_path_watcher_inotify.h"
  #include "base/native_library.h"
  #include "base/rand_util.h"
-@@ -187,6 +187,10 @@
+ #include "content/public/common/zygote/sandbox_support_linux.h"
++#if !BUILDFLAG(IS_BSD)
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ #include "third_party/boringssl/src/include/openssl/crypto.h"
+ #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
+ 
+@@ -189,6 +191,10 @@
  #include "media/base/media_switches.h"
  #endif
  
@@ -27,7 +34,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -373,7 +377,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -384,7 +390,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -36,7 +43,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -411,7 +415,10 @@ void PreloadLibraryCdms() {
+@@ -422,7 +428,10 @@ void PreloadLibraryCdms() {
  
  void PreSandboxInit() {
    // Ensure the /dev/urandom is opened.
@@ -47,7 +54,7 @@
  
    // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
    // files.
-@@ -423,9 +430,16 @@ void PreSandboxInit() {
+@@ -434,9 +443,16 @@ void PreSandboxInit() {
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
@@ -64,7 +71,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -838,11 +852,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -847,11 +863,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
                   base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -78,7 +85,7 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1035,8 +1048,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1038,8 +1053,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
        process_type == switches::kZygoteProcess) {
      PreSandboxInit();
    }
@@ -99,7 +106,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1104,7 +1129,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1114,7 +1141,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
            ->ReconfigureAfterFeatureListInit(process_type);
      }
  
@@ -108,7 +115,7 @@
      // If dynamic Mojo Core is being used, ensure that it's loaded very early in
      // the child/zygote process, before any sandbox is initialized. The library
      // is not fully initialized with IPC support until a ChildProcess is later
-@@ -1139,6 +1164,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1149,6 +1176,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 6eca2da664cc..ef185a30f35f 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- content/browser/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/BUILD.gn
-@@ -2406,6 +2406,13 @@ source_set("browser") {
+@@ -2408,6 +2408,13 @@ source_set("browser") {
      deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
    }
  
diff --git a/www/chromium/files/patch-content_browser_audio_audio__service.cc b/www/chromium/files/patch-content_browser_audio_audio__service.cc
index 933a4193a464..69abc73cec38 100644
--- a/www/chromium/files/patch-content_browser_audio_audio__service.cc
+++ b/www/chromium/files/patch-content_browser_audio_audio__service.cc
@@ -1,6 +1,6 @@
---- content/browser/audio/audio_service.cc.orig	2024-02-23 21:04:38 UTC
+--- content/browser/audio/audio_service.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/audio/audio_service.cc
-@@ -34,7 +34,7 @@
+@@ -32,7 +32,7 @@
  #if BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  #include "ui/display/util/edid_parser.h"
  
@@ -9,7 +9,7 @@
  #include "ui/display/display_util.h"
  #endif  // BUILDFLAG(IS_LINUX)
  
-@@ -202,7 +202,7 @@ audio::mojom::AudioService& GetAudioService() {
+@@ -200,7 +200,7 @@ audio::mojom::AudioService& GetAudioService() {
          ->PostTaskAndReplyWithResult(
              FROM_HERE, base::BindOnce(&ScanEdidBitstreams),
              base::BindOnce(&LaunchAudioService, std::move(receiver)));
diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
index fd852fcb7398..8daf9b23cecb 100644
--- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_child_process_host_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/browser_child_process_host_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/browser_child_process_host_impl.cc
-@@ -329,6 +329,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+@@ -330,6 +330,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
        switches::kMojoCoreLibraryPath,
        switches::kPerfettoDisableInterning,
        switches::kTraceToConsole,
@@ -8,7 +8,7 @@
    };
    cmd_line->CopySwitchesFrom(browser_command_line, kForwardSwitches);
  
-@@ -644,7 +645,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() 
+@@ -658,7 +659,7 @@ void BrowserChildProcessHostImpl::OnProcessLaunched() 
            ->child_process());
  #endif
  
diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
index 01c48bc74f14..7e977be2de28 100644
--- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/browser_child_process_host_impl.h.orig	2024-04-19 13:02:56 UTC
+--- content/browser/browser_child_process_host_impl.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/browser_child_process_host_impl.h
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
  #include "base/win/object_watcher.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/child_thread_type_switcher_linux.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -266,7 +266,7 @@ class BrowserChildProcessHostImpl
+@@ -273,7 +273,7 @@ class BrowserChildProcessHostImpl
    std::unique_ptr<tracing::SystemTracingService> system_tracing_service_;
  #endif
  
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index d212da0d13ad..4716e44a05a4 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/browser_main_loop.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/browser_main_loop.cc
-@@ -251,6 +251,12 @@
+@@ -249,6 +249,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -13,7 +13,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -556,6 +562,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -554,6 +560,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -593,7 +605,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -591,7 +603,7 @@ int BrowserMainLoop::EarlyInitialization() {
    base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
index 6358752b531b..a93872bf26ac 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper.h
@@ -1,8 +1,8 @@
---- content/browser/child_process_launcher_helper.h.orig	2024-04-19 13:02:56 UTC
+--- content/browser/child_process_launcher_helper.h.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/child_process_launcher_helper.h
-@@ -293,7 +293,7 @@ class ChildProcessLauncherHelper
-   std::unique_ptr<SandboxedProcessLauncherDelegate> delegate_;
-   base::WeakPtr<ChildProcessLauncher> child_process_launcher_;
+@@ -297,7 +297,7 @@ class ChildProcessLauncherHelper
+   std::optional<base::ProcessId> process_id_ = std::nullopt;
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index eba7cac39400..6303dfc38e0c 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig	2023-11-03 10:09:45 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/child_process_launcher_helper_linux.cc
-@@ -21,7 +21,9 @@
+@@ -22,7 +22,9 @@
  #include "content/public/common/result_codes.h"
  #include "content/public/common/sandboxed_process_launcher_delegate.h"
  #include "content/public/common/zygote/sandbox_support_linux.h"
@@ -10,7 +10,7 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
  
  namespace content {
-@@ -46,14 +48,20 @@ ChildProcessLauncherHelper::GetFilesToMap() {
+@@ -47,14 +49,20 @@ ChildProcessLauncherHelper::GetFilesToMap() {
  }
  
  bool ChildProcessLauncherHelper::IsUsingLaunchOptions() {
@@ -31,7 +31,7 @@
      // Convert FD mapping to FileHandleMappingVector
      options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
          base::GlobalDescriptors::kBaseDescriptor);
-@@ -65,7 +73,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+@@ -66,7 +74,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
  
      options->environment = delegate_->GetEnvironment();
    } else {
@@ -41,15 +41,15 @@
      // Environment variables could be supported in the future, but are not
      // currently supported when launching with the zygote.
      DCHECK(delegate_->GetEnvironment().empty());
-@@ -82,6 +92,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -83,6 +93,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
      int* launch_result) {
    *is_synchronous_launch = true;
    Process process;
 +#if !BUILDFLAG(IS_BSD)
    ZygoteCommunication* zygote_handle = GetZygoteForLaunch();
    if (zygote_handle) {
-     // TODO(crbug.com/569191): If chrome supported multiple zygotes they could
-@@ -92,7 +103,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+     // TODO(crbug.com/40448989): If chrome supported multiple zygotes they could
+@@ -93,7 +104,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          GetProcessType());
      *launch_result = LAUNCH_RESULT_SUCCESS;
  
@@ -57,7 +57,7 @@
      if (handle) {
        // It could be a renderer process or an utility process.
        int oom_score = content::kMiscOomScore;
-@@ -101,15 +111,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -102,15 +112,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          oom_score = content::kLowestRendererOomScore;
        ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
      }
@@ -75,8 +75,8 @@
 +#endif
  
  #if BUILDFLAG(IS_CHROMEOS)
-   if (GetProcessType() == switches::kRendererProcess) {
-@@ -131,10 +143,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+   process_id_ = process.process.Pid();
+@@ -134,10 +146,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
      const ChildProcessLauncherHelper::Process& process,
      bool known_dead) {
    ChildProcessTerminationInfo info;
@@ -91,7 +91,7 @@
      info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
                                                        &info.exit_code);
    } else {
-@@ -160,13 +176,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -163,13 +179,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
    DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
@@ -109,7 +109,7 @@
  }
  
  void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
-@@ -179,11 +199,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL
+@@ -182,11 +202,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL
    }
  }
  
diff --git a/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc b/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc
index 88fa0d2ad071..80f012e6e411 100644
--- a/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc
+++ b/www/chromium/files/patch-content_browser_child__thread__type__switcher__linux.cc
@@ -1,4 +1,4 @@
---- content/browser/child_thread_type_switcher_linux.cc.orig	2023-12-10 06:10:27 UTC
+--- content/browser/child_thread_type_switcher_linux.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/child_thread_type_switcher_linux.cc
 @@ -20,6 +20,9 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
                                     base::ThreadType thread_type) {
@@ -10,7 +10,7 @@
    bool ns_pid_supported = false;
    pid_t peer_tid = base::FindThreadID(peer_pid, ns_tid, &ns_pid_supported);
    if (peer_tid == -1) {
-@@ -37,6 +40,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
+@@ -38,6 +41,7 @@ void SetThreadTypeOnLauncherThread(base::ProcessId pee
  
    base::PlatformThread::SetThreadType(peer_pid, peer_tid, thread_type,
                                        base::IsViaIPC(true));
diff --git a/www/chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h b/www/chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
index d3c8ff7f9c01..c8a223cb39f0 100644
--- a/www/chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
+++ b/www/chromium/files/patch-content_browser_devtools_devtools__frontend__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/devtools/devtools_frontend_host_impl.h.orig	2023-11-03 10:09:45 UTC
+--- content/browser/devtools/devtools_frontend_host_impl.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/devtools/devtools_frontend_host_impl.h
-@@ -33,7 +33,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte
+@@ -34,7 +34,7 @@ class DevToolsFrontendHostImpl : public DevToolsFronte
  
    void BadMessageReceived() override;
  
diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
index 6ad4ea61d97a..0133f9d8d800 100644
--- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
+++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/devtools/protocol/system_info_handler.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/devtools/protocol/system_info_handler.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/devtools/protocol/system_info_handler.cc
-@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
+@@ -51,7 +51,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
  // 1046598, and 1153667.
  // Windows builds need more time -- see Issue 873112 and 1004472.
  // Mac builds need more time - see Issue angleproject:6182.
diff --git a/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
index 2ed42a8e3cbe..c2ba6f4d490a 100644
--- a/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
+++ b/www/chromium/files/patch-content_browser_file__system__access_file__system__access__local__path__watcher.cc
@@ -1,11 +1,11 @@
---- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2023-11-03 10:09:45 UTC
+--- content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/file_system_access/file_system_access_local_path_watcher.cc
-@@ -63,7 +63,7 @@ void FileSystemAccessLocalPathWatcher::Initialize(
-   base::FilePathWatcher::WatchOptions watch_options {
-     .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive
-                                   : base::FilePathWatcher::Type::kNonRecursive,
+@@ -64,7 +64,7 @@ void FileSystemAccessLocalPathWatcher::Initialize(
+       .type = scope().IsRecursive()
+                   ? base::FilePathWatcher::Type::kRecursive
+                   : base::FilePathWatcher::Type::kNonRecursive,
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     // Note: `report_modified_path` is also present on Android
-     // and Fuchsia. Update this switch if support for watching
-     // the local file system is added on those platforms.
+       // Note: `report_modified_path` is also present on Android
+       // and Fuchsia. Update this switch if support for watching
+       // the local file system is added on those platforms.
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
index f7c90c69ea55..4fec1c50b80c 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.cc
-@@ -394,7 +394,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+@@ -397,7 +397,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
    private_->OnDisplayMetricsChanged(display, changed_metrics);
  }
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
index a9f6b6851ab3..2aa84fd31c5a 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-04-19 13:02:56 UTC
+--- content/browser/gpu/gpu_data_manager_impl.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/gpu/gpu_data_manager_impl.h
-@@ -217,7 +217,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+@@ -219,7 +219,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics) override;
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
index da4369a9a95f..cf5fe9ff5b13 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -1673,7 +1673,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+@@ -1692,7 +1692,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
    UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
  }
  
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
index 7e878d710b14..7295cb22cb16 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-04-19 13:02:56 UTC
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/gpu/gpu_data_manager_impl_private.h
-@@ -149,7 +149,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -150,7 +150,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    void OnDisplayMetricsChanged(const display::Display& display,
                                 uint32_t changed_metrics);
  
@@ -9,7 +9,7 @@
    bool IsGpuMemoryBufferNV12Supported();
    void SetGpuMemoryBufferNV12Supported(bool supported);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -301,7 +301,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+@@ -302,7 +302,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    bool application_is_visible_ = true;
  
    bool disable_gpu_compositing_ = false;
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index f3ec73f9128b..b127d3d90cce 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/gpu/gpu_process_host.cc
-@@ -264,6 +264,7 @@ static const char* const kSwitchNames[] = {
+@@ -268,6 +268,7 @@ static const char* const kSwitchNames[] = {
      switches::kEnableLowEndDeviceMode,
      switches::kDisableSkiaGraphite,
      switches::kDisableLowEndDeviceMode,
@@ -8,9 +8,9 @@
      switches::kProfilingAtStart,
      switches::kProfilingFile,
      switches::kProfilingFlush,
-@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = {
-     switches::kDisableExplicitDmaFences,
+@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = {
      switches::kOzoneDumpFile,
+     switches::kEnableNativeGpuMemoryBuffers,
  #endif
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
index c3269a9e39de..d056bbc8021a 100644
--- a/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
+++ b/www/chromium/files/patch-content_browser_media_frameless__media__interface__proxy.h
@@ -1,4 +1,4 @@
---- content/browser/media/frameless_media_interface_proxy.h.orig	2022-10-24 13:33:33 UTC
+--- content/browser/media/frameless_media_interface_proxy.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/media/frameless_media_interface_proxy.h
 @@ -19,7 +19,7 @@
  #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -9,7 +9,7 @@
  #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -100,7 +100,7 @@ class FramelessMediaInterfaceProxy final
+@@ -105,7 +105,7 @@ class FramelessMediaInterfaceProxy final
    // Connections to the renderer.
    mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_;
  
diff --git a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
index 352984aa5db6..885cd16ea6ec 100644
--- a/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/chromium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig	2024-01-30 07:53:34 UTC
+--- content/browser/network_service_instance_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/network_service_instance_impl.cc
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -359,7 +359,7 @@ void CreateInProcessNetworkService(
+@@ -360,7 +360,7 @@ void CreateInProcessNetworkService(
                                  std::move(receiver)));
  }
  
@@ -18,7 +18,7 @@
  // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
  // high-priority thread pool.
  void RunSystemDnsResolverOnThreadPool(
-@@ -428,7 +428,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -429,7 +429,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
index 8d485438562e..3d4968252b48 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_media_service__video__capture__device__launcher.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2023-12-10 06:10:27 UTC
+--- content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/renderer_host/media/service_video_capture_device_launcher.cc
 @@ -25,7 +25,7 @@
  #include "media/base/media_switches.h"
@@ -9,7 +9,7 @@
  #include "content/browser/gpu/gpu_data_manager_impl.h"
  #endif
  
-@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs
+@@ -173,7 +173,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs
    }
  #else
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 93e6ac80fc40..4e8a066eb092 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -225,7 +225,7 @@
+@@ -223,7 +223,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -967,7 +967,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -964,7 +964,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1149,7 +1149,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1150,7 +1150,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
    IOThreadHostImpl& operator=(const IOThreadHostImpl& other) = delete;
  
    void SetPid(base::ProcessId child_pid) {
@@ -27,7 +27,7 @@
      child_thread_type_switcher_.SetPid(child_pid);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
    }
-@@ -1166,7 +1166,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1167,7 +1167,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
          return;
      }
  
@@ -36,7 +36,7 @@
      if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
        ConnectToFontService(std::move(font_receiver));
        return;
-@@ -1260,7 +1260,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1261,7 +1261,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
    std::unique_ptr<service_manager::BinderRegistry> binders_;
    mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -45,7 +45,7 @@
    mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
        video_encode_accelerator_factory_remote_;
    ChildThreadTypeSwitcher child_thread_type_switcher_;
-@@ -3353,7 +3353,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3379,7 +3379,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
              base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
    }
  
@@ -54,7 +54,7 @@
    // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
    // for NV12 GPU memory buffer.
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
-@@ -3412,6 +3412,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3437,6 +3437,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
      switches::kDisableSpeechAPI,
      switches::kDisableThreadedCompositing,
      switches::kDisableTouchDragDrop,
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index b37628f18aaf..f42d828bd1e9 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig	2024-03-22 08:19:40 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/renderer_host/render_process_host_impl.h
-@@ -548,7 +548,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -599,7 +599,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Sets this RenderProcessHost to be guest only. For Testing only.
    void SetForGuestsOnlyForTesting();
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index a018ade93ce6..ee0fe06c2ad7 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -272,7 +272,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -271,7 +271,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index fb935548bb16..7c1ba368b913 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -119,7 +119,7 @@
+@@ -120,7 +120,7 @@
  #include "ui/gfx/gdi_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/text_input_flags.h"
-@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -469,7 +469,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
      return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
          ->GetCOM();
  
@@ -18,8 +18,8 @@
    BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1705,7 +1705,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
-   return host_->delegate() && host_->delegate()->ShouldDoLearning();
+@@ -1730,7 +1730,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+   return host() && host()->delegate() && host()->delegate()->ShouldDoLearning();
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -27,7 +27,7 @@
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2538,7 +2538,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2561,7 +2561,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -2722,7 +2722,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2745,7 +2745,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 0066af0e5bc4..2e3e7fe8d23b 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2024-01-30 07:53:34 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -599,7 +599,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
index 2c45b03fb15d..b1b0b461936c 100644
--- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2023-08-17 07:33:31 UTC
+--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc
-@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
+@@ -339,7 +339,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
      // in context menus, among others). Simply ignore the mismatches for now.
      // See https://crbug.com/929813 for the details of why the mismatch
      // happens.
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc
index 61d6657762f5..412d78a43d7d 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.cc
+++ b/www/chromium/files/patch-content_browser_utility__process__host.cc
@@ -1,4 +1,4 @@
---- content/browser/utility_process_host.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/utility_process_host.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/utility_process_host.cc
 @@ -61,7 +61,7 @@
  #include "content/browser/v8_snapshot_files.h"
@@ -9,7 +9,7 @@
  #include "base/files/file_util.h"
  #include "base/files/scoped_file.h"
  #include "base/pickle.h"
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
  #include "services/network/public/mojom/network_service.mojom.h"
  #endif
  
@@ -18,7 +18,7 @@
  #include "base/task/sequenced_task_runner.h"
  #include "components/viz/host/gpu_client.h"
  #include "media/capture/capture_switches.h"
-@@ -86,7 +86,7 @@ namespace content {
+@@ -85,7 +85,7 @@ namespace content {
  
  namespace {
  
@@ -36,7 +36,7 @@
        allowed_gpu_(false),
        gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
  #endif
-@@ -234,7 +234,7 @@ void UtilityProcessHost::SetPinUser32() {
+@@ -209,7 +209,7 @@ void UtilityProcessHost::SetPreloadLibraries(
  #endif  // BUILDFLAG(IS_WIN)
  
  void UtilityProcessHost::SetAllowGpuClient() {
@@ -45,8 +45,18 @@
    allowed_gpu_ = true;
  #endif
  }
-@@ -434,7 +434,7 @@ bool UtilityProcessHost::StartProcess() {
-     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
+@@ -349,6 +349,9 @@ bool UtilityProcessHost::StartProcess() {
+       switches::kFailAudioStreamCreation,
+       switches::kMuteAudio,
+       switches::kUseFileForFakeAudioCapture,
++#if BUILDFLAG(IS_BSD)
++      switches::kAudioBackend,
++#endif
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_SOLARIS)
+       switches::kAlsaInputDevice,
+@@ -409,7 +412,7 @@ bool UtilityProcessHost::StartProcess() {
+     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload(*cmd_line));
  #endif  // BUILDFLAG(IS_POSIX)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -54,7 +64,7 @@
      // The network service should have access to the parent directories
      // necessary for its usage.
      if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
-@@ -445,13 +445,13 @@ bool UtilityProcessHost::StartProcess() {
+@@ -420,13 +423,13 @@ bool UtilityProcessHost::StartProcess() {
      }
  #endif  // BUILDFLAG(IS_LINUX)
  
diff --git a/www/chromium/files/patch-content_browser_utility__process__host.h b/www/chromium/files/patch-content_browser_utility__process__host.h
index 5563360ffdb5..e3370ab6b787 100644
--- a/www/chromium/files/patch-content_browser_utility__process__host.h
+++ b/www/chromium/files/patch-content_browser_utility__process__host.h
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host.h.orig	2024-04-19 13:02:56 UTC
+--- content/browser/utility_process_host.h.orig	2024-05-21 18:07:39 UTC
 +++ content/browser/utility_process_host.h
-@@ -39,7 +39,7 @@ namespace base {
+@@ -33,7 +33,7 @@ namespace base {
  class Thread;
  }  // namespace base
  
@@ -9,9 +9,9 @@
  namespace viz {
  class GpuClient;
  }  // namespace viz
-@@ -228,7 +228,7 @@ class CONTENT_EXPORT UtilityProcessHost
-   std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
- #endif
+@@ -200,7 +200,7 @@ class CONTENT_EXPORT UtilityProcessHost
+   };
+   LaunchState launch_state_ = LaunchState::kLaunchInProgress;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
index e686f76f3ff1..2cfe90acfeec 100644
--- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
+++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc
@@ -1,8 +1,8 @@
---- content/browser/v8_snapshot_files.cc.orig	2023-03-09 06:31:50 UTC
+--- content/browser/v8_snapshot_files.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/v8_snapshot_files.cc
-@@ -13,7 +13,7 @@ namespace content {
+@@ -17,7 +17,7 @@ namespace content {
  std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>>
- GetV8SnapshotFilesToPreload() {
+ GetV8SnapshotFilesToPreload(base::CommandLine& process_command_line) {
    std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index d2b6094e510b..d753b96ac3d4 100644
--- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig	2024-04-19 13:02:56 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/web_contents/web_contents_view_aura.cc
 @@ -174,7 +174,7 @@ class WebDragSourceAura : public content::WebContentsO
    raw_ptr<aura::Window> window_;
@@ -18,7 +18,7 @@
    // We set the file contents before the URL because the URL also sets file
    // contents (to a .URL shortcut).  We want to prefer file content data over
    // a shortcut so we add it first.
-@@ -1330,7 +1330,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
      // Linux window managers like to handle raise-on-click themselves.  If we
      // raise-on-click manually, this may override user settings that prevent
      // focus-stealing.
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
index f9ecfc4d4301..16cd2f56ac91 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig	2023-05-31 08:12:17 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/webui/web_ui_main_frame_observer.cc
 @@ -13,7 +13,7 @@
  #include "content/public/browser/navigation_handle.h"
@@ -29,7 +29,7 @@
      blink::mojom::ConsoleMessageLevel log_level,
 @@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
  
- // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
+ // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL
  // thunking issues. Fix & re-enable.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
index 20f198f06ca5..29a6af814c8d 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
@@ -1,8 +1,8 @@
---- content/browser/webui/web_ui_main_frame_observer.h.orig	2022-07-22 17:30:31 UTC
+--- content/browser/webui/web_ui_main_frame_observer.h.orig	2024-06-17 12:56:06 UTC
 +++ content/browser/webui/web_ui_main_frame_observer.h
 @@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
  
- // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
+ // TODO(crbug.com/40149439) This is currently disabled due to Windows DLL
  // thunking issues. Fix & re-enable.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn
index 0d85489d1809..cb012a793339 100644
--- a/www/chromium/files/patch-content_child_BUILD.gn
+++ b/www/chromium/files/patch-content_child_BUILD.gn
@@ -1,6 +1,6 @@
---- content/child/BUILD.gn.orig	2024-02-23 21:04:38 UTC
+--- content/child/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ content/child/BUILD.gn
-@@ -131,6 +131,13 @@ target(link_target_type, "child") {
+@@ -130,6 +130,13 @@ target(link_target_type, "child") {
      ]
    }
  
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index 1d04f98784ee..cc827b224fc2 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- content/common/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ content/common/BUILD.gn
-@@ -444,19 +444,28 @@ source_set("common") {
+@@ -448,19 +448,28 @@ source_set("common") {
    }
  
    if (is_linux || is_chromeos) {
diff --git a/www/chromium/files/patch-content_common_features.cc b/www/chromium/files/patch-content_common_features.cc
index a4b0ea019803..063b67ce091e 100644
--- a/www/chromium/files/patch-content_common_features.cc
+++ b/www/chromium/files/patch-content_common_features.cc
@@ -1,7 +1,7 @@
---- content/common/features.cc.orig	2024-04-19 13:02:56 UTC
+--- content/common/features.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/common/features.cc
-@@ -169,7 +169,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -164,7 +164,7 @@ BASE_FEATURE(kEnableBackForwardCacheForOngoingSubframe
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
  // Enables error reporting for JS errors inside DevTools frontend host
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -9,7 +9,7 @@
  BASE_FEATURE(kEnableDevToolsJsErrorReporting,
               "EnableDevToolsJsErrorReporting",
               base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -272,7 +272,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
+@@ -253,7 +253,7 @@ BASE_FEATURE(kGroupNIKByJoiningOrigin,
  // process and having browser process handle adjusting thread properties (nice
  // value, c-group, latency sensitivity...) for children which have sandbox
  // restrictions.
diff --git a/www/chromium/files/patch-content_common_features.h b/www/chromium/files/patch-content_common_features.h
index 9b74dafa9b2e..85032f202964 100644
--- a/www/chromium/files/patch-content_common_features.h
+++ b/www/chromium/files/patch-content_common_features.h
@@ -1,6 +1,6 @@
---- content/common/features.h.orig	2024-04-19 13:02:56 UTC
+--- content/common/features.h.orig	2024-06-17 12:56:06 UTC
 +++ content/common/features.h
-@@ -38,7 +38,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg
+@@ -36,7 +36,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDocumentPolicyNeg
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableBackForwardCacheForScreenReader);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(
      kEnableBackForwardCacheForOngoingSubframeNavigation);
@@ -8,8 +8,8 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableDevToolsJsErrorReporting);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnsureAllowBindingsIsAlwaysForWebUI);
-@@ -63,7 +63,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kEmbeddingRequiresOptIn);
+@@ -59,7 +59,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kGpuInfoCollectionSeparatePrefetch);
  #endif
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kGroupNIKByJoiningOrigin);
@@ -17,4 +17,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kHandleChildThreadTypeChangesInBrowser);
  #endif
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kHighPriorityBeforeUnload);
+ #if BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-content_common_font__list__unittest.cc b/www/chromium/files/patch-content_common_font__list__unittest.cc
index 2abc9696304c..8ae02d2af573 100644
--- a/www/chromium/files/patch-content_common_font__list__unittest.cc
+++ b/www/chromium/files/patch-content_common_font__list__unittest.cc
@@ -1,6 +1,6 @@
---- content/common/font_list_unittest.cc.orig	2023-02-08 09:03:45 UTC
+--- content/common/font_list_unittest.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/common/font_list_unittest.cc
-@@ -47,7 +47,7 @@ TEST(FontList, GetFontList) {
+@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) {
          EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic"));
          EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI"));
          EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana"));
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index 52a1c3350848..781f7631daa7 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig	2024-04-19 13:02:56 UTC
+--- content/gpu/gpu_main.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/gpu/gpu_main.cc
-@@ -91,10 +91,14 @@
+@@ -94,10 +94,14 @@
  #include "sandbox/win/src/sandbox.h"
  #endif
  
@@ -16,7 +16,7 @@
  #include "sandbox/policy/sandbox_type.h"
  #endif
  
-@@ -114,7 +118,7 @@ namespace content {
+@@ -117,7 +121,7 @@ namespace content {
  
  namespace {
  
@@ -25,7 +25,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -179,7 +183,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -182,7 +186,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
    bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
                                  const gpu::GPUInfo* gpu_info,
                                  const gpu::GpuPreferences& gpu_prefs) override {
@@ -43,17 +43,17 @@
  #error "Unsupported Linux platform."
  #elif BUILDFLAG(IS_MAC)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -328,7 +332,8 @@ int GpuMain(MainFunctionParams parameters) {
-   // before it.
-   InitializeSkia();
+@@ -313,7 +317,8 @@ int GpuMain(MainFunctionParams parameters) {
+ 
+   base::PlatformThread::SetName("CrGpuMain");
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +// XXX BSD
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
    // Thread type delegate of the process should be registered before
-   // first thread type change in ChildProcess constructor.
-   // It also needs to be registered before the process has multiple threads,
-@@ -436,7 +441,7 @@ int GpuMain(MainFunctionParams parameters) {
+   // thread type change below for the main thread and for thread pool in
+   // ChildProcess constructor.
+@@ -443,7 +448,7 @@ int GpuMain(MainFunctionParams parameters) {
  
  namespace {
  
@@ -62,7 +62,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
-@@ -476,7 +481,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -483,7 +488,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
    sandbox_options.accelerated_video_encode_enabled =
        !gpu_prefs.disable_accelerated_video_encode;
  
diff --git a/www/chromium/files/patch-content_public_browser_content__browser__client.cc b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
index 340ba95a4231..940b89527f67 100644
--- a/www/chromium/files/patch-content_public_browser_content__browser__client.cc
+++ b/www/chromium/files/patch-content_public_browser_content__browser__client.cc
@@ -1,6 +1,6 @@
---- content/public/browser/content_browser_client.cc.orig	2024-04-19 13:02:56 UTC
+--- content/public/browser/content_browser_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/public/browser/content_browser_client.cc
-@@ -1283,7 +1283,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
+@@ -1303,7 +1303,7 @@ bool ContentBrowserClient::ShouldRunOutOfProcessSystem
  // that can be adequately sandboxed.
  // Currently Android's network service will not run out of process or sandboxed,
  // so OutOfProcessSystemDnsResolution is not currently enabled on Android.
diff --git a/www/chromium/files/patch-content_public_browser_service__process__host.cc b/www/chromium/files/patch-content_public_browser_service__process__host.cc
index bd77d5fab65c..d0242d944596 100644
--- a/www/chromium/files/patch-content_public_browser_service__process__host.cc
+++ b/www/chromium/files/patch-content_public_browser_service__process__host.cc
@@ -1,6 +1,6 @@
---- content/public/browser/service_process_host.cc.orig	2024-04-19 13:02:56 UTC
+--- content/public/browser/service_process_host.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/public/browser/service_process_host.cc
-@@ -76,7 +76,7 @@ ServiceProcessHost::Options& ServiceProcessHost::Optio
+@@ -70,7 +70,7 @@ ServiceProcessHost::Options::WithPreloadedLibraries(
  
  ServiceProcessHost::Options& ServiceProcessHost::Options::WithGpuClient(
      base::PassKey<ServiceProcessHostGpuClient> passkey) {
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index ed8436f3e825..a72b0886b91b 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,33 +1,27 @@
---- content/public/common/content_features.cc.orig	2024-04-19 13:02:56 UTC
+--- content/public/common/content_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/public/common/content_features.cc
-@@ -27,7 +27,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
-              "AudioServiceOutOfProcess",
- // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
+@@ -29,7 +29,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+ // TODO(crbug.com/40118868): Remove !IS_CHROMEOS_LACROS once lacros starts being
  // built with OS_CHROMEOS instead of OS_LINUX.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
-     (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
- // kAudioServiceOutOfProcess feature is enabled.
- BASE_FEATURE(kAudioServiceSandbox,
-              "AudioServiceSandbox",
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
++    (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1199,7 +1199,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1076,9 +1076,9 @@ BASE_FEATURE(kWebAssemblyTiering,
  BASE_FEATURE(kWebAssemblyTrapHandler,
               "WebAssemblyTrapHandler",
- #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
--      BUILDFLAG(IS_MAC)) &&                                                 \
-+      BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                            \
-      defined(ARCH_CPU_X86_64)) ||                                           \
-     (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
+ #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ||  \
+-      BUILDFLAG(IS_MAC)) &&                                                  \
++      BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) &&                                                  \
+      defined(ARCH_CPU_X86_64)) ||                                            \
+-    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)) && \
++    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \
+      defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1241,7 +1241,11 @@ BASE_FEATURE(kWebUICodeCache,
+ #else
+@@ -1115,7 +1115,11 @@ BASE_FEATURE(kWebUICodeCache,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index 4b7ee87ee215..8877edbd1fcc 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig	2024-04-19 13:02:56 UTC
+--- content/public/common/content_switches.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/public/common/content_switches.cc
-@@ -366,6 +366,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -352,6 +352,8 @@ const char kEnableIsolatedWebAppsInRenderer[] =
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -9,9 +9,9 @@
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -1007,7 +1009,7 @@ const char kPreventResizingContentsForTesting[] =
+@@ -990,7 +992,7 @@ const char kPreventResizingContentsForTesting[] =
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index 80f69c9c4fad..d084b4eb7764 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig	2024-04-19 13:02:56 UTC
+--- content/public/common/content_switches.h.orig	2024-06-17 12:56:06 UTC
 +++ content/public/common/content_switches.h
-@@ -113,6 +113,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -111,6 +111,7 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -10,7 +10,7 @@
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
 @@ -268,7 +269,7 @@ CONTENT_EXPORT extern const char kPreventResizingConte
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc b/www/chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc
new file mode 100644
index 000000000000..2c9bc0dff956
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_media_gpu_gpu__video__accelerator__factories__impl.cc
@@ -0,0 +1,11 @@
+--- content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc.orig	2024-06-17 12:56:06 UTC
++++ content/renderer/media/gpu/gpu_video_accelerator_factories_impl.cc
+@@ -47,7 +47,7 @@ bool UseSingleNV12() {
+ #else
+   static BASE_FEATURE(kUseSingleNV12ForSoftwareGMB,
+                       "UseSingleNV12ForSoftwareGMB",
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+                       base::FEATURE_ENABLED_BY_DEFAULT);
+ #else
+                       base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index f55d22b10731..8de7b5617061 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- content/renderer/render_thread_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/renderer/render_thread_impl.cc
-@@ -203,6 +203,8 @@
+@@ -206,6 +206,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -996,7 +998,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1000,7 +1002,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
                               kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
        base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1005,7 +1007,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1009,7 +1011,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
        base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1769,7 +1771,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1752,7 +1754,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index db00816f6199..d217b05156fc 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- content/shell/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ content/shell/BUILD.gn
-@@ -1064,7 +1064,7 @@ group("content_shell_crash_test") {
+@@ -1094,7 +1094,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
index 18fb4b97fea5..4d860a241567 100644
--- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
+++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- content/shell/app/shell_main_delegate.cc.orig	2024-04-19 13:02:56 UTC
+--- content/shell/app/shell_main_delegate.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/shell/app/shell_main_delegate.cc
-@@ -283,7 +283,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -281,7 +281,7 @@ void ShellMainDelegate::PreSandboxStartup() {
      // Reporting for sub-processes will be initialized in ZygoteForked.
      if (process_type != switches::kZygoteProcess) {
        crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc
index 454c21c5e641..aa932f04b1ff 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_shell_renderer_shell__content__renderer__client.cc
@@ -1,11 +1,11 @@
---- content/renderer/render_process_impl.cc.orig	2024-01-30 07:53:34 UTC
-+++ content/renderer/render_process_impl.cc
-@@ -44,7 +44,7 @@
- #include "third_party/blink/public/web/web_frame.h"
- #include "v8/include/v8-initialization.h"
+--- content/shell/renderer/shell_content_renderer_client.cc.orig	2024-05-21 18:07:39 UTC
++++ content/shell/renderer/shell_content_renderer_client.cc
+@@ -54,7 +54,7 @@
+ #include "media/base/media_switches.h"
+ #endif
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
      (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64))
  #define ENABLE_WEB_ASSEMBLY_TRAP_HANDLER_LINUX
- #endif
+ #include "base/debug/stack_trace.h"
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc
index 398dec910413..8134a390376c 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig	2024-04-19 13:02:56 UTC
+--- content/utility/services.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/utility/services.cc
 @@ -74,7 +74,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
@@ -52,7 +52,7 @@
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    {
  #else
-@@ -407,7 +407,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+@@ -384,7 +384,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
@@ -61,7 +61,7 @@
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  auto RunStableVideoDecoderFactoryProcessService(
      mojo::PendingReceiver<
-@@ -418,7 +418,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -395,7 +395,7 @@ auto RunStableVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -70,7 +70,7 @@
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -441,7 +441,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
+@@ -418,7 +418,7 @@ void RegisterIOThreadServices(mojo::ServiceFactory& se
    // loop of type IO that can get notified when pipes have data.
    services.Add(RunNetworkService);
  
@@ -79,7 +79,7 @@
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
    if (base::FeatureList::IsEnabled(
            features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -493,7 +493,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -470,7 +470,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
@@ -88,7 +88,7 @@
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
    if (!base::FeatureList::IsEnabled(
            features::kRunStableVideoDecoderFactoryProcessServiceOnIOThread)) {
-@@ -502,7 +502,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -479,7 +479,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index 0ad7aa73724d..39ffbfe8fa16 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,6 +1,6 @@
---- content/utility/utility_main.cc.orig	2024-04-19 13:02:56 UTC
+--- content/utility/utility_main.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/utility/utility_main.cc
-@@ -37,17 +37,21 @@
+@@ -38,17 +38,21 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  
@@ -23,7 +23,7 @@
  #include "services/audio/audio_sandbox_hook_linux.h"
  #include "services/network/network_sandbox_hook_linux.h"
  // gn check is not smart enough to realize that this include only applies to
-@@ -59,10 +63,15 @@
+@@ -60,10 +64,15 @@
  #endif
  #endif
  
@@ -40,7 +40,7 @@
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "chromeos/ash/components/assistant/buildflags.h"
  #include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -74,7 +83,7 @@
+@@ -75,7 +84,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
@@ -49,7 +49,7 @@
  #include "services/screen_ai/public/cpp/utilities.h"  // nogncheck
  #include "services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"  // nogncheck
  #endif
-@@ -101,7 +110,7 @@ namespace content {
+@@ -102,7 +111,7 @@ namespace content {
  
  namespace {
  
@@ -58,7 +58,7 @@
  std::vector<std::string> GetNetworkContextsParentDirectories() {
    base::MemoryMappedFile::Region region;
    base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
-@@ -127,9 +136,10 @@ std::vector<std::string> GetNetworkContextsParentDirec
+@@ -129,9 +138,10 @@ std::vector<std::string> GetNetworkContextsParentDirec
    return dirs;
  }
  
@@ -70,7 +70,7 @@
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -144,6 +154,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san
+@@ -146,6 +156,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san
  
    return false;
  }
@@ -78,17 +78,17 @@
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_WIN)
-@@ -252,7 +263,8 @@ int UtilityMain(MainFunctionParams parameters) {
-     }
+@@ -250,7 +261,8 @@ int UtilityMain(MainFunctionParams parameters) {
+     CHECK(on_device_model::OnDeviceModelService::PreSandboxInit());
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +// XXX BSD
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
-   // Thread type delegate of the process should be registered before
-   // first thread type change in ChildProcess constructor.
-   // It also needs to be registered before the process has multiple threads,
-@@ -263,7 +275,7 @@ int UtilityMain(MainFunctionParams parameters) {
+   // Thread type delegate of the process should be registered before first
+   // thread type change in ChildProcess constructor. It also needs to be
+   // registered before the process has multiple threads, which may race with
+@@ -262,7 +274,7 @@ int UtilityMain(MainFunctionParams parameters) {
    }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
@@ -97,7 +97,7 @@
    // Initializes the sandbox before any threads are created.
    // TODO(jorgelo): move this after GTK initialization when we enable a strict
    // Seccomp-BPF policy.
-@@ -301,7 +313,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -300,7 +312,7 @@ int UtilityMain(MainFunctionParams parameters) {
                               screen_ai::GetBinaryPathSwitch()));
        break;
  #endif
@@ -106,7 +106,7 @@
      case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
        pre_sandbox_hook =
            base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -328,6 +340,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -327,6 +339,7 @@ int UtilityMain(MainFunctionParams parameters) {
      default:
        break;
    }
@@ -114,7 +114,7 @@
    if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
        (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
      sandbox_options.use_amd_specific_policies =
-@@ -335,6 +348,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -334,6 +347,11 @@ int UtilityMain(MainFunctionParams parameters) {
      sandbox::policy::Sandbox::Initialize(
          sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
    }
diff --git a/www/chromium/files/patch-content_utility_utility__thread__impl.cc b/www/chromium/files/patch-content_utility_utility__thread__impl.cc
index 508558300978..9c22d11a1a59 100644
--- a/www/chromium/files/patch-content_utility_utility__thread__impl.cc
+++ b/www/chromium/files/patch-content_utility_utility__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/utility/utility_thread_impl.cc.orig	2024-02-23 21:04:38 UTC
+--- content/utility/utility_thread_impl.cc.orig	2024-05-21 18:07:39 UTC
 +++ content/utility/utility_thread_impl.cc
-@@ -32,7 +32,7 @@
+@@ -31,7 +31,7 @@
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "mojo/public/cpp/bindings/service_factory.h"
  
@@ -9,7 +9,7 @@
  #include "content/child/sandboxed_process_thread_type_handler.h"
  #endif
  
-@@ -252,7 +252,8 @@ void UtilityThreadImpl::Init() {
+@@ -251,7 +251,8 @@ void UtilityThreadImpl::Init() {
  
    GetContentClient()->utility()->UtilityThreadStarted();
  
diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc
index 6c2be1d7240c..e93e1f4aabe8 100644
--- a/www/chromium/files/patch-content_zygote_zygote__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_linux.cc.orig	2024-03-22 08:19:40 UTC
+--- content/zygote/zygote_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -8,7 +8,7 @@
  
  #include "content/zygote/zygote_linux.h"
  
-@@ -717,3 +718,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+@@ -718,3 +719,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/chromium/files/patch-device_fido_fido__discovery__factory.cc b/www/chromium/files/patch-device_fido_fido__discovery__factory.cc
new file mode 100644
index 000000000000..cbd3d170ad2e
--- /dev/null
+++ b/www/chromium/files/patch-device_fido_fido__discovery__factory.cc
@@ -0,0 +1,11 @@
+--- device/fido/fido_discovery_factory.cc.orig	2024-06-17 12:56:06 UTC
++++ device/fido/fido_discovery_factory.cc
+@@ -127,7 +127,7 @@ std::vector<std::unique_ptr<FidoDiscoveryBase>> FidoDi
+ 
+ std::optional<std::unique_ptr<FidoDiscoveryBase>>
+ FidoDiscoveryFactory::MaybeCreateEnclaveDiscovery() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (!base::FeatureList::IsEnabled(kWebAuthnEnclaveAuthenticator) ||
+       !enclave_ui_request_stream_ || !network_context_factory_) {
+     return std::nullopt;
diff --git a/www/chromium/files/patch-extensions_common_command.cc b/www/chromium/files/patch-extensions_common_command.cc
index 56b79dc1654b..d96f5fec934b 100644
--- a/www/chromium/files/patch-extensions_common_command.cc
+++ b/www/chromium/files/patch-extensions_common_command.cc
@@ -1,4 +1,4 @@
---- extensions/common/command.cc.orig	2024-02-23 21:04:38 UTC
+--- extensions/common/command.cc.orig	2024-06-17 12:56:06 UTC
 +++ extensions/common/command.cc
 @@ -283,7 +283,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
@@ -8,4 +8,4 @@
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    return values::kKeybindingPlatformLinux;
  #elif BUILDFLAG(IS_FUCHSIA)
-   // TODO(crbug.com/1312215): Change this once we decide what string should be
+   // TODO(crbug.com/40220501): Change this once we decide what string should be
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
index 6d35272bfa2a..5a95de0ca8da 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc
@@ -1,8 +1,8 @@
---- extensions/shell/browser/shell_extensions_api_client.cc.orig	2022-02-28 16:54:41 UTC
+--- extensions/shell/browser/shell_extensions_api_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.cc
 @@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() 
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
index 5c420402f722..5f3173148645 100644
--- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
+++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h
@@ -1,8 +1,8 @@
---- extensions/shell/browser/shell_extensions_api_client.h.orig	2022-02-28 16:54:41 UTC
+--- extensions/shell/browser/shell_extensions_api_client.h.orig	2024-06-17 12:56:06 UTC
 +++ extensions/shell/browser/shell_extensions_api_client.h
 @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
        const override;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -11,7 +11,7 @@
    MessagingDelegate* GetMessagingDelegate() override;
 @@ -45,7 +45,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC
   private:
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
index 836149752058..e8619cd131c9 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_dawn__context__provider.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/dawn_context_provider.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/command_buffer/service/dawn_context_provider.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/command_buffer/service/dawn_context_provider.cc
-@@ -203,7 +203,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
+@@ -163,7 +163,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
    return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
               ? wgpu::BackendType::D3D12
               : wgpu::BackendType::D3D11;
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
index d40c456e19a1..2937f6dd12de 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -2987,7 +2987,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -2955,7 +2955,7 @@ GLES2Decoder* GLES2Decoder::Create(
    }
  
  // Allow linux to run fuzzers.
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index f722a1c9ab3c..de598ab829f8 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2024-03-22 08:19:40 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
 @@ -50,7 +50,7 @@
  #include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
  #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
  #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES)
  #include "gpu/command_buffer/service/shared_image/dawn_gl_texture_representation.h"
-@@ -689,7 +689,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+@@ -695,7 +695,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
      wgpu::BackendType backend_type,
      std::vector<wgpu::TextureFormat> view_formats,
      scoped_refptr<SharedContextState> context_state) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
index b9b9c1fc9666..10e09f14f16f 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -569,7 +569,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -570,7 +570,7 @@ bool SharedImageManager::SupportsScanoutImages() {
    return true;
  #elif BUILDFLAG(IS_ANDROID)
    return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 008d5db154d3..893b39a18b0e 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1255,7 +1255,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1249,7 +1249,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
      force_fallback_adapter = true;
    }
  
@@ -9,7 +9,7 @@
    if (!shared_context_state_->GrContextIsVulkan() &&
        !shared_context_state_->IsGraphiteDawnVulkan() &&
        use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
-@@ -1922,7 +1922,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+@@ -1915,7 +1915,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
    }
  
  #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
diff --git a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc
index 95dc2b8a22da..5d162879e0e5 100644
--- a/www/chromium/files/patch-gpu_config_gpu__finch__features.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__finch__features.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_finch_features.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/config/gpu_finch_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/config/gpu_finch_features.cc
-@@ -145,7 +145,7 @@ const base::FeatureParam<std::string>
+@@ -137,7 +137,7 @@ const base::FeatureParam<std::string>
  BASE_FEATURE(kDefaultEnableGpuRasterization,
               "DefaultEnableGpuRasterization",
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -158,7 +158,7 @@ BASE_FEATURE(kCanvasOopRasterization,
+@@ -150,7 +150,7 @@ BASE_FEATURE(kCanvasOopRasterization,
               "CanvasOopRasterization",
  #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN) ||         \
      (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 47df468187e0..0a61f247b75d 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/ipc/service/gpu_init.cc.orig	2024-05-21 18:07:39 UTC
 +++ gpu/ipc/service/gpu_init.cc
-@@ -391,7 +391,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -398,7 +398,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -9,7 +9,7 @@
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -428,7 +428,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -435,7 +435,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -18,7 +18,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -529,7 +529,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -544,7 +544,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      gpu_preferences_.gr_context_type = GrContextType::kGL;
    }
  
@@ -27,7 +27,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -611,7 +611,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -626,7 +626,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -36,7 +36,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -767,7 +767,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -782,7 +782,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
  
@@ -45,7 +45,7 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -822,7 +822,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -837,7 +837,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
        }
      }
    }
@@ -54,7 +54,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -989,7 +989,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1025,7 +1025,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -63,7 +63,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -1049,7 +1049,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -1085,7 +1085,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
      }
    }
  
diff --git a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py
index 0afd30ae79da..ef663bc1e4f1 100644
--- a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py
+++ b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py
@@ -1,6 +1,6 @@
---- gpu/vulkan/generate_bindings.py.orig	2023-11-03 10:09:45 UTC
+--- gpu/vulkan/generate_bindings.py.orig	2024-06-17 12:56:06 UTC
 +++ gpu/vulkan/generate_bindings.py
-@@ -270,7 +270,7 @@ VULKAN_DEVICE_FUNCTIONS = [
+@@ -271,7 +271,7 @@ VULKAN_DEVICE_FUNCTIONS = [
      ]
    },
    {
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
index b309b71f35b2..461f5cf700d7 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_device_queue.cc.orig	2024-02-23 21:04:38 UTC
+--- gpu/vulkan/vulkan_device_queue.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/vulkan/vulkan_device_queue.cc
-@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -125,7 +125,7 @@ bool VulkanDeviceQueue::Initialize(
  
        // In dual-CPU cases, we cannot detect the active GPU correctly on Linux,
        // so don't select GPU device based on the |gpu_info|.
@@ -9,7 +9,7 @@
      // If gpu_info is provided, the device should match it.
      if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
                       device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -264,7 +264,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -268,7 +268,7 @@ bool VulkanDeviceQueue::Initialize(
    // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
    // support.
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
index b90a4fa036e9..40147518292f 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig	2024-02-23 21:04:38 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig	2024-06-17 12:56:06 UTC
 +++ gpu/vulkan/vulkan_function_pointers.cc
-@@ -1289,7 +1289,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -1297,7 +1297,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
      }
    }
  
@@ -9,7 +9,7 @@
    if (gfx::HasExtension(enabled_extensions,
                          VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
      constexpr char kvkGetImageDrmFormatModifierPropertiesEXT[] =
-@@ -1489,7 +1489,7 @@ void VulkanFunctionPointers::ResetForTesting() {
+@@ -1498,7 +1498,7 @@ void VulkanFunctionPointers::ResetForTesting() {
    vkGetSwapchainImagesKHR = nullptr;
    vkQueuePresentKHR = nullptr;
  
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
index c0a3540fc54e..7503dbbd29e3 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig	2023-11-03 10:09:45 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig	2024-06-17 12:56:06 UTC
 +++ gpu/vulkan/vulkan_function_pointers.h
-@@ -321,7 +321,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -322,7 +322,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -9,7 +9,7 @@
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1324,7 +1324,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1336,7 +1336,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -18,7 +18,7 @@
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1334,4 +1334,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1346,4 +1346,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
index d46d1a1053f2..50d36808acc2 100644
--- a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_util.cc.orig	2024-04-19 13:02:56 UTC
+--- gpu/vulkan/vulkan_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ gpu/vulkan/vulkan_util.cc
-@@ -467,7 +467,7 @@ bool CheckVulkanCompatibilities(
+@@ -468,7 +468,7 @@ bool CheckVulkanCompatibilities(
      }
    }
  
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index dcfc79b50d6d..c2b1b7e7ed31 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig	2024-02-23 21:04:38 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ headless/lib/browser/headless_request_context_manager.cc
-@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
+@@ -66,7 +66,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
      return;
    done_once = true;
  
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
index a8c994c106b7..6d6402de2bc5 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_web_contents_impl.cc.orig	2023-05-31 08:12:17 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -60,7 +60,7 @@ namespace headless {
+@@ -62,7 +62,7 @@ namespace headless {
  namespace {
  
  void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
index a42c701df4bf..a595e30a8c47 100644
--- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
+++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- headless/lib/headless_content_main_delegate.cc.orig	2023-12-10 06:10:27 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ headless/lib/headless_content_main_delegate.cc
-@@ -362,7 +362,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -371,7 +371,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h
index 67b336ed3660..6e8f63c5006d 100644
--- a/www/chromium/files/patch-ipc_ipc__channel.h
+++ b/www/chromium/files/patch-ipc_ipc__channel.h
@@ -1,6 +1,6 @@
---- ipc/ipc_channel.h.orig	2024-01-30 07:53:34 UTC
+--- ipc/ipc_channel.h.orig	2024-06-17 12:56:06 UTC
 +++ ipc/ipc_channel.h
-@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
+@@ -218,7 +218,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
    static std::string GenerateUniqueRandomChannelID();
  #endif
  
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
index f8def4a866b3..322f62776d0e 100644
--- a/www/chromium/files/patch-ipc_ipc__message__utils.cc
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -1,6 +1,6 @@
---- ipc/ipc_message_utils.cc.orig	2024-02-23 21:04:38 UTC
+--- ipc/ipc_message_utils.cc.orig	2024-05-21 18:07:39 UTC
 +++ ipc/ipc_message_utils.cc
-@@ -394,7 +394,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
+@@ -395,7 +395,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-media_audio_pulse_pulse__util.cc b/www/chromium/files/patch-media_audio_pulse_pulse__util.cc
new file mode 100644
index 000000000000..c14b14efca45
--- /dev/null
+++ b/www/chromium/files/patch-media_audio_pulse_pulse__util.cc
@@ -0,0 +1,14 @@
+--- media/audio/pulse/pulse_util.cc.orig	2024-05-21 18:07:39 UTC
++++ media/audio/pulse/pulse_util.cc
+@@ -45,7 +45,11 @@ constexpr char kBrowserDisplayName[] = "chromium-brows
+ 
+ #if defined(DLOPEN_PULSEAUDIO)
+ static const base::FilePath::CharType kPulseLib[] =
++#if BUILDFLAG(IS_BSD)
++    FILE_PATH_LITERAL("libpulse.so");
++#else
+     FILE_PATH_LITERAL("libpulse.so.0");
++#endif
+ #endif
+ 
+ void DestroyMainloop(pa_threaded_mainloop* mainloop) {
diff --git a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
index e4880eb7f7e9..8f42931fbf28 100644
--- a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
+++ b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
@@ -1,6 +1,6 @@
---- media/audio/sndio/audio_manager_sndio.cc.orig	2022-10-24 13:33:33 UTC
+--- media/audio/sndio/audio_manager_sndio.cc.orig	2024-05-21 18:07:39 UTC
 +++ media/audio/sndio/audio_manager_sndio.cc
-@@ -0,0 +1,181 @@
+@@ -0,0 +1,240 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -17,18 +17,19 @@
 +#include "media/audio/sndio/sndio_input.h"
 +#include "media/audio/sndio/sndio_output.h"
 +#endif
++#if defined(USE_PULSEAUDIO)
++#include "media/audio/pulse/audio_manager_pulse.h"
++#include "media/audio/pulse/pulse_util.h"
++#endif
++#if defined(USE_ALSA)
++#include "media/audio/alsa/audio_manager_alsa.h"
++#endif
 +#include "media/audio/fake_audio_manager.h"
 +#include "media/base/limits.h"
 +#include "media/base/media_switches.h"
 +
 +namespace media {
 +
-+enum SndioAudioIO {
-+  kPulse,
-+  kSndio,
-+  kAudioIOMax = kSndio
-+};
-+
 +#if defined(USE_SNDIO)
 +// Maximum number of output streams that can be open simultaneously.
 +static const int kMaxOutputStreams = 50;
@@ -36,6 +37,12 @@
 +// Default sample rate for input and output streams.
 +static const int kDefaultSampleRate = 48000;
 +
++#if BUILDFLAG(IS_OPENBSD)
++static const std::string kDefaultAudioBackend = "sndio";
++#else
++static const std::string kDefaultAudioBackend = "auto";
++#endif
++
 +void AddDefaultDevice(AudioDeviceNames* device_names) {
 +  DCHECK(device_names->empty());
 +  device_names->push_front(AudioDeviceName::CreateDefault());
@@ -164,21 +171,73 @@
 +    std::unique_ptr<AudioThread> audio_thread,
 +    AudioLogFactory* audio_log_factory) {
 +  DLOG(WARNING) << "CreateAudioManager";
++  std::string audio_backend = kDefaultAudioBackend;
++
++  std::vector<std::string> kSupportedAudioBackends = {"auto"};
++
++#if defined(USE_SNDIO)
++  kSupportedAudioBackends.push_back(std::string("sndio"));
++#endif
++#if defined(USE_PULSEAUDIO)
++  kSupportedAudioBackends.push_back(std::string("pulse"));
++#endif
++#if defined(USE_ALSA)
++  kSupportedAudioBackends.push_back(std::string("alsa"));
++#endif
++
++  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
++          switches::kAudioBackend)) {
++    audio_backend = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
++        switches::kAudioBackend);
++  }
++
 +  // For testing allow audio output to be disabled.
 +  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
 +          switches::kDisableAudioOutput)) {
 +    return std::make_unique<FakeAudioManager>(std::move(audio_thread),
 +                                              audio_log_factory);
 +  }
++
++  if (std::find(std::begin(kSupportedAudioBackends), std::end(kSupportedAudioBackends),
++      audio_backend) == std::end(kSupportedAudioBackends)) {
++    LOG(ERROR) << "Unsupported audio backend specified. Falling back to " << kDefaultAudioBackend;
++    audio_backend = kDefaultAudioBackend;
++  }
++
++#if defined(USE_PULSEAUDIO)
++  pa_threaded_mainloop* pa_mainloop = nullptr;
++  pa_context* pa_context = nullptr;
++  if (audio_backend != "sndio" && pulse::InitPulse(&pa_mainloop, &pa_context)) {
++    return std::make_unique<AudioManagerPulse>(
++        std::move(audio_thread), audio_log_factory, pa_mainloop, pa_context);
++  } else if (audio_backend == "auto") {
++    LOG(WARNING) << "Falling back to SNDIO for audio output. PulseAudio is not "
++                    "available or could not be initialized.";
++  }
++#endif
++
 +#if defined(USE_SNDIO)
-+  UMA_HISTOGRAM_ENUMERATION("Media.SndioAudioIO", kSndio, kAudioIOMax + 1);
-+  return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
-+                                            audio_log_factory);
-+#else
-+  return std::make_unique<FakeAudioManager>(std::move(audio_thread),
-+                                            audio_log_factory);
++  if (audio_backend != "pulse") {
++    return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++                                              audio_log_factory);
++  } else if (audio_backend == "auto") {
++    LOG(WARNING) << "Falling back to ALSA audio output. SNDIO is not "
++                    "available or could not be initialized.";
++  }
++#endif
++
++#if defined(USE_ALSA)
++  if (audio_backend != "pulse" && audio_backend != "sndio") {
++    return std::make_unique<AudioManagerAlsa>(std::move(audio_thread),
++                                              audio_log_factory);
++  } else if (audio_backend == "auto") {
++    LOG(WARNING) << "Falling back to fake audio output. ALSA is not "
++                    "available or could not be initialized.";
++  }
 +#endif
 +
++  return std::make_unique<FakeAudioManager>(std::move(audio_thread),
++                                            audio_log_factory);
 +}
 +
 +}  // namespace media
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 2bd334016a61..5f76a6831de6 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2024-04-19 13:02:56 UTC
+--- media/base/media_switches.cc.orig	2024-06-18 16:34:35 UTC
 +++ media/base/media_switches.cc
 @@ -21,7 +21,7 @@
  #include "ui/gl/gl_features.h"
@@ -9,7 +9,18 @@
  #include "base/cpu.h"
  #endif
  
-@@ -363,8 +363,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare,
+@@ -60,6 +60,10 @@ const char kDisableBackgroundMediaSuspend[] =
+ const char kReportVp9AsAnUnsupportedMimeType[] =
+     "report-vp9-as-an-unsupported-mime-type";
+ 
++#if BUILDFLAG(IS_BSD)
++const char kAudioBackend[] = "audio-backend";
++#endif
++
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_SOLARIS)
+ // The Alsa device to use when opening an audio input stream.
+@@ -368,8 +372,8 @@ BASE_FEATURE(kMacLoopbackAudioForScreenShare,
               "MacLoopbackAudioForScreenShare",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_MAC)
@@ -20,16 +31,7 @@
  // Enables system audio mirroring using pulseaudio.
  BASE_FEATURE(kPulseaudioLoopbackForCast,
               "PulseaudioLoopbackForCast",
-@@ -597,7 +597,7 @@ BASE_FEATURE(kUseWritePixelsYUV,
- BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo,
-              "UseMultiPlaneFormatForHardwareVideo",
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \
--    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
-@@ -713,7 +713,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -688,7 +692,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
  // Show toolbar button that opens dialog for controlling media sessions.
  BASE_FEATURE(kGlobalMediaControls,
               "GlobalMediaControls",
@@ -38,7 +40,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -741,7 +741,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
+@@ -716,7 +720,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI,
  // If enabled, users can request Media Remoting without fullscreen-in-tab.
  BASE_FEATURE(kMediaRemotingWithoutFullscreen,
               "MediaRemotingWithoutFullscreen",
@@ -47,7 +49,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -753,7 +753,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+@@ -728,7 +732,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
  BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -56,7 +58,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -782,7 +782,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -757,7 +761,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -65,16 +67,16 @@
  // Enable vaapi video decoding on linux. This is already enabled by default on
  // chromeos, but needs an experiment on linux.
  BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -873,7 +873,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
+@@ -848,7 +852,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding,
               "VaapiVp9SModeHWEncoding",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  // Enables the new V4L2 flat video decoder clients instead of V4L2VideoDecoder.
  // Owners: frkoenig@chromium.org, mcasas@chromium.org
  // Expiry: When flat decoders are supported on all platforms and the legacy
-@@ -998,7 +998,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
+@@ -978,7 +982,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK,
  // Live Caption can be used in multiple languages, as opposed to just English.
  BASE_FEATURE(kLiveCaptionMultiLanguage,
               "LiveCaptionMultiLanguage",
@@ -83,7 +85,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1033,7 +1033,7 @@ BASE_FEATURE(kLiveCaptionSystemWideOnChromeOS,
+@@ -1008,7 +1012,7 @@ BASE_FEATURE(kLiveCaptionWebAudio,
  // Live Translate translates captions generated by Live Caption.
  BASE_FEATURE(kLiveTranslate,
               "LiveTranslate",
@@ -92,7 +94,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1500,7 +1500,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
+@@ -1472,7 +1476,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
@@ -101,3 +103,12 @@
  // Spawn utility processes to perform hardware encode acceleration instead of
  // using the GPU process.
  BASE_FEATURE(kUseOutOfProcessVideoEncoding,
+@@ -1552,7 +1556,7 @@ BASE_FEATURE(kRecordWebAudioEngagement,
+              "RecordWebAudioEngagement",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Reduces the number of buffers needed in the output video frame pool to
+ // populate the Renderer pipeline for hardware accelerated VideoDecoder in
+ // non-low latency scenarios.
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index e0d750889720..c631bc427942 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,17 @@
---- media/base/media_switches.h.orig	2024-04-19 13:02:56 UTC
+--- media/base/media_switches.h.orig	2024-06-18 16:34:35 UTC
 +++ media/base/media_switches.h
-@@ -315,7 +315,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder
+@@ -43,6 +43,10 @@ MEDIA_EXPORT extern const char kDisableBackgroundMedia
+ 
+ MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[];
+ 
++#if BUILDFLAG(IS_BSD)
++MEDIA_EXPORT extern const char kAudioBackend[];
++#endif
++
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_SOLARIS)
+ MEDIA_EXPORT extern const char kAlsaInputDevice[];
+@@ -324,13 +328,13 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlatformHEVCEncoder
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPlaybackSpeedButton);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMediaEngagementData);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPreloadMetadataSuspend);
@@ -9,7 +20,14 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForCast);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kPulseaudioLoopbackForScreenShare);
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -333,7 +333,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordMediaEngagementScores);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kRecordWebAudioEngagement);
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kReduceHardwareVideoDecoderBuffers);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kResumeBackgroundVideo);
+@@ -345,7 +349,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUnifiedAutoplay);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseAndroidOverlayForSecureOnly);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamForWebRTC);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
@@ -18,7 +36,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -352,7 +352,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
+@@ -364,7 +368,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9SModeHWEncoding);
  #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
@@ -27,7 +45,7 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatVideoDecoder);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder);
  #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
-@@ -491,7 +491,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
+@@ -506,7 +510,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVide
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseGTFOOutOfProcessVideoDecoding);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc
index fa6bd935a94e..cdcc6ce06f92 100644
--- a/www/chromium/files/patch-media_base_video__frame.cc
+++ b/www/chromium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig	2024-04-19 13:02:56 UTC
+--- media/base/video_frame.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/base/video_frame.cc
 @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
@@ -27,16 +27,16 @@
  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
  // thus to have several VideoFrames share the same set of DMABUF FDs.
  class VideoFrame::DmabufHolder
-@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
-   for (size_t i = 0; i < num_planes; ++i)
+@@ -440,7 +440,7 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrameForGp
      planes[i].stride = gpu_memory_buffer->stride(i);
+   }
    uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) {
      const auto gmb_handle = gpu_memory_buffer->CloneHandle();
      if (gmb_handle.is_null() ||
-@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -778,7 +778,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -45,7 +45,7 @@
  // static
  scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
      const VideoFrameLayout& layout,
-@@ -901,7 +901,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -997,7 +997,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
      }
    }
  
@@ -54,8 +54,8 @@
    DCHECK(frame->dmabuf_fds_);
    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
    wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1345,7 +1345,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
-                         : mailbox_holders_[texture_index];
+@@ -1471,7 +1471,7 @@ scoped_refptr<gpu::ClientSharedImage> VideoFrame::shar
+                         : shared_images_[texture_index];
  }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -63,7 +63,7 @@
  size_t VideoFrame::NumDmabufFds() const {
    return dmabuf_fds_->size();
  }
-@@ -1462,7 +1462,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1588,7 +1588,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
        storage_type_(storage_type),
        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
        natural_size_(natural_size),
diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h
index ab252656a3ce..3e551dd31588 100644
--- a/www/chromium/files/patch-media_base_video__frame.h
+++ b/www/chromium/files/patch-media_base_video__frame.h
@@ -1,6 +1,6 @@
---- media/base/video_frame.h.orig	2024-04-19 13:02:56 UTC
+--- media/base/video_frame.h.orig	2024-06-17 12:56:06 UTC
 +++ media/base/video_frame.h
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  #include "base/apple/scoped_cftyperef.h"
  #endif  // BUILDFLAG(IS_APPLE)
  
@@ -9,7 +9,7 @@
  #include "base/files/scoped_file.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -111,7 +111,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
      STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
      STORAGE_SHMEM = 4,         // Backed by read-only shared memory.
@@ -18,7 +18,7 @@
      // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
      // based on the idea of using this same enum value for both DMA
      // buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -341,7 +341,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
        ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
        base::TimeDelta timestamp);
  
@@ -27,16 +27,16 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -598,7 +598,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
-   // mailbox, the caller must wait for the included sync point.
-   const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
+@@ -650,7 +650,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+   scoped_refptr<gpu::ClientSharedImage> shared_image(
+       size_t texture_index) const;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    // The number of DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
    // remaining planes. Should be > 0 for STORAGE_DMABUFS.
-@@ -816,7 +816,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -886,7 +886,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
    std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
index 3254b3099506..046240a368ff 100644
--- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -1,6 +1,6 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2024-01-30 07:53:34 UTC
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/capture/video/fake_video_capture_device_factory.cc
-@@ -230,7 +230,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
+@@ -231,7 +231,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
    int entry_index = 0;
    for (const auto& entry : devices_config_) {
      VideoCaptureApi api =
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
index 173e8463271a..eab9c2338942 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig	2024-04-19 13:02:56 UTC
+--- media/capture/video/video_capture_device_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/capture/video/video_capture_device_client.cc
-@@ -151,7 +151,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
+@@ -164,7 +164,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
        CHECK(!is_width_odd && !is_height_odd);
        return {libyuv::FOURCC_UYVY};
      case media::PIXEL_FORMAT_RGB24:
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py
index 472bb9478d6b..7a1005537338 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py
+++ b/www/chromium/files/patch-media_ffmpeg_scripts_build__ffmpeg.py
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2024-04-19 13:02:56 UTC
-+++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath(
+--- media/ffmpeg/scripts/build_ffmpeg.py.orig	2024-05-27 14:01:28 UTC
++++ media/ffmpeg/scripts/build_ffmpeg.py
+@@ -33,7 +33,7 @@ NDK_ROOT_DIR = os.path.abspath(
  SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
  
  sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build'))
@@ -9,7 +9,7 @@
  
  BRANDINGS = [
      'Chrome',
-@@ -43,6 +43,8 @@ BRANDINGS = [
+@@ -44,6 +44,8 @@ BRANDINGS = [
  ARCH_MAP = {
      'android': ['ia32', 'x64', 'arm-neon', 'arm64'],
      'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'],
@@ -18,7 +18,7 @@
      'mac': ['x64', 'arm64'],
      'win': ['ia32', 'x64', 'arm64'],
  }
-@@ -122,7 +124,7 @@ def PrintAndCheckCall(argv, *args, **kwargs):
+@@ -123,7 +125,7 @@ def PrintAndCheckCall(argv, *args, **kwargs):
  
  
  def GetDsoName(target_os, dso_name, dso_version):
@@ -27,7 +27,7 @@
          return 'lib%s.so.%s' % (dso_name, dso_version)
      elif target_os == 'mac':
          return 'lib%s.%s.dylib' % (dso_name, dso_version)
-@@ -474,7 +476,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
+@@ -476,7 +478,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
      # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
      # #warning which will be converted to an error via -Werror.
      # There is also no prctl.h
@@ -36,7 +36,7 @@
          pre_make_rewrites += [
              (r'(#define HAVE_SYSCTL [01])',
               r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
-@@ -597,7 +599,7 @@ def main(argv):
+@@ -599,7 +601,7 @@ def main(argv):
      configure_args = args[2:]
  
      if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win',
@@ -45,7 +45,15 @@
          parser.print_help()
          return 1
  
-@@ -710,7 +712,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+@@ -672,7 +674,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+         '--disable-securetransport',
+         '--disable-faan',
+         '--disable-alsa',
+-        '--disable-iamf',
+ 
+         # Disable automatically detected external libraries. This prevents
+         # automatic inclusion of things like hardware decoders. Each roll should
+@@ -713,7 +714,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
              '--optflags="-O2"',
          ])
  
@@ -54,7 +62,7 @@
          if target_arch == 'x64':
              if target_os == 'android':
                  configure_flags['Common'].extend([
-@@ -825,9 +827,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+@@ -828,9 +829,6 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
  
                  configure_flags['Common'].extend([
                      '--target-os=linux',
@@ -64,7 +72,7 @@
                      # See crbug.com/1467681. These could be removed eventually
                      '--disable-dotprod',
                      '--disable-i8mm',
-@@ -1031,7 +1030,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+@@ -1034,7 +1032,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
              'Chrome', configure_flags['Common'] +
              configure_flags['ChromeAndroid'] + configure_args)
  
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py
index c677afba1eec..7144d5ea4482 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_robo__lib_config.py
+++ b/www/chromium/files/patch-media_ffmpeg_scripts_robo__lib_config.py
@@ -1,25 +1,26 @@
---- third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig	2024-04-19 13:02:56 UTC
-+++ third_party/ffmpeg/chromium/scripts/robo_lib/config.py
-@@ -51,18 +51,12 @@ class RoboConfiguration:
+--- media/ffmpeg/scripts/robo_lib/config.py.orig	2024-06-17 12:56:06 UTC
++++ media/ffmpeg/scripts/robo_lib/config.py
+@@ -55,19 +55,13 @@ class RoboConfiguration:
          self._llvm_path = os.path.join(self.chrome_src(), "third_party",
                                         "llvm-build", "Release+Asserts", "bin")
  
 -        self.EnsurePathContainsLLVM()
 -        self.EnsureNoMakeInfo()
          self.EnsureFFmpegHome()
-         self.EnsureASANConfig()
+         self.EnsureGNConfig()
 -        self.ComputeBranchName()
+ 
          if not quiet:
              shell.log(f"Using chrome src: {self.chrome_src()}")
              shell.log(f"Using script dir: {self._script_directory}")
-             shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}")
+             shell.log(f"Using ffmpeg home: {self.ffmpeg_home()}")
 -            shell.log(f"On branch: {self.branch_name()}")
 -            if self.sushi_branch_name():
 -                shell.log(f"On sushi branch: {self.sushi_branch_name()}")
  
          # Filename that we'll ask generate_gn.py to write git commands to.
          # TODO: Should this use script_directory, or stay with ffmpeg?  As long as
-@@ -155,9 +149,9 @@ class RoboConfiguration:
+@@ -186,9 +180,9 @@ class RoboConfiguration:
  
          if re.match(r"i.86", platform.machine()):
              self._host_architecture = "ia32"
@@ -31,7 +32,7 @@
              self._host_architecture = "arm64"
          elif platform.machine() == "mips32":
              self._host_architecture = "mipsel"
-@@ -192,6 +186,10 @@ class RoboConfiguration:
+@@ -223,6 +217,10 @@ class RoboConfiguration:
          elif platform.system() == "Windows" or "CYGWIN_NT" in platform.system(
          ):
              self._host_operating_system = "win"
@@ -42,7 +43,7 @@
          else:
              raise ValueError(f"Unsupported platform: {platform.system()}")
  
-@@ -200,8 +198,8 @@ class RoboConfiguration:
+@@ -231,8 +229,8 @@ class RoboConfiguration:
          wd = os.getcwd()
          # Walk up the tree until we find src/AUTHORS
          while wd != "/":
diff --git a/www/chromium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc b/www/chromium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc
new file mode 100644
index 000000000000..6a42aab37898
--- /dev/null
+++ b/www/chromium/files/patch-media_gpu_chromeos_gl__image__processor__backend.cc
@@ -0,0 +1,13 @@
+--- media/gpu/chromeos/gl_image_processor_backend.cc.orig	2024-06-18 16:34:35 UTC
++++ media/gpu/chromeos/gl_image_processor_backend.cc
+@@ -28,6 +28,10 @@
+ #include "ui/ozone/public/ozone_platform.h"
+ #include "ui/ozone/public/surface_factory_ozone.h"
+ 
++#ifndef GL_CONTEXT_LOST_KHR
++#define GL_CONTEXT_LOST_KHR 0x0507
++#endif
++
+ namespace media {
+ 
+ namespace {
diff --git a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
index 83704b86179c..c2e486773e52 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_libyuv__image__processor__backend.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/chromeos/libyuv_image_processor_backend.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/chromeos/libyuv_image_processor_backend.cc
 @@ -48,7 +48,7 @@ static constexpr struct {
  #define CONV(in, out, trans, result) \
@@ -9,16 +9,16 @@
      CONV(NV12, AR24, kConversion, Supported),
  #endif
      CONV(NV12, NV12, kConversion, Supported),
-@@ -436,7 +436,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
-           fr->GetWritableVisibleData(VideoFrame::kUVPlane)), \
-       fr->stride(VideoFrame::kUVPlane)
+@@ -415,7 +415,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
+           fr->GetWritableVisibleData(VideoFrame::Plane::kUV)), \
+       fr->stride(VideoFrame::Plane::kUV)
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #define ARGB_DATA(fr)                                 \
-   fr->GetWritableVisibleData(VideoFrame::kARGBPlane), \
-       fr->stride(VideoFrame::kARGBPlane)
-@@ -597,7 +597,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
+ #define ARGB_DATA(fr)                                   \
+   fr->GetWritableVisibleData(VideoFrame::Plane::kARGB), \
+       fr->stride(VideoFrame::Plane::kARGB)
+@@ -577,7 +577,7 @@ int LibYUVImageProcessorBackend::DoConversion(const Fr
      }
    }
  
diff --git a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
index 6b1ec820db47..523578c98f7c 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_mailbox__video__frame__converter.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/chromeos/mailbox_video_frame_converter.cc.orig	2024-05-21 18:07:39 UTC
 +++ media/gpu/chromeos/mailbox_video_frame_converter.cc
-@@ -63,7 +63,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
+@@ -65,7 +65,7 @@ viz::SharedImageFormat GetSharedImageFormat(gfx::Buffe
                      << static_cast<int>(buffer_format);
        NOTREACHED_NORETURN();
    }
diff --git a/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc b/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc
index 9147c398e1fa..79eb0e3bd9fc 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_native__pixmap__frame__resource.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/chromeos/native_pixmap_frame_resource.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/chromeos/native_pixmap_frame_resource.cc
-@@ -166,7 +166,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF
+@@ -154,7 +154,7 @@ scoped_refptr<NativePixmapFrameResource> NativePixmapF
    const bool is_intel_media_compression_enabled =
  #if BUILDFLAG(IS_CHROMEOS)
        base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
diff --git a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
index c40bd7660a06..c3c23ddb60b3 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_platform__video__frame__utils.cc
@@ -1,4 +1,4 @@
---- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/chromeos/platform_video_frame_utils.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/chromeos/platform_video_frame_utils.cc
 @@ -68,7 +68,7 @@ static std::unique_ptr<ui::GbmDevice> CreateGbmDevice(
      const base::FilePath dev_path(FILE_PATH_LITERAL(
@@ -18,7 +18,7 @@
          false;
  #endif
      if (is_intel_media_compression_enabled) {
-@@ -347,7 +347,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor
+@@ -350,7 +350,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameFromGpuMemor
    const bool is_intel_media_compression_enabled =
  #if BUILDFLAG(IS_CHROMEOS)
        base::FeatureList::IsEnabled(features::kEnableIntelMediaCompression);
diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 91e6d983819e..962075437728 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -1038,7 +1038,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1097,7 +1097,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
    }
  #endif
  
@@ -9,21 +9,21 @@
    // Linux should always use a custom allocator (to allocate buffers using
    // libva) and a PlatformVideoFramePool.
    CHECK(allocator.has_value());
-@@ -1048,7 +1048,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
-   // to create NativePixmap-backed frames.
+@@ -1106,7 +1106,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+   // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
    main_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
-       *allocator, VideoFrame::STORAGE_GPU_MEMORY_BUFFER);
+       *allocator, VideoFrame::STORAGE_DMABUFS);
 -#elif BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_V4L2_CODEC)
 +#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_V4L2_CODEC)
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -1206,7 +1206,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1294,7 +1294,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(nhebert): Change the storage type argument when |allocator| switches
-     // to create NativePixmap-backed frames.
+     // The custom allocator creates frames backed by NativePixmap, which uses a
+     // VideoFrame::StorageType of VideoFrame::STORAGE_DMABUFS.
      auxiliary_frame_pool_->AsPlatformVideoFramePool()->SetCustomFrameAllocator(
diff --git a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
index 754952b561c7..203cbf77f53f 100644
--- a/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
 @@ -16,7 +16,9 @@
  #include "media/gpu/vaapi/vaapi_wrapper.h"
@@ -18,7 +18,7 @@
  void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
                                bool include_sys_dev_char,
                                bool read_write) {
-@@ -182,6 +185,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -172,6 +175,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
    NOTREACHED_NORETURN();
  #endif  // BUILDFLAG(USE_V4L2_CODEC)
  }
@@ -26,7 +26,7 @@
  
  }  // namespace
  
-@@ -197,6 +201,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -187,6 +191,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
  //   (at least).
  bool HardwareVideoDecodingPreSandboxHook(
      sandbox::policy::SandboxLinux::Options options) {
@@ -34,7 +34,7 @@
    using HardwareVideoDecodingProcessPolicy =
        sandbox::policy::HardwareVideoDecodingProcessPolicy;
    using PolicyType =
-@@ -242,6 +247,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+@@ -232,6 +237,7 @@ bool HardwareVideoDecodingPreSandboxHook(
    // |permissions| is empty?
    sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
        command_set, permissions, options);
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index 88c151005ad8..39e8e7daf174 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2024-04-19 13:02:56 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -780,7 +780,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -775,7 +775,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index 0a290ec4307d..d74f6268ac80 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig	2024-03-22 08:19:40 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -67,7 +67,7 @@
+@@ -71,7 +71,7 @@
  using media_gpu_vaapi::kModuleVa_prot;
  #endif
  
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index b80cdd2c9011..32e6c83f6f04 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,4 +1,4 @@
---- media/media_options.gni.orig	2024-02-23 21:04:38 UTC
+--- media/media_options.gni.orig	2024-05-21 18:07:39 UTC
 +++ media/media_options.gni
 @@ -190,12 +190,15 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
@@ -17,14 +17,3 @@
        (!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
         is_cast_audio_only)) {
      use_alsa = true
-@@ -211,6 +214,10 @@ declare_args() {
-     if (!use_cras && !is_castos && !is_asan && !is_tsan) {
-       use_pulseaudio = true
-     }
-+  }
-+  if (is_openbsd) {
-+    use_sndio = true
-+    use_pulseaudio = false
-   }
- }
- 
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
index d38bcbe04b9b..b96a0485b5a5 100644
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
@@ -1,6 +1,6 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2023-10-11 18:22:24 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2024-06-17 12:56:06 UTC
 +++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -693,7 +693,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -690,7 +690,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
    static const gfx::GpuMemoryBufferId& id(
        const gfx::GpuMemoryBufferHandle& input);
  
diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
index c70de90e2c46..797279e08afe 100644
--- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,6 +1,6 @@
---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2024-04-19 13:02:56 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -803,7 +803,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -758,7 +758,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
  
    bool is_software_backed_video_frame = !video_frame->HasTextures();
@@ -9,21 +9,21 @@
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1285,7 +1285,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
-     }
+@@ -1234,7 +1234,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+         gpu_memory_buffer->CloneHandle().io_surface.get());
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     is_webgpu_compatible = (gpu_memory_buffer != nullptr);
-     if (is_webgpu_compatible) {
-       is_webgpu_compatible &=
-@@ -1306,7 +1306,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+     is_webgpu_compatible =
+         gpu_memory_buffer->CloneHandle()
+             .native_pixmap_handle.supports_zero_copy_webgpu_import;
+@@ -1250,7 +1250,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
                         gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
                         gpu::SHARED_IMAGE_USAGE_SCANOUT;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
-       // TODO(crbug.com/1241537): Always add the flag once the
+       // TODO(crbug.com/40194712): Always add the flag once the
        // OzoneImageBacking is by default turned on.
        if (base::CommandLine::ForCurrentProcess()->HasSwitch(
diff --git a/www/chromium/files/patch-media_webrtc_helpers.cc b/www/chromium/files/patch-media_webrtc_helpers.cc
index 22caff51258e..06479e538d8f 100644
--- a/www/chromium/files/patch-media_webrtc_helpers.cc
+++ b/www/chromium/files/patch-media_webrtc_helpers.cc
@@ -1,4 +1,4 @@
---- media/webrtc/helpers.cc.orig	2024-04-19 13:02:56 UTC
+--- media/webrtc/helpers.cc.orig	2024-06-17 12:56:06 UTC
 +++ media/webrtc/helpers.cc
 @@ -41,14 +41,14 @@ void ConfigAutomaticGainControl(const AudioProcessingS
      return;
@@ -15,5 +15,5 @@
 -    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    // Use AGC2 digital and input volume controller.
-   // TODO(crbug.com/1375239): Remove `kWebRtcAllowInputVolumeAdjustment` safely.
-   if (kInputVolumeAdjustmentOverrideAllowed &&
+   // TODO(crbug.com/40872787): Remove `kWebRtcAllowInputVolumeAdjustment` safely
+   // and set `input_volume_controller.enabled` true.
diff --git a/www/chromium/files/patch-mojo_core_channel.cc b/www/chromium/files/patch-mojo_core_channel.cc
index 03dbd6760ae5..3caafa1b5a43 100644
--- a/www/chromium/files/patch-mojo_core_channel.cc
+++ b/www/chromium/files/patch-mojo_core_channel.cc
@@ -1,6 +1,6 @@
---- mojo/core/channel.cc.orig	2023-03-09 06:31:50 UTC
+--- mojo/core/channel.cc.orig	2024-06-17 12:56:06 UTC
 +++ mojo/core/channel.cc
-@@ -75,7 +75,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096;
+@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096;
  // Fuchsia: The zx_channel_write() API supports up to 64 handles.
  const size_t kMaxAttachedHandles = 64;
  
diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index 9cc86c147119..c78747196976 100644
--- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig	2024-04-19 13:02:56 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig	2024-06-17 12:56:06 UTC
 +++ mojo/public/tools/bindings/mojom.gni
-@@ -748,6 +748,16 @@ template("mojom") {
+@@ -746,6 +746,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 3cd4eadbb07e..52e9970b826c 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- net/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ net/BUILD.gn
 @@ -123,7 +123,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1188,6 +1188,19 @@ component("net") {
+@@ -1200,6 +1200,19 @@ component("net") {
      ]
    }
  
@@ -29,7 +29,7 @@
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1344,7 +1357,7 @@ component("net") {
+@@ -1357,7 +1370,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -38,7 +38,7 @@
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2821,7 +2834,7 @@ test("net_unittests") {
+@@ -2846,7 +2859,7 @@ test("net_unittests") {
      ]
    }
  
@@ -47,7 +47,7 @@
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -2909,6 +2922,10 @@ test("net_unittests") {
+@@ -2934,6 +2947,10 @@ test("net_unittests") {
      ]
    }
  
@@ -58,7 +58,7 @@
    if (enable_websockets) {
      deps += [ "//net/server:tests" ]
    }
-@@ -2969,7 +2986,7 @@ test("net_unittests") {
+@@ -2994,7 +3011,7 @@ test("net_unittests") {
      ]
    }
  
@@ -67,7 +67,7 @@
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3105,7 +3122,7 @@ test("net_unittests") {
+@@ -3130,7 +3147,7 @@ test("net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_base_features.cc b/www/chromium/files/patch-net_base_features.cc
index 90ddda075e94..a81c542552ed 100644
--- a/www/chromium/files/patch-net_base_features.cc
+++ b/www/chromium/files/patch-net_base_features.cc
@@ -1,4 +1,4 @@
---- net/base/features.cc.orig	2024-04-19 13:02:56 UTC
+--- net/base/features.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/base/features.cc
 @@ -26,7 +26,7 @@ BASE_FEATURE(kCapReferrerToOriginOnCrossOrigin,
  BASE_FEATURE(kAsyncDns,
@@ -9,16 +9,16 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -504,7 +504,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
+@@ -516,7 +516,12 @@ BASE_FEATURE(kSpdyHeadersToHttpResponseUseBuilder,
               "SpdyHeadersToHttpResponseUseBuilder",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#if BUILDFLAG(IS_OPENBSD)
 +// No IP_RECVTOS support
- BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT);
 +#else
-+BASE_FEATURE(kReceiveEcn, "ReceiveEcn", base::FEATURE_DISABLED_BY_DEFAULT);
++BASE_FEATURE(kReportEcn, "ReportEcn", base::FEATURE_DISABLED_BY_DEFAULT);
 +#endif
  
- // TODO(crbug.com/634470): Remove this feature flag in January 2024 if the new
- // limit sticks.
+ BASE_FEATURE(kUseNewAlpsCodepointHttp2,
+              "UseNewAlpsCodepointHttp2",
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h
index 2dadc50d4ab0..4c42e20fe3cb 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig	2024-04-19 13:02:56 UTC
+--- net/cert/cert_verify_proc.h.orig	2024-06-17 12:56:06 UTC
 +++ net/cert/cert_verify_proc.h
-@@ -174,7 +174,7 @@ class NET_EXPORT CertVerifyProc
+@@ -176,7 +176,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn
index 8c130b336675..e388163c06bd 100644
--- a/www/chromium/files/patch-net_dns_BUILD.gn
+++ b/www/chromium/files/patch-net_dns_BUILD.gn
@@ -1,6 +1,6 @@
---- net/dns/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- net/dns/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ net/dns/BUILD.gn
-@@ -136,7 +136,7 @@ source_set("dns") {
+@@ -138,7 +138,7 @@ source_set("dns") {
        "dns_config_service_android.cc",
        "dns_config_service_android.h",
      ]
@@ -9,7 +9,7 @@
      sources += [
        "dns_config_service_linux.cc",
        "dns_config_service_linux.h",
-@@ -177,6 +177,7 @@ source_set("dns") {
+@@ -179,6 +179,7 @@ source_set("dns") {
      ":host_resolver_manager",
      ":mdns_client",
      "//net:net_public_deps",
@@ -17,7 +17,7 @@
    ]
  
    allow_circular_includes_from = [
-@@ -444,9 +445,9 @@ source_set("tests") {
+@@ -447,9 +448,9 @@ source_set("tests") {
  
    if (is_android) {
      sources += [ "dns_config_service_android_unittest.cc" ]
diff --git a/www/chromium/files/patch-net_dns_public_BUILD.gn b/www/chromium/files/patch-net_dns_public_BUILD.gn
index 332fdcd5863f..d0099497585b 100644
--- a/www/chromium/files/patch-net_dns_public_BUILD.gn
+++ b/www/chromium/files/patch-net_dns_public_BUILD.gn
@@ -1,6 +1,6 @@
---- net/dns/public/BUILD.gn.orig	2023-11-03 10:09:45 UTC
+--- net/dns/public/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ net/dns/public/BUILD.gn
-@@ -77,7 +77,7 @@ source_set("tests") {
+@@ -78,7 +78,7 @@ source_set("tests") {
      "doh_provider_entry_unittest.cc",
    ]
  
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 16707212dda0..44b113c835e2 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-02-23 21:04:38 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig	2024-05-21 18:07:39 UTC
 +++ net/proxy_resolution/proxy_config_service_linux.cc
 @@ -6,7 +6,9 @@
  
@@ -17,7 +17,7 @@
 +#if !BUILDFLAG(IS_BSD)
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
- int StringToIntOrDefault(base::StringPiece value, int default_value) {
+ int StringToIntOrDefault(std::string_view value, int default_value) {
 @@ -1033,6 +1036,7 @@ class SettingGetterImplKDE : public ProxyConfigService
    // events on.
    scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index ecbd99d249da..79b7322996b4 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig	2024-03-22 08:19:40 UTC
+--- net/socket/udp_socket_posix.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/socket/udp_socket_posix.cc
-@@ -592,12 +592,17 @@ int UDPSocketPosix::SetRecvTos() {
+@@ -516,12 +516,17 @@ int UDPSocketPosix::SetRecvTos() {
      }
    }
  
@@ -19,7 +19,7 @@
    if (confirm) {
      sendto_flags_ |= MSG_CONFIRM;
    } else {
-@@ -618,7 +623,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -542,7 +547,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
    int value = broadcast ? 1 : 0;
    int rv;
@@ -28,7 +28,7 @@
    // SO_REUSEPORT on OSX permits multiple processes to each receive
    // UDP multicast or broadcast datagrams destined for the bound
    // port.
-@@ -959,7 +964,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
+@@ -880,7 +885,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (last_error == EINVAL)
      return ERR_ADDRESS_IN_USE;
diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
index 7614d0189516..bf75a2ccbf63 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc
@@ -1,4 +1,4 @@
---- net/socket/udp_socket_unittest.cc.orig	2024-04-19 13:02:56 UTC
+--- net/socket/udp_socket_unittest.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/socket/udp_socket_unittest.cc
 @@ -358,7 +358,7 @@ TEST_F(UDPSocketTest, PartialRecv) {
    EXPECT_EQ(second_packet, received);
@@ -15,7 +15,7 @@
      rv = client.SetDoNotFragment();
 -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
 +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
+     // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #elif BUILDFLAG(IS_MAC)
 @@ -697,7 +697,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) {
@@ -24,13 +24,13 @@
      rv = server.SetDoNotFragment();
 -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
 +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia.
+     // TODO(crbug.com/42050633): IP_MTU_DISCOVER is not implemented on Fuchsia.
      EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED));
  #elif BUILDFLAG(IS_MAC)
 @@ -762,7 +762,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) {
  
- // TODO(https://crbug.com/947115): failing on device on iOS 12.2.
- // TODO(https://crbug.com/1227554): flaky on Mac 11.
+ // TODO(crbug.com/40620614): failing on device on iOS 12.2.
+ // TODO(crbug.com/40189274): flaky on Mac 11.
 -#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC)
 +#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
  #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
index 224843fbcab0..208d02df41d7 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
@@ -1,6 +1,6 @@
---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig	2024-02-23 21:04:38 UTC
+--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig	2024-05-21 18:07:39 UTC
 +++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
  #include "net/url_request/url_request_context_builder.h"
  #include "net/url_request/url_request_context_getter.h"
  
@@ -9,7 +9,7 @@
  #include "net/proxy_resolution/proxy_config.h"
  #include "net/proxy_resolution/proxy_config_service_fixed.h"
  #endif
-@@ -55,7 +55,7 @@ void SetUpOnNetworkThread(
+@@ -56,7 +56,7 @@ void SetUpOnNetworkThread(
      base::WaitableEvent* initialization_complete_event) {
    net::URLRequestContextBuilder url_request_context_builder;
    url_request_context_builder.set_user_agent(GetUserAgent());
@@ -18,9 +18,9 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -123,7 +123,7 @@ class CertVerifyImpl {
+@@ -124,7 +124,7 @@ class CertVerifyImpl {
  std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
-     base::StringPiece impl_name,
+     std::string_view impl_name,
      scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
 -#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
 +#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index 7f00b3572d31..dca6b3f5a6e7 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,6 +1,6 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-04-19 13:02:56 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/tools/cert_verify_tool/cert_verify_tool.cc
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
  #include "third_party/boringssl/src/pki/trust_store.h"
  #include "third_party/boringssl/src/pki/trust_store_collection.h"
  
@@ -9,7 +9,7 @@
  #include "net/proxy_resolution/proxy_config.h"
  #include "net/proxy_resolution/proxy_config_service_fixed.h"
  #endif
-@@ -65,7 +65,7 @@ void SetUpOnNetworkThread(
+@@ -66,7 +66,7 @@ void SetUpOnNetworkThread(
      base::WaitableEvent* initialization_complete_event) {
    net::URLRequestContextBuilder url_request_context_builder;
    url_request_context_builder.set_user_agent(GetUserAgent());
diff --git a/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc b/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc
index 9f5c72dbbece..cde336f02953 100644
--- a/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc
+++ b/www/chromium/files/patch-net_tools_net__watcher_net__watcher.cc
@@ -1,4 +1,4 @@
---- net/tools/net_watcher/net_watcher.cc.orig	2023-02-08 09:03:45 UTC
+--- net/tools/net_watcher/net_watcher.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/tools/net_watcher/net_watcher.cc
 @@ -32,7 +32,7 @@
  #include "net/proxy_resolution/proxy_config_service.h"
@@ -11,7 +11,7 @@
  
 @@ -44,7 +44,7 @@ namespace {
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
index 71e4b623311b..cb135f6afe1a 100644
--- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
+++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h
@@ -1,4 +1,4 @@
---- net/traffic_annotation/network_traffic_annotation.h.orig	2022-09-24 10:57:32 UTC
+--- net/traffic_annotation/network_traffic_annotation.h.orig	2024-06-17 12:56:06 UTC
 +++ net/traffic_annotation/network_traffic_annotation.h
 @@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
  }  // namespace net
@@ -10,7 +10,7 @@
    net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.")
  #endif
 @@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if !BUILDFLAG(IS_WIN) && \
 -    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc
index 9853b35853b9..4b0708228493 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context.cc
@@ -1,7 +1,7 @@
---- net/url_request/url_request_context.cc.orig	2024-02-23 21:04:38 UTC
+--- net/url_request/url_request_context.cc.orig	2024-06-17 12:56:06 UTC
 +++ net/url_request/url_request_context.cc
-@@ -117,7 +117,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+@@ -121,7 +121,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if !BUILDFLAG(IS_WIN) && \
 -    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h
index 6766a5c94a17..766935871f68 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.h
+++ b/www/chromium/files/patch-net_url__request_url__request__context.h
@@ -1,7 +1,7 @@
---- net/url_request/url_request_context.h.orig	2024-02-23 21:04:38 UTC
+--- net/url_request/url_request_context.h.orig	2024-06-17 12:56:06 UTC
 +++ net/url_request/url_request_context.h
-@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext final {
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext final {
+ // TODO(crbug.com/40118868): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if !BUILDFLAG(IS_WIN) && \
 -    !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index 6ecf24c32358..ae9597d494d1 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig	2024-03-22 08:19:40 UTC
+--- net/url_request/url_request_context_builder.cc.orig	2024-05-21 18:07:39 UTC
 +++ net/url_request/url_request_context_builder.cc
-@@ -428,7 +428,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -439,7 +439,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
index 561b3965451a..157e7d232b56 100644
--- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- pdf/pdfium/pdfium_engine.cc.orig	2024-02-23 21:04:38 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig	2024-06-17 12:56:06 UTC
 +++ pdf/pdfium/pdfium_engine.cc
-@@ -85,7 +85,7 @@
+@@ -87,7 +87,7 @@
  #include "gin/public/cppgc.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -525,7 +525,7 @@ void InitializeSDK(bool enable_v8,
+@@ -512,7 +512,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc
index 1aaf9a74d6ed..7235a85ba9c9 100644
--- a/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc
+++ b/www/chromium/files/patch-printing_backend_cups__ipp__helper.cc
@@ -1,6 +1,6 @@
---- printing/backend/cups_ipp_helper.cc.orig	2023-09-13 12:11:42 UTC
+--- printing/backend/cups_ipp_helper.cc.orig	2024-06-17 12:56:06 UTC
 +++ printing/backend/cups_ipp_helper.cc
-@@ -215,7 +215,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
+@@ -202,7 +202,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
    // Provide a default DPI if no valid DPI is found.
  #if BUILDFLAG(IS_MAC)
    constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
diff --git a/www/chromium/files/patch-remoting_host_client__session.cc b/www/chromium/files/patch-remoting_host_client__session.cc
index 7bfefc2ff724..a8fe58dcee7e 100644
--- a/www/chromium/files/patch-remoting_host_client__session.cc
+++ b/www/chromium/files/patch-remoting_host_client__session.cc
@@ -1,6 +1,6 @@
---- remoting/host/client_session.cc.orig	2024-04-19 13:02:56 UTC
+--- remoting/host/client_session.cc.orig	2024-05-21 18:07:39 UTC
 +++ remoting/host/client_session.cc
-@@ -161,7 +161,7 @@ void ClientSession::NotifyClientResolution(
+@@ -157,7 +157,7 @@ void ClientSession::NotifyClientResolution(
    if (desktop_environment_options_.enable_curtaining()) {
      dpi_vector.set(resolution.x_dpi(), resolution.y_dpi());
    }
diff --git a/www/chromium/files/patch-remoting_host_evaluate__capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc
index 336d7f574080..009a289e8925 100644
--- a/www/chromium/files/patch-remoting_host_evaluate__capability.cc
+++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc
@@ -1,6 +1,6 @@
---- remoting/host/evaluate_capability.cc.orig	2022-02-28 16:54:41 UTC
+--- remoting/host/evaluate_capability.cc.orig	2024-06-17 12:56:06 UTC
 +++ remoting/host/evaluate_capability.cc
-@@ -55,7 +55,7 @@ base::FilePath BuildHostBinaryPath() {
+@@ -56,7 +56,7 @@ base::FilePath BuildHostBinaryPath() {
    }
  #endif
  
diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc
index c38988847578..088c9fa186c5 100644
--- a/www/chromium/files/patch-remoting_host_host__attributes.cc
+++ b/www/chromium/files/patch-remoting_host_host__attributes.cc
@@ -1,6 +1,6 @@
---- remoting/host/host_attributes.cc.orig	2024-01-30 07:53:34 UTC
+--- remoting/host/host_attributes.cc.orig	2024-06-17 12:56:06 UTC
 +++ remoting/host/host_attributes.cc
-@@ -104,7 +104,7 @@ std::string GetHostAttributes() {
+@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
    if (media::InitializeMediaFoundation()) {
      result.push_back("HWEncoder");
    }
diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
index ca0aac87c93b..a001cb8d3812 100644
--- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
+++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc
@@ -1,4 +1,4 @@
---- remoting/host/me2me_desktop_environment.cc.orig	2024-01-30 07:53:34 UTC
+--- remoting/host/me2me_desktop_environment.cc.orig	2024-05-21 18:07:39 UTC
 +++ remoting/host/me2me_desktop_environment.cc
 @@ -125,7 +125,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities()
      capabilities += protocol::kRemoteWebAuthnCapability;
@@ -9,7 +9,7 @@
    if (!IsRunningWayland()) {
      capabilities += " ";
      capabilities += protocol::kMultiStreamCapability;
-@@ -164,7 +164,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
+@@ -167,7 +167,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
    // properly under Xvfb.
    mutable_desktop_capture_options()->set_use_update_notifications(true);
  
@@ -18,7 +18,7 @@
    // Setting this option to false means that the capture differ wrapper will not
    // be used when the X11 capturer is selected. This reduces the X11 capture
    // time by a few milliseconds per frame and is safe because we can rely on
-@@ -173,7 +173,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
+@@ -176,7 +176,7 @@ Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
    mutable_desktop_capture_options()->set_detect_updated_region(false);
  #endif
  
@@ -27,7 +27,7 @@
    if (IsRunningWayland()) {
      mutable_desktop_capture_options()->set_prefer_cursor_embedded(false);
    }
-@@ -198,7 +198,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
+@@ -201,7 +201,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity(
  
    // Otherwise, if the session is shared with the local user start monitoring
    // the local input and create the in-session UI.
diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
index 88b9949d78c0..25fd4e30ea72 100644
--- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
+++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc
@@ -1,6 +1,6 @@
---- remoting/host/setup/start_host_main.cc.orig	2024-02-23 21:04:38 UTC
+--- remoting/host/setup/start_host_main.cc.orig	2024-06-17 12:56:06 UTC
 +++ remoting/host/setup/start_host_main.cc
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
  #include <unistd.h>
  #endif  // BUILDFLAG(IS_POSIX)
  
@@ -9,7 +9,7 @@
  #include "remoting/host/setup/daemon_controller_delegate_linux.h"
  #include "remoting/host/setup/start_host_as_root.h"
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -252,7 +252,7 @@ bool InitializeCorpMachineParams(HostStarter::Params& 
+@@ -339,7 +339,7 @@ bool InitializeCloudMachineParams(HostStarter::Params&
  }  // namespace
  
  int StartHostMain(int argc, char** argv) {
@@ -18,7 +18,7 @@
    // Minimize the amount of code that runs as root on Posix systems.
    if (getuid() == 0) {
      return remoting::StartHostAsRoot(argc, argv);
-@@ -283,7 +283,7 @@ int StartHostMain(int argc, char** argv) {
+@@ -364,7 +364,7 @@ int StartHostMain(int argc, char** argv) {
  
    mojo::core::Init();
  
diff --git a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
index 212884c5469c..f6b4349131bf 100644
--- a/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
+++ b/www/chromium/files/patch-remoting_protocol_webrtc__video__stream.cc
@@ -1,7 +1,7 @@
---- remoting/protocol/webrtc_video_stream.cc.orig	2023-12-10 06:10:27 UTC
+--- remoting/protocol/webrtc_video_stream.cc.orig	2024-05-21 18:07:39 UTC
 +++ remoting/protocol/webrtc_video_stream.cc
-@@ -263,7 +263,7 @@ WebrtcVideoStream::WebrtcVideoStream(const std::string
-     : stream_name_(stream_name), session_options_(session_options) {
+@@ -267,7 +267,7 @@ WebrtcVideoStream::WebrtcVideoStream(const SessionOpti
+     : session_options_(session_options) {
  // TODO(joedow): Dig into the threading model on other platforms to see if they
  // can also be updated to run on a dedicated thread.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
index 7e6ee659c7ce..8ea7fa355326 100644
--- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
+++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc
@@ -1,4 +1,4 @@
---- sandbox/linux/services/libc_interceptor.cc.orig	2023-09-13 12:11:42 UTC
+--- sandbox/linux/services/libc_interceptor.cc.orig	2024-05-21 18:07:39 UTC
 +++ sandbox/linux/services/libc_interceptor.cc
 @@ -12,7 +12,9 @@
  #include <stddef.h>
@@ -10,7 +10,7 @@
  #include <sys/socket.h>
  #include <sys/types.h>
  #include <time.h>
-@@ -167,7 +169,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
+@@ -168,7 +170,7 @@ bool ReadTimeStruct(base::PickleIterator* iter,
    } else {
      base::AutoLock lock(g_timezones_lock.Get());
      auto ret_pair = g_timezones.Get().insert(timezone);
diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc
index 41ef415278a9..42a090e67c05 100644
--- a/www/chromium/files/patch-sandbox_policy_features.cc
+++ b/www/chromium/files/patch-sandbox_policy_features.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/features.cc.orig	2024-04-19 13:02:56 UTC
+--- sandbox/policy/features.cc.orig	2024-05-21 18:07:39 UTC
 +++ sandbox/policy/features.cc
 @@ -20,7 +20,11 @@ namespace sandbox::policy::features {
  // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
@@ -12,7 +12,7 @@
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  // Enables a fine-grained seccomp-BPF syscall filter for the network service.
-@@ -126,7 +130,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation,
+@@ -131,7 +135,7 @@ BASE_FEATURE(kForceSpectreVariant2Mitigation,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
diff --git a/www/chromium/files/patch-sandbox_policy_features.h b/www/chromium/files/patch-sandbox_policy_features.h
index a78f4fa38587..769b8cb9ff73 100644
--- a/www/chromium/files/patch-sandbox_policy_features.h
+++ b/www/chromium/files/patch-sandbox_policy_features.h
@@ -1,6 +1,6 @@
---- sandbox/policy/features.h.orig	2024-04-19 13:02:56 UTC
+--- sandbox/policy/features.h.orig	2024-05-21 18:07:39 UTC
 +++ sandbox/policy/features.h
-@@ -43,7 +43,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar
+@@ -44,7 +44,7 @@ SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kSpectreVar
  SANDBOX_POLICY_EXPORT BASE_DECLARE_FEATURE(kForceSpectreVariant2Mitigation);
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
diff --git a/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc b/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc
index 33d94315c22d..6b8e9ff56624 100644
--- a/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-services_audio_audio__sandbox__hook__linux.cc
@@ -1,6 +1,6 @@
---- services/audio/audio_sandbox_hook_linux.cc.orig	2024-04-19 13:02:56 UTC
+--- services/audio/audio_sandbox_hook_linux.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/audio/audio_sandbox_hook_linux.cc
-@@ -144,6 +144,7 @@ void AddPulseAudioFilePermissions(
+@@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
  }
  #endif
  
@@ -8,7 +8,7 @@
  std::vector<BrokerFilePermission> GetAudioFilePermissions() {
    std::vector<BrokerFilePermission> permissions{
        BrokerFilePermission::ReadOnly("/dev/urandom"),
-@@ -172,10 +173,12 @@ void LoadAudioLibraries() {
+@@ -171,10 +172,12 @@ void LoadAudioLibraries() {
      }
    }
  }
@@ -21,8 +21,8 @@
    LoadAudioLibraries();
    auto* instance = sandbox::policy::SandboxLinux::GetInstance();
    instance->StartBrokerProcess(MakeBrokerCommandSet({
-@@ -193,6 +196,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux
-   // TODO(https://crbug.com/850878) enable namespace sandbox. Currently, if
+@@ -192,6 +195,7 @@ bool AudioPreSandboxHook(sandbox::policy::SandboxLinux
+   // TODO(crbug.com/40579955) enable namespace sandbox. Currently, if
    // enabled, connect() on pulse native socket fails with ENOENT (called from
    // pa_context_connect).
 +#endif
diff --git a/www/chromium/files/patch-services_device_BUILD.gn b/www/chromium/files/patch-services_device_BUILD.gn
index cada3440fcbe..37fe21c7e5a7 100644
--- a/www/chromium/files/patch-services_device_BUILD.gn
+++ b/www/chromium/files/patch-services_device_BUILD.gn
@@ -1,6 +1,6 @@
---- services/device/BUILD.gn.orig	2023-11-03 10:09:45 UTC
+--- services/device/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ services/device/BUILD.gn
-@@ -13,7 +13,7 @@ if (is_android) {
+@@ -14,7 +14,7 @@ if (is_android) {
  }
  
  is_serial_enabled_platform =
diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
deleted file mode 100644
index a5ac8d4d488f..000000000000
--- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- services/device/geolocation/location_arbitrator.cc.orig	2024-04-19 13:02:56 UTC
-+++ services/device/geolocation/location_arbitrator.cc
-@@ -196,7 +196,7 @@ LocationArbitrator::NewNetworkLocationProvider(
- 
- std::unique_ptr<LocationProvider>
- LocationArbitrator::NewSystemLocationProvider() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   return nullptr;
- #else
-   return device::NewSystemLocationProvider(
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc b/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
index 2eeb889c5484..f665938c7512 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_fido.cc.orig	2023-03-09 06:31:50 UTC
+--- services/device/hid/hid_connection_fido.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/device/hid/hid_connection_fido.cc
 @@ -0,0 +1,216 @@
 +// Copyright 2014 The Chromium Authors
@@ -61,7 +61,7 @@
 +    base::ScopedBlockingCall scoped_blocking_call(
 +        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +
-+    auto data = buffer->front();
++    auto data = buffer->data();
 +    size_t size = buffer->size();
 +    // if report id is 0, it shouldn't be included
 +    if (data[0] == 0) {
@@ -112,7 +112,7 @@
 +
 +    auto buffer =
 +        base::MakeRefCounted<base::RefCountedBytes>(report_buffer_size_);
-+    uint8_t* data = buffer->front();
++    uint8_t* data = buffer->as_vector().data();
 +    size_t length = report_buffer_size_;
 +    if (!has_report_id_) {
 +      // Fido will not prefix the buffer with a report ID if report IDs are not
@@ -197,7 +197,7 @@
 +  DCHECK_GT(device_info()->max_feature_report_size(), 0u);
 +  auto buffer = base::MakeRefCounted<base::RefCountedBytes>(
 +      device_info()->max_feature_report_size() + 1);
-+  buffer->data()[0] = report_id;
++  buffer->as_vector().data()[0] = report_id;
 +
 +  blocking_task_runner_->PostTask(
 +      FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport,
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
index b2ca8662c0bc..fc09862fe901 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,4 +1,4 @@
---- services/device/hid/hid_connection_freebsd.cc.orig	2023-04-05 11:05:06 UTC
+--- services/device/hid/hid_connection_freebsd.cc.orig	2024-06-18 16:34:35 UTC
 +++ services/device/hid/hid_connection_freebsd.cc
 @@ -0,0 +1,240 @@
 +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
@@ -59,7 +59,7 @@
 +    base::ScopedBlockingCall scoped_blocking_call(
 +        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +
-+    auto data = buffer->front();
++    auto data = buffer->as_vector().data();
 +    size_t size = buffer->size();
 +    // if report id is 0, it shouldn't be included
 +    if (data[0] == 0) {
@@ -86,7 +86,7 @@
 +        FROM_HERE, base::BlockingType::MAY_BLOCK);
 +    struct usb_gen_descriptor ugd;
 +    ugd.ugd_report_type = UHID_FEATURE_REPORT;
-+    ugd.ugd_data = buffer->front();
++    ugd.ugd_data = buffer->as_vector().data();
 +    ugd.ugd_maxlen = buffer->size();
 +    int result = HANDLE_EINTR(
 +        ioctl(fd_.get(), USB_GET_REPORT, &ugd));
@@ -109,14 +109,14 @@
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +    struct usb_gen_descriptor ugd;
 +    ugd.ugd_report_type = UHID_FEATURE_REPORT;
-+    ugd.ugd_data = buffer->front();
++    ugd.ugd_data = buffer->as_vector().data();
 +    ugd.ugd_maxlen = buffer->size();
 +    // FreeBSD does not require report id if it's not used
-+    if (buffer->front()[0] == 0) {
-+      ugd.ugd_data = buffer->front() + 1;
++    if (buffer->data()[0] == 0) {
++      ugd.ugd_data = buffer->as_vector().data() + 1;
 +      ugd.ugd_maxlen = buffer->size() - 1;
 +    } else {
-+      ugd.ugd_data = buffer->front();
++      ugd.ugd_data = buffer->as_vector().data();
 +      ugd.ugd_maxlen = buffer->size();
 +    }
 +    int result = HANDLE_EINTR(
@@ -136,7 +136,7 @@
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +
 +    scoped_refptr<base::RefCountedBytes> buffer(new base::RefCountedBytes(report_buffer_size_));
-+    unsigned char* data = buffer->front();
++    unsigned char* data = buffer->as_vector().data();
 +    size_t length = report_buffer_size_;
 +    if (!has_report_id_) {
 +      // FreeBSD will not prefix the buffer with a report ID if report IDs are not
@@ -220,7 +220,7 @@
 +  scoped_refptr<base::RefCountedBytes> buffer(
 +      new base::RefCountedBytes(device_info()->max_feature_report_size() + 1));
 +  if (report_id != 0)
-+    buffer->data()[0] = report_id;
++    buffer->as_vector().data()[0] = report_id;
 +
 +  blocking_task_runner_->PostTask(
 +      FROM_HERE,
diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn
index 1e8aab091a64..f367f1b9f783 100644
--- a/www/chromium/files/patch-services_device_usb_BUILD.gn
+++ b/www/chromium/files/patch-services_device_usb_BUILD.gn
@@ -1,33 +1,15 @@
---- services/device/usb/BUILD.gn.orig	2024-01-30 07:53:34 UTC
+--- services/device/usb/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ services/device/usb/BUILD.gn
-@@ -92,15 +92,17 @@ static_library("usb") {
+@@ -91,7 +91,7 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
    }
  
 -  if (is_mac) {
--    sources += [
--      "usb_device_handle_mac.cc",
--      "usb_device_handle_mac.h",
--      "usb_device_mac.cc",
--      "usb_device_mac.h",
--      "usb_service_mac.cc",
--      "usb_service_mac.h",
--    ]
 +  if (is_mac || is_openbsd) {
-+    if (is_mac) {
-+      sources += [
-+        "usb_device_handle_mac.cc",
-+        "usb_device_handle_mac.h",
-+        "usb_device_mac.cc",
-+        "usb_device_mac.h",
-+        "usb_service_mac.cc",
-+        "usb_service_mac.h",
-+      ]
-+    }
- 
      # These sources and deps are required for libusb.
-     # TODO(https://crbug.com/1096743) Remove these sources.
-@@ -124,6 +126,13 @@ static_library("usb") {
+     # TODO(crbug.com/40136337) Remove these sources.
+     sources += [
+@@ -114,6 +114,13 @@ static_library("usb") {
      deps += [ "//third_party/libusb" ]
    }
  
@@ -41,7 +23,7 @@
    if (is_linux || is_chromeos) {
      sources += [
        "usb_device_linux.cc",
-@@ -141,7 +150,7 @@ static_library("usb") {
+@@ -131,7 +138,7 @@ static_library("usb") {
      deps += [ "//device/udev_linux" ]
    }
  
diff --git a/www/chromium/files/patch-services_device_usb_usb__service.cc b/www/chromium/files/patch-services_device_usb_usb__service.cc
index 3e42afc33502..159fadf209a3 100644
--- a/www/chromium/files/patch-services_device_usb_usb__service.cc
+++ b/www/chromium/files/patch-services_device_usb_usb__service.cc
@@ -1,6 +1,6 @@
---- services/device/usb/usb_service.cc.orig	2022-11-30 08:12:58 UTC
+--- services/device/usb/usb_service.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/device/usb/usb_service.cc
-@@ -22,13 +22,17 @@
+@@ -20,12 +20,16 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "services/device/usb/usb_service_android.h"
@@ -9,7 +9,6 @@
  #include "services/device/usb/usb_service_linux.h"
  #elif BUILDFLAG(IS_MAC)
  #include "services/device/usb/usb_service_impl.h"
- #include "services/device/usb/usb_service_mac.h"
  #elif BUILDFLAG(IS_WIN)
  #include "services/device/usb/usb_service_win.h"
 +#elif BUILDFLAG(IS_OPENBSD)
@@ -19,7 +18,7 @@
  #endif
  
  namespace device {
-@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr
+@@ -48,11 +52,13 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr
  std::unique_ptr<UsbService> UsbService::Create() {
  #if BUILDFLAG(IS_ANDROID)
    return base::WrapUnique(new UsbServiceAndroid());
@@ -28,12 +27,9 @@
    return base::WrapUnique(new UsbServiceLinux());
  #elif BUILDFLAG(IS_WIN)
    return base::WrapUnique(new UsbServiceWin());
-@@ -60,6 +64,8 @@ std::unique_ptr<UsbService> UsbService::Create() {
-     return base::WrapUnique(new UsbServiceMac());
-   else
-     return base::WrapUnique(new UsbServiceImpl());
-+#elif BUILDFLAG(IS_BSD)
+ #elif BUILDFLAG(IS_MAC)
 +  return base::WrapUnique(new UsbServiceImpl());
++#elif BUILDFLAG(IS_BSD)
+   return base::WrapUnique(new UsbServiceImpl());
  #else
    return nullptr;
- #endif
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index b6c1305086f3..f42211c4a2ad 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- services/network/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ services/network/BUILD.gn
-@@ -410,7 +410,6 @@ if (is_linux || is_chromeos) {
+@@ -412,7 +412,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc
index 2fa7170bcc73..c179c05e3fd3 100644
--- a/www/chromium/files/patch-services_network_network__context.cc
+++ b/www/chromium/files/patch-services_network_network__context.cc
@@ -1,6 +1,6 @@
---- services/network/network_context.cc.orig	2024-04-19 13:02:56 UTC
+--- services/network/network_context.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/network/network_context.cc
-@@ -523,7 +523,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+@@ -527,7 +527,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
  NetworkContext::NetworkContextHttpAuthPreferences::
      ~NetworkContextHttpAuthPreferences() = default;
  
@@ -9,7 +9,7 @@
  bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
      const {
    if (network_service_) {
-@@ -2277,7 +2277,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+@@ -2294,7 +2294,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
        http_auth_dynamic_network_service_params->android_negotiate_account_type);
  #endif  // BUILDFLAG(IS_ANDROID)
  
diff --git a/www/chromium/files/patch-services_network_network__context.h b/www/chromium/files/patch-services_network_network__context.h
index 7f5a7a0945c5..edb5e8bdf17b 100644
--- a/www/chromium/files/patch-services_network_network__context.h
+++ b/www/chromium/files/patch-services_network_network__context.h
@@ -1,6 +1,6 @@
---- services/network/network_context.h.orig	2024-04-19 13:02:56 UTC
+--- services/network/network_context.h.orig	2024-06-17 12:56:06 UTC
 +++ services/network/network_context.h
-@@ -670,7 +670,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -677,7 +677,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
     public:
      explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
      ~NetworkContextHttpAuthPreferences() override;
diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc
index 39ac727da28d..85a84ad3a15f 100644
--- a/www/chromium/files/patch-services_network_network__service.cc
+++ b/www/chromium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig	2024-04-19 13:02:56 UTC
+--- services/network/network_service.cc.orig	2024-05-21 18:07:39 UTC
 +++ services/network/network_service.cc
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -9,7 +9,7 @@
      BUILDFLAG(IS_CHROMEOS_LACROS)
  
  #include "components/os_crypt/sync/key_storage_config_linux.h"
-@@ -978,7 +978,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+@@ -983,7 +983,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
    net::SetExplicitlyAllowedPorts(ports);
  }
  
@@ -18,7 +18,7 @@
  void NetworkService::SetGssapiLibraryLoadObserver(
      mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
          gssapi_library_load_observer) {
-@@ -1060,7 +1060,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+@@ -1065,7 +1065,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
    );
  }
  
diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h
index fd7270da64d6..b912c4138493 100644
--- a/www/chromium/files/patch-services_network_network__service.h
+++ b/www/chromium/files/patch-services_network_network__service.h
@@ -1,15 +1,15 @@
---- services/network/network_service.h.orig	2024-04-19 13:02:56 UTC
+--- services/network/network_service.h.orig	2024-05-21 18:07:39 UTC
 +++ services/network/network_service.h
-@@ -229,7 +229,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
-       mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override;
-   void SetFirstPartySets(net::GlobalFirstPartySets sets) override;
+@@ -238,7 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+       const std::vector<ContentSettingPatternSource>& settings) override;
+ 
    void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    void SetGssapiLibraryLoadObserver(
        mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
            gssapi_library_load_observer) override;
-@@ -255,7 +255,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -264,7 +264,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
        NetworkContext* network_context);
  
@@ -18,7 +18,7 @@
    // This is called just before a GSSAPI library may be loaded.
    void OnBeforeGssapiLibraryLoad();
  #endif  // BUILDFLAG(IS_LINUX)
-@@ -481,7 +481,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+@@ -494,7 +494,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
    // leaking stale listeners between tests.
    std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
  
diff --git a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
index 4f89278f6c1d..d07ed234faf7 100644
--- a/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
+++ b/www/chromium/files/patch-services_network_public_cpp_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/cpp/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- services/network/public/cpp/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ services/network/public/cpp/BUILD.gn
-@@ -486,7 +486,7 @@ component("cpp_base") {
+@@ -515,7 +515,7 @@ component("cpp_base") {
      sources += [ "transferable_directory_fuchsia.cc" ]
    }
  
diff --git a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
index 4c4b8d386c12..c99a235595ce 100644
--- a/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
+++ b/www/chromium/files/patch-services_network_public_mojom_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/public/mojom/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- services/network/public/mojom/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ services/network/public/mojom/BUILD.gn
-@@ -522,11 +522,11 @@ mojom("url_loader_base") {
+@@ -524,11 +524,11 @@ mojom("url_loader_base") {
    }
  
    enabled_features = []
@@ -11,15 +11,15 @@
  
 -  if (is_linux) {
 +  if (is_linux && !is_bsd) {
-     # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+     # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
-@@ -1457,7 +1457,7 @@ mojom("mojom") {
+@@ -1489,7 +1489,7 @@ mojom("mojom") {
      }
    }
  
 -  if (is_linux) {
 +  if (is_linux && !is_bsd) {
-     # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+     # TODO(crbug.com/40263697): Remove this once is_linux in the mojom IDL does
      # not include lacros.
      enabled_features += [ "use_network_interface_change_listener" ]
diff --git a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h
index 134640cdf676..74c589214179 100644
--- a/www/chromium/files/patch-services_on__device__model_on__device__model__service.h
+++ b/www/chromium/files/patch-services_on__device__model_on__device__model__service.h
@@ -1,6 +1,6 @@
---- services/on_device_model/on_device_model_service.h.orig	2024-03-22 08:19:40 UTC
+--- services/on_device_model/on_device_model_service.h.orig	2024-06-17 12:56:06 UTC
 +++ services/on_device_model/on_device_model_service.h
-@@ -20,6 +20,10 @@
+@@ -22,6 +22,10 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
  #endif
  
@@ -11,10 +11,10 @@
  namespace on_device_model {
  
  class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelService
-@@ -29,7 +33,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS
-   // These are defined separately in pre_sandbox_init.cc for explicit security
-   // review coverage.
-   [[nodiscard]] static bool PreSandboxInit();
+@@ -35,7 +39,7 @@ class COMPONENT_EXPORT(ON_DEVICE_MODEL) OnDeviceModelS
+   // Must be called in the service's process after the run loop finished.
+   [[nodiscard]] static bool Shutdown();
+ 
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    static void AddSandboxLinuxOptions(
diff --git a/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc b/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc
index cff9a6577e68..0dc54dbc1e8d 100644
--- a/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc
+++ b/www/chromium/files/patch-services_on__device__model_pre__sandbox__init.cc
@@ -1,4 +1,4 @@
---- services/on_device_model/pre_sandbox_init.cc.orig	2024-01-30 07:53:34 UTC
+--- services/on_device_model/pre_sandbox_init.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/on_device_model/pre_sandbox_init.cc
 @@ -14,7 +14,7 @@
  #include "services/on_device_model/ml/chrome_ml.h"  // nogncheck
@@ -9,7 +9,7 @@
  #include "gpu/config/gpu_info_collector.h"                    // nogncheck
  #include "third_party/dawn/include/dawn/dawn_proc.h"          // nogncheck
  #include "third_party/dawn/include/dawn/native/DawnNative.h"  // nogncheck
-@@ -25,7 +25,7 @@ namespace on_device_model {
+@@ -31,7 +31,7 @@ namespace on_device_model {
  
  namespace {
  
@@ -18,7 +18,7 @@
  constexpr uint32_t kVendorIdAMD = 0x1002;
  constexpr uint32_t kVendorIdIntel = 0x8086;
  constexpr uint32_t kVendorIdNVIDIA = 0x10DE;
-@@ -74,7 +74,7 @@ bool OnDeviceModelService::PreSandboxInit() {
+@@ -80,7 +80,7 @@ bool OnDeviceModelService::PreSandboxInit() {
    }
  #endif
  
@@ -27,7 +27,7 @@
    // Warm any relevant drivers before attempting to bring up the sandbox. For
    // good measure we initialize a device instance for any adapter with an
    // appropriate backend on top of any integrated or discrete GPU.
-@@ -100,7 +100,7 @@ bool OnDeviceModelService::PreSandboxInit() {
+@@ -116,7 +116,7 @@ bool OnDeviceModelService::PreSandboxInit() {
    return true;
  }
  
diff --git a/www/chromium/files/patch-services_service__manager_BUILD.gn b/www/chromium/files/patch-services_service__manager_BUILD.gn
index feeef0b864c2..c2a9660749fd 100644
--- a/www/chromium/files/patch-services_service__manager_BUILD.gn
+++ b/www/chromium/files/patch-services_service__manager_BUILD.gn
@@ -1,6 +1,6 @@
---- services/service_manager/BUILD.gn.orig	2021-12-31 00:57:38 UTC
+--- services/service_manager/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ services/service_manager/BUILD.gn
-@@ -67,7 +67,7 @@ source_set("service_manager") {
+@@ -66,7 +66,7 @@ source_set("service_manager") {
      ]
    }
  
diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc
index 6b3eb915dba5..30a1ee32fb5e 100644
--- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc
+++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.cc
@@ -1,4 +1,4 @@
---- services/video_capture/video_capture_service_impl.cc.orig	2024-02-23 21:04:38 UTC
+--- services/video_capture/video_capture_service_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ services/video_capture/video_capture_service_impl.cc
 @@ -41,7 +41,7 @@
  #include "services/video_capture/lacros/device_factory_adapter_lacros.h"
@@ -18,7 +18,7 @@
  // Intended usage of this class is to create viz::Gpu in utility process and
  // connect to viz::GpuClient of browser process, which will call to Gpu service.
  // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
-@@ -307,7 +307,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
+@@ -311,7 +311,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
      gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,7 +27,7 @@
    {
  #else
    if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
-@@ -421,7 +421,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
+@@ -433,7 +433,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
  }
  #endif
  
diff --git a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h
index c387ac95d5c0..62fb1b9fac96 100644
--- a/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h
+++ b/www/chromium/files/patch-services_video__capture_video__capture__service__impl.h
@@ -1,6 +1,6 @@
---- services/video_capture/video_capture_service_impl.h.orig	2024-02-23 21:04:38 UTC
+--- services/video_capture/video_capture_service_impl.h.orig	2024-06-17 12:56:06 UTC
 +++ services/video_capture/video_capture_service_impl.h
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  #include "services/video_capture/ash/video_capture_device_factory_ash.h"
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -9,7 +9,7 @@
  #include "services/viz/public/cpp/gpu/gpu.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -70,7 +70,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+@@ -71,7 +71,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
  #if BUILDFLAG(IS_WIN)
    void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
  #endif
@@ -18,7 +18,7 @@
    void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
          // BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+@@ -112,7 +112,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
        factory_receivers_ash_;
  #endif
  
diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
index 15ca4c0a510d..ccea3ebf9834 100644
--- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,4 +1,4 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2024-04-19 13:02:56 UTC
+--- skia/ext/SkMemory_new_handler.cpp.orig	2024-06-17 12:56:06 UTC
 +++ skia/ext/SkMemory_new_handler.cpp
 @@ -19,7 +19,7 @@
  #include <windows.h>
@@ -9,7 +9,7 @@
  #include <malloc.h>
  #endif
  
-@@ -92,7 +92,7 @@ static void* malloc_nothrow(size_t size) {
+@@ -105,7 +105,7 @@ static void* malloc_nothrow(size_t size, int debug_sen
    // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
    // doesn't work as intended everywhere.
    void* result;
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 156a5b389d2c..08ab41b43218 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- third_party/angle/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ third_party/angle/BUILD.gn
-@@ -335,7 +335,6 @@ config("extra_warnings") {
+@@ -339,7 +339,6 @@ config("extra_warnings") {
        "-Wtautological-type-limit-compare",
        "-Wundefined-reinterpret-cast",
        "-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
        "-Wsuggest-destructor-override",
        "-Wsuggest-override",
  
-@@ -506,7 +505,7 @@ template("angle_common_lib") {
+@@ -516,7 +515,7 @@ template("angle_common_lib") {
        all_dependent_configs = [ ":angle_disable_pool_alloc" ]
      }
  
@@ -17,7 +17,7 @@
        libs = [ "dl" ]
      }
  
-@@ -661,6 +660,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -671,6 +670,9 @@ angle_static_library("angle_gpu_info_util") {
          "Xi",
          "Xext",
        ]
diff --git a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
index 85f535fc625d..d4a1bd36f219 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
+++ b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py
@@ -1,9 +1,9 @@
---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2022-02-07 13:39:41 UTC
+--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py
-@@ -28,7 +28,7 @@ def init(root_src_dir, enable_style_format=True):
-     root_src_dir = os.path.abspath(root_src_dir)
+@@ -30,7 +30,7 @@ def init(root_src_dir, enable_style_format=True):
  
      # Determine //buildtools/<platform>/ directory
+     new_path_platform_suffix = ""
 -    if sys.platform.startswith("linux"):
 +    if sys.platform.startswith(("linux","openbsd","freebsd")):
          platform = "linux64"
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 0ea962d87022..be95c8a57636 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -80,12 +80,12 @@
+@@ -81,12 +81,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
  #endif
  
@@ -15,7 +15,7 @@
  #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
  #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
  #endif
-@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -256,7 +256,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
        main_thread_task_runner);
  #endif
  
@@ -24,7 +24,7 @@
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -294,7 +294,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
+@@ -303,7 +303,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index c2658692af35..03a7e6b3c6ae 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/core/exported/web_view_impl.cc
 @@ -425,7 +425,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3385,7 +3385,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3388,7 +3388,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        renderer_preferences_.use_subpixel_positioning);
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index f8ccf482fb24..9f0544eb398b 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2024-03-22 08:19:40 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6469,7 +6469,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6472,7 +6472,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
  }
  
  #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
  // TODO(crbug.com/1317375): Build these tests on all platforms.
  #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6878,7 +6878,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+@@ -6881,7 +6881,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
  TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
    RunTest("composited_selection_bounds_large_selection_noscroll.html");
  }
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
index 213b880bd866..0d00b733a18e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc
@@ -1,15 +1,15 @@
---- third_party/blink/renderer/core/layout/layout_view.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,7 @@
+ #include "ui/display/screen_info.h"
  #include "ui/gfx/geometry/quad_f.h"
- #include "ui/gfx/geometry/size_conversions.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -832,7 +832,7 @@ void LayoutView::UpdateLayout() {
+@@ -799,7 +799,7 @@ void LayoutView::LayoutRoot() {
      intrinsic_logical_widths_ = LogicalWidth();
    }
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index f8cef9710413..7296016caceb 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2024-03-22 08:19:40 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 @@ -149,7 +149,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // is true for at least GTK and QT apps).
@@ -9,7 +9,7 @@
    return false;
  #else
    return true;
-@@ -368,7 +368,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
+@@ -370,7 +370,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
                                               const WebMouseEvent& event) {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
index 1b186e79d497..96fd2b54cc2a 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
@@ -1,11 +1,10 @@
---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/modules/ml/webnn/features.gni
-@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni")
- declare_args() {
+@@ -7,6 +7,6 @@ declare_args() {
    # This enables building WebNN with XNNPACK. Currently only available for
-   # Windows, macOS and Linux on x64, x86 and arm64.
--  build_webnn_with_xnnpack = (is_linux || is_win || is_mac) &&
-+  build_webnn_with_xnnpack = !is_bsd && (is_linux || is_win || is_mac) &&
-                              (current_cpu == "x64" || current_cpu == "x86" ||
-                               (current_cpu == "arm64" && !is_win))
+   # Windows and macOS on x64, x86 and arm64.
+   build_webnn_with_xnnpack =
+-      (is_win || is_mac) &&
++      !is_bsd && (is_win || is_mac) &&
+       (current_cpu == "x64" || current_cpu == "x86" || current_cpu == "arm64")
  }
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index 6af7b58b929d..e91c9e0ba6f4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2024-03-22 08:19:40 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -301,7 +301,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
+@@ -300,7 +300,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
    SetupRenderer(kDefaultOutputDeviceId);
    renderer_proxy_->Start();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index 37f837a8db08..03563be0cb7a 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6358,7 +6358,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6353,7 +6353,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 889cf513eb74..e58a8d3827a7 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2024-03-22 08:19:40 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -785,7 +785,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -807,7 +807,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
  // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
  // backend is failing for unknown reasons.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index 7832e8964278..9a5a23e19653 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1947,7 +1947,7 @@ static_library("test_support") {
+@@ -1988,7 +1988,7 @@ static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
index d51497f12a3b..18f1de935299 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/platform/fonts/font_description.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/fonts/font_description.cc
 @@ -39,7 +39,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -276,7 +276,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |            // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);       // bit 1
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
index a0c76030a290..de382f90ffad 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig	2023-02-08 09:03:45 UTC
+--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/fonts/font_platform_data.cc
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
  namespace blink {
  namespace {
  
@@ -9,7 +9,7 @@
  // Getting the system font render style takes a significant amount of time on
  // Linux because looking up fonts using fontconfig can be very slow. We fetch
  // the render style for each font family and text size, while it's very
-@@ -127,7 +127,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t
+@@ -128,7 +128,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t
    style_ = WebFontRenderStyle::GetDefault();
  #if !BUILDFLAG(IS_WIN)
    WebFontRenderStyle system_style;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index f002779c7ec5..1bfafd81a14f 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -400,7 +400,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -407,7 +407,7 @@ void VideoFrameSubmitter::OnBeginFrame(
        continue;
      auto& feedback =
          timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index c2b35310b6f4..01cc4854a243 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2024-01-30 07:53:34 UTC
+--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -202,12 +202,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -285,12 +285,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.scalability_modes.push_back(profile.scalability_modes);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index f1773706aebd..e44069dfecac 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2024-05-01 07:03:57 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -313,7 +313,7 @@
+@@ -325,7 +325,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -9,7 +9,34 @@
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1961,7 +1961,7 @@
+@@ -1517,7 +1517,7 @@
+       status: "test",
+       base_feature: "none",
+       origin_trial_feature_name: "FedCmContinueOnBundle",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+       origin_trial_allows_third_party: true,
+     },
+     {
+@@ -1534,7 +1534,7 @@
+       status: "test",
+       base_feature: "none",
+       origin_trial_feature_name: "FedCmButtonMode",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+       origin_trial_allows_third_party: true,
+     },
+     {
+@@ -1579,7 +1579,7 @@
+       base_feature: "none",
+       public: true,
+       origin_trial_feature_name: "FedCmMultipleIdentityProviders",
+-      origin_trial_os: ["win", "mac", "linux", "chromeos"],
++      origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+       origin_trial_allows_third_party: true,
+     },
+     {
+@@ -1919,7 +1919,7 @@
        base_feature_status: "enabled",
        copied_from_base_feature_if: "overridden",
        origin_trial_feature_name: "FullscreenPopupWindows",
@@ -18,16 +45,16 @@
      },
      {
        name: "GamepadButtonAxisEvents",
-@@ -2882,7 +2882,7 @@
-       name: "PaymentHandlerMinimalHeaderUX",
-       origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
-       origin_trial_allows_third_party: true,
+@@ -2983,7 +2983,7 @@
+       // Tracking bug for the implementation: https://crbug.com/1462930
+       name: "PermissionElement",
+       origin_trial_feature_name: "PermissionElement",
 -      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
 +      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
-       status: "stable",
-     },
-     {
-@@ -3074,7 +3074,7 @@
+       status: "experimental",
+       public: true,
+       base_feature_status: "enabled",
+@@ -3118,7 +3118,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -36,7 +63,7 @@
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -3942,7 +3942,7 @@
+@@ -4068,7 +4068,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -45,7 +72,7 @@
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4102,7 +4102,7 @@
+@@ -4237,7 +4237,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
@@ -54,3 +81,12 @@
        status: "experimental",
        base_feature: "none",
      },
+@@ -4280,7 +4280,7 @@
+       status: "experimental",
+       base_feature: "none",
+       origin_trial_feature_name: "WebAppUrlHandling",
+-      origin_trial_os: ["win", "mac", "linux"],
++      origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
+     },
+     {
+       // WebAssembly JS Promise Integration,
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
index e00f3587712a..e8499bb130f4 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
-@@ -676,7 +676,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner
+@@ -696,7 +696,7 @@ bool VideoCaptureImpl::BindVideoFrameOnMediaTaskRunner
    }
  
    const unsigned texture_target =
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
index 205ded2ac3ab..1a2ed87bc5af 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2023-03-09 06:31:50 UTC
+--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -18,6 +18,11 @@
+@@ -19,6 +19,11 @@
  extern "C" void* __libc_stack_end;  // NOLINT
  #endif
  
@@ -12,7 +12,7 @@
  namespace WTF {
  
  size_t GetUnderestimatedStackSize() {
-@@ -62,6 +67,8 @@ size_t GetUnderestimatedStackSize() {
+@@ -63,6 +68,8 @@ size_t GetUnderestimatedStackSize() {
    //    low as 512k.
    //
    return 512 * 1024;
@@ -21,7 +21,7 @@
  #elif BUILDFLAG(IS_APPLE)
    // pthread_get_stacksize_np() returns too low a value for the main thread on
    // OSX 10.9,
-@@ -148,6 +155,13 @@ void* GetStackStart() {
+@@ -149,6 +156,13 @@ void* GetStackStart() {
    ::GetCurrentThreadStackLimits(&lowLimit, &highLimit);
    return reinterpret_cast<void*>(highLimit);
  #endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
index ff10a2d7b858..e669c64a6aba 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_text_text__codec__icu.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
-@@ -615,6 +615,7 @@ static void GbkUrlEscapedEntityCallack(
+@@ -610,6 +610,7 @@ static void GbkUrlEscapedEntityCallack(
                                code_point, reason, err);
  }
  
@@ -8,7 +8,7 @@
  static void GbkCallbackSubstitute(const void* context,
                                    UConverterFromUnicodeArgs* from_unicode_args,
                                    const UChar* code_units,
-@@ -632,6 +633,7 @@ static void GbkCallbackSubstitute(const void* context,
+@@ -627,6 +628,7 @@ static void GbkCallbackSubstitute(const void* context,
    UCNV_FROM_U_CALLBACK_SUBSTITUTE(context, from_unicode_args, code_units,
                                    length, code_point, reason, err);
  }
diff --git a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py b/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py
deleted file mode 100644
index e7e6c332c8f3..000000000000
--- a/www/chromium/files/patch-third__party_boringssl_src_util_generate__build__files.py
+++ /dev/null
@@ -1,34 +0,0 @@
---- third_party/boringssl/src/util/generate_build_files.py.orig	2024-04-19 13:02:56 UTC
-+++ third_party/boringssl/src/util/generate_build_files.py
-@@ -807,10 +807,10 @@ def main(platforms):
-   ]
- 
-   # Generate err_data.c
--  with open('err_data.c', 'w+') as err_data:
--    subprocess.check_call(['go', 'run', 'err_data_generate.go'],
--                          cwd=os.path.join('src', 'crypto', 'err'),
--                          stdout=err_data)
-+#  with open('err_data.c', 'w+') as err_data:
-+#    subprocess.check_call(['go', 'run', 'err_data_generate.go'],
-+#                          cwd=os.path.join('src', 'crypto', 'err'),
-+#                          stdout=err_data)
-   crypto_c_files.append('err_data.c')
-   crypto_c_files.sort()
- 
-@@ -821,11 +821,11 @@ def main(platforms):
-   crypto_test_files = []
-   if EMBED_TEST_DATA:
-     # Generate crypto_test_data.cc
--    with open('crypto_test_data.cc', 'w+') as out:
--      subprocess.check_call(
--          ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'],
--          cwd='src',
--          stdout=out)
-+#    with open('crypto_test_data.cc', 'w+') as out:
-+#      subprocess.check_call(
-+#          ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'],
-+#          cwd='src',
-+#          stdout=out)
-     crypto_test_files.append('crypto_test_data.cc')
- 
-   crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES'])
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
index 8a8a4052b862..52c37d1bd6c6 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc
@@ -1,6 +1,6 @@
---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2024-01-30 07:53:34 UTC
+--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/crashpad/crashpad/util/misc/uuid.cc
-@@ -102,7 +102,7 @@ bool UUID::InitializeWithNew() {
+@@ -110,7 +110,7 @@ bool UUID::InitializeWithNew() {
    InitializeFromBytes(uuid);
    return true;
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
index e1cb50cd8016..446299bfb0ff 100644
--- a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,11 +1,11 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2023-12-10 06:10:27 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2024-06-17 12:56:06 UTC
 +++ third_party/dawn/include/dawn/native/VulkanBackend.h
 @@ -83,7 +83,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
  };
  
  // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
--#ifdef __linux__
-+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+-#if defined(__linux__) || defined(__Fuchsia__)
++#if defined(__linux__) || defined(__Fuchsia__) || defined(__OpenBSD__) || defined(__FreeBSD__)
  
  // Common properties of external images represented by FDs. On successful import the file
  // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be
diff --git a/www/chromium/files/patch-third__party_ffmpeg_configure b/www/chromium/files/patch-third__party_ffmpeg_configure
index 4ef45be429b6..e91d65ac3aad 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_configure
+++ b/www/chromium/files/patch-third__party_ffmpeg_configure
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/configure.orig	2024-04-25 07:48:13 UTC
+--- third_party/ffmpeg/configure.orig	2024-06-17 12:56:06 UTC
 +++ third_party/ffmpeg/configure
-@@ -6713,8 +6713,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en
+@@ -6790,8 +6790,8 @@ if ! disabled pthreads && ! enabled w32threads && ! en
          if enabled pthread_np_h; then
              hdrs="$hdrs pthread_np.h"
          fi
diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
index 2f17fb106b09..4f4d7614c9a7 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
+++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2024-01-30 07:53:34 UTC
+--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2024-06-17 12:56:06 UTC
 +++ third_party/ffmpeg/libavutil/x86/x86inc.asm
-@@ -53,6 +53,12 @@
+@@ -46,6 +46,12 @@
      %endif
  %endif
  
@@ -13,7 +13,7 @@
  %define WIN64  0
  %define UNIX64 0
  %if ARCH_X86_64
-@@ -778,6 +784,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
+@@ -861,6 +867,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
      %endif
      align function_align
      %2:
diff --git a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
index a18b66eb4f9a..cd09cd9764e1 100644
--- a/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
+++ b/www/chromium/files/patch-third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
@@ -1,4 +1,4 @@
---- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2024-04-19 13:02:56 UTC
+--- third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2024-06-03 12:51:57 UTC
 +++ third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
 @@ -99,9 +99,45 @@ static int arm_get_cpu_caps(void) {
    return flags;
@@ -21,7 +21,7 @@
 +  if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
 +    return flags;
 +
-+  if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
++  if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
 +    flags |= HAS_ARM_CRC32;
 +
 +  return flags;
diff --git a/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h b/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h
deleted file mode 100644
index 195e21568483..000000000000
--- a/www/chromium/files/patch-third__party_libusb_src_libusb_libusb.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libusb/src/libusb/libusb.h.orig	2024-04-19 13:02:56 UTC
-+++ third_party/libusb/src/libusb/libusb.h
-@@ -60,7 +60,7 @@ typedef unsigned __int32  uint32_t;
- #include <sys/types.h>
- #endif
- 
--#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- #include <sys/time.h>
- #endif
- 
diff --git a/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c b/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
index 263d9f1a106f..b18fab093f99 100644
--- a/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
+++ b/www/chromium/files/patch-third__party_libvpx_source_libvpx_vpx__ports_aarch64__cpudetect.c
@@ -1,6 +1,6 @@
---- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2024-01-30 07:53:34 UTC
+--- third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c.orig	2024-05-21 18:07:39 UTC
 +++ third_party/libvpx/source/libvpx/vpx_ports/aarch64_cpudetect.c
-@@ -91,9 +91,23 @@ static int arm_get_cpu_caps(void) {
+@@ -92,9 +92,23 @@ static int arm_get_cpu_caps(void) {
    return flags;
  }
  
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
index 4bcfef4e9bea..5a8d6c28d891 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2023-09-13 12:11:42 UTC
+--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2024-06-17 12:56:06 UTC
 +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
-@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
+@@ -162,7 +162,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
      {"ForteMT", "Forte"},
  };
  
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
index 8a5956e8610a..5430f346bfa8 100644
--- a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2024-04-19 13:02:56 UTC
+--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig	2024-06-17 12:56:06 UTC
 +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
-@@ -17,7 +17,7 @@
+@@ -22,7 +22,7 @@
  #include "core/fxge/fx_font.h"
  #include "core/fxge/systemfontinfo_iface.h"
  
@@ -9,7 +9,7 @@
  #error "Included on the wrong platform"
  #endif
  
-@@ -165,9 +165,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf
+@@ -170,9 +170,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf
    std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override {
      auto pInfo = std::make_unique<CFX_LinuxFontInfo>();
      if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) {
diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
index b59251adcb62..addc31cedf8b 100644
--- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp
@@ -1,6 +1,6 @@
---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2022-06-17 14:20:10 UTC
+--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2024-05-21 18:07:39 UTC
 +++ third_party/pdfium/fxjs/fx_date_helpers.cpp
-@@ -37,6 +37,11 @@ double GetLocalTZA() {
+@@ -39,6 +39,11 @@ double GetLocalTZA() {
      return 0;
    time_t t = 0;
    FXSYS_time(&t);
@@ -12,7 +12,7 @@
    FXSYS_localtime(&t);
  #if BUILDFLAG(IS_WIN)
    // In gcc 'timezone' is a global variable declared in time.h. In VC++, that
-@@ -45,6 +50,7 @@ double GetLocalTZA() {
+@@ -47,6 +52,7 @@ double GetLocalTZA() {
    _get_timezone(&timezone);
  #endif
    return (double)(-(timezone * 1000));
diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
index 9d497ab71c3e..6a10c1472156 100644
--- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
+++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h
@@ -1,6 +1,6 @@
---- third_party/perfetto/include/perfetto/base/time.h.orig	2024-01-30 07:53:34 UTC
+--- third_party/perfetto/include/perfetto/base/time.h.orig	2024-05-21 18:07:39 UTC
 +++ third_party/perfetto/include/perfetto/base/time.h
-@@ -193,6 +193,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
+@@ -201,6 +201,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) {
  // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time
  // during suspend (when supported).
  inline TimeNanos GetBootTimeNs() {
@@ -10,7 +10,7 @@
    // Determine if CLOCK_BOOTTIME is available on the first call.
    static const clockid_t kBootTimeClockSource = [] {
      struct timespec ts = {};
-@@ -200,6 +203,7 @@ inline TimeNanos GetBootTimeNs() {
+@@ -208,6 +211,7 @@ inline TimeNanos GetBootTimeNs() {
      return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource;
    }();
    return GetTimeInternalNs(kBootTimeClockSource);
@@ -18,7 +18,7 @@
  }
  
  inline TimeNanos GetWallTimeNs() {
-@@ -207,7 +211,13 @@ inline TimeNanos GetWallTimeNs() {
+@@ -215,7 +219,13 @@ inline TimeNanos GetWallTimeNs() {
  }
  
  inline TimeNanos GetWallTimeRawNs() {
diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc
deleted file mode 100644
index 5ecfe8529421..000000000000
--- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- third_party/protobuf/src/google/protobuf/arenastring.cc.orig	2022-09-01 14:18:43 UTC
-+++ third_party/protobuf/src/google/protobuf/arenastring.cc
-@@ -64,7 +64,9 @@ constexpr size_t kNewAlign = alignof(std::max_align_t)
- #endif
- constexpr size_t kStringAlign = alignof(std::string);
- 
-+#if !(defined(__FreeBSD__) && defined(__i386__))
- static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
-+#endif
- static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, "");
- 
- }  // namespace
diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
index 249b75357b53..3f203e276912 100644
--- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
+++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h
@@ -1,11 +1,11 @@
---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2022-08-31 12:19:35 UTC
+--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig	2024-05-21 18:07:39 UTC
 +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h
 @@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
  
  #undef GOOGLE_PROTOBUF_PLATFORM_ERROR
  
--#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
-+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
+-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
++#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
  // Android ndk does not support the __thread keyword very well yet. Here
  // we use pthread_key_create()/pthread_getspecific()/... methods for
  // TLS support on android.
diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
index 159d76175df2..d1b8346e6155 100644
--- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,15 @@
---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-04-19 13:02:56 UTC
+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-06-03 12:52:16 UTC
 +++ third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -44768,7 +44768,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -14119,7 +14119,7 @@ struct fts5_api {
+ ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
+ ** it.
+ */
+-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__)
+ #  define _XOPEN_SOURCE 600
+ #endif
+ 
+@@ -44777,7 +44777,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -13,7 +22,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -44783,6 +44788,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -44792,6 +44797,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/chromium/files/patch-third__party_tflite_features.gni b/www/chromium/files/patch-third__party_tflite_features.gni
index 910ded3d18b4..e0d03d6ca957 100644
--- a/www/chromium/files/patch-third__party_tflite_features.gni
+++ b/www/chromium/files/patch-third__party_tflite_features.gni
@@ -1,14 +1,13 @@
---- third_party/tflite/features.gni.orig	2023-12-10 06:10:27 UTC
+--- third_party/tflite/features.gni.orig	2024-06-17 12:56:06 UTC
 +++ third_party/tflite/features.gni
-@@ -8,9 +8,9 @@ declare_args() {
+@@ -8,8 +8,8 @@ declare_args() {
    # This enables building TFLite with XNNPACK. Currently only available for
-   # Linux or macOS arm64/x64 and Windows x64 targets.
+   # Linux, macOS and Windows arm64/x64/x86 targets.
    build_tflite_with_xnnpack =
--      ((is_linux || is_mac) &&
-+      (((is_linux || is_mac) &&
-        (current_cpu == "arm64" || current_cpu == "x64")) ||
--      (is_win && current_cpu == "x64")
-+      (is_win && current_cpu == "x64")) && !is_bsd
+-      (is_linux || is_mac || is_win) &&
+-      (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")
++      ((is_linux || is_mac || is_win) &&
++      (current_cpu == "arm64" || current_cpu == "x64" || current_cpu == "x86")) && !is_bsd
  
    # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp.
    build_tflite_with_ruy = true
diff --git a/www/chromium/files/patch-third__party_unrar_src_crypt.cpp b/www/chromium/files/patch-third__party_unrar_src_crypt.cpp
index 0276654cea97..ba1b1255cd3d 100644
--- a/www/chromium/files/patch-third__party_unrar_src_crypt.cpp
+++ b/www/chromium/files/patch-third__party_unrar_src_crypt.cpp
@@ -1,6 +1,6 @@
---- third_party/unrar/src/crypt.cpp.orig	2024-04-19 13:02:56 UTC
+--- third_party/unrar/src/crypt.cpp.orig	2024-05-21 18:07:39 UTC
 +++ third_party/unrar/src/crypt.cpp
-@@ -117,6 +117,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
+@@ -114,6 +114,8 @@ void GetRnd(byte *RndBuf,size_t BufSize)
      Success=CryptGenRandom(hProvider, (DWORD)BufSize, RndBuf) == TRUE;
      CryptReleaseContext(hProvider, 0);
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
index 9e88da1ae282..fb10505257a6 100644
--- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/BUILD.gn.orig	2023-11-03 10:09:45 UTC
+--- third_party/webrtc/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ third_party/webrtc/BUILD.gn
-@@ -217,6 +217,9 @@ config("common_inherited_config") {
+@@ -219,6 +219,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
index 4e1694dfd571..fc46b3b9ead9 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -348,7 +348,7 @@ rtc_library("audio_device_impl") {
+@@ -340,7 +340,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
index 84acc5c1e876..ee7d277752c8 100644
--- a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
@@ -1,23 +1,15 @@
---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2024-05-21 18:07:39 UTC
 +++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
-@@ -201,6 +201,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
- }
- 
+@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
  void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
+   Visual* default_visual = attributes.visual;
+   int default_depth = attributes.depth;
 +#if defined(__OpenBSD__)
 +// pledge(2)
 +  RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). "
 +                         "Performance may be degraded.";
 +  return;
-+#else
-   Visual* default_visual = attributes.visual;
-   int default_depth = attributes.depth;
- 
-@@ -261,6 +267,7 @@ void XServerPixelBuffer::InitShm(const XWindowAttribut
-   RTC_LOG(LS_VERBOSE) << "Using X shared memory extension v" << major << "."
-                       << minor << " with" << (have_pixmaps ? "" : "out")
-                       << " pixmaps.";
 +#endif
- }
  
- bool XServerPixelBuffer::InitPixmaps(int depth) {
+   int major, minor;
+   Bool have_pixmaps;
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
index d9c597c4f16b..9a2df940fcc0 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/network.cc.orig	2023-05-31 08:12:17 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/webrtc/rtc_base/network.cc
-@@ -292,7 +292,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -290,7 +290,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
    }
  #endif
  
diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index e05c71a79d4b..6f93fa30ab6f 100644
--- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,4 +1,4 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2024-04-19 13:02:56 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2024-06-17 12:56:06 UTC
 +++ third_party/webrtc/rtc_base/physical_socket_server.cc
 @@ -54,7 +54,7 @@
  #include "rtc_base/time_utils.h"
@@ -18,7 +18,7 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -336,7 +336,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -329,7 +329,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -365,7 +365,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -358,7 +358,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -396,7 +396,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -389,7 +389,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -425,7 +425,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -418,7 +418,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -718,7 +718,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -697,7 +697,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
@@ -63,7 +63,7 @@
        RTC_LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
        return -1;
  #elif defined(WEBRTC_POSIX)
-@@ -767,7 +767,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -746,7 +746,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        return -1;
  #endif
      case OPT_RECV_ECN:
@@ -72,7 +72,7 @@
        if (family_ == AF_INET6) {
          *slevel = IPPROTO_IPV6;
          *sopt = IPV6_RECVTCLASS;
-@@ -787,10 +787,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -766,10 +766,19 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = SO_KEEPALIVE;
        break;
      case OPT_TCP_KEEPCNT:
@@ -92,7 +92,7 @@
        *slevel = IPPROTO_TCP;
  #if !defined(WEBRTC_MAC)
        *sopt = TCP_KEEPIDLE;
-@@ -798,12 +807,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -777,12 +786,18 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *sopt = TCP_KEEPALIVE;
  #endif
        break;
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
index 40fb708a359e..7b4ee28b4fc3 100644
--- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/webrtc/system_wrappers/BUILD.gn.orig	2022-05-19 14:06:27 UTC
+--- third_party/webrtc/system_wrappers/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ third_party/webrtc/system_wrappers/BUILD.gn
-@@ -64,8 +64,6 @@ rtc_library("system_wrappers") {
+@@ -63,8 +63,6 @@ rtc_library("system_wrappers") {
      if (!build_with_chromium) {
        sources += [ "source/cpu_features_linux.cc" ]
      }
diff --git a/www/chromium/files/patch-third__party_zlib_cpu__features.c b/www/chromium/files/patch-third__party_zlib_cpu__features.c
index d2b248501655..ad94c2d9d9e8 100644
--- a/www/chromium/files/patch-third__party_zlib_cpu__features.c
+++ b/www/chromium/files/patch-third__party_zlib_cpu__features.c
@@ -1,4 +1,4 @@
---- third_party/zlib/cpu_features.c.orig	2024-04-19 13:02:56 UTC
+--- third_party/zlib/cpu_features.c.orig	2024-06-03 12:51:57 UTC
 +++ third_party/zlib/cpu_features.c
 @@ -39,7 +39,8 @@ int ZLIB_INTERNAL riscv_cpu_enable_vclmul = 0;
  #ifndef CPU_NO_SIMD
@@ -44,7 +44,7 @@
 +    if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL)
 +        arm_cpu_enable_pmull = 1;
 +
-+    if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
++    if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
 +        arm_cpu_enable_crc32 = 1;
  #elif defined(ARMV8_OS_FUCHSIA)
      uint32_t features;
diff --git a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py b/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
deleted file mode 100644
index 8f51d62c3310..000000000000
--- a/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/gn/bootstrap/bootstrap.py.orig	2024-04-19 13:02:56 UTC
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -122,7 +122,7 @@ def main(argv):
- 
-   shutil.copy2(
-       os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir)
--  cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']
-+  cmd = [ninja_binary, '-C', gn_build_dir, 'gn']
-   if options.jobs:
-     cmd += ['-j', str(options.jobs)]
-   subprocess.check_call(cmd)
diff --git a/www/chromium/files/patch-tools_gn_build_build__linux.ninja.template b/www/chromium/files/patch-tools_gn_build_build__linux.ninja.template
index 2636120143e8..4d16470b744d 100644
--- a/www/chromium/files/patch-tools_gn_build_build__linux.ninja.template
+++ b/www/chromium/files/patch-tools_gn_build_build__linux.ninja.template
@@ -1,11 +1,11 @@
---- tools/gn/build/build_linux.ninja.template.orig	2022-02-07 13:39:41 UTC
+--- tools/gn/build/build_linux.ninja.template.orig	2024-06-17 12:56:06 UTC
 +++ tools/gn/build/build_linux.ninja.template
 @@ -5,7 +5,7 @@ rule cxx
    deps = gcc
  
  rule alink_thin
--  command = rm -f $out && $ar rcsT $out $in
-+  command = rm -f $out && $ar rcs $out $in
+-  command = $ar rcsT $out $in
++  command = $ar rcs $out $in
    description = AR $out
  
  rule link
diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
index 5ee0f1c00bf1..06c4d10e89bb 100644
--- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
+++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig	2024-02-23 21:04:38 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig	2024-05-21 18:07:39 UTC
 +++ tools/json_schema_compiler/feature_compiler.py
-@@ -276,6 +276,8 @@ FEATURE_GRAMMAR = ({
+@@ -277,6 +277,8 @@ FEATURE_GRAMMAR = ({
                  'linux': 'Feature::LINUX_PLATFORM',
                  'mac': 'Feature::MACOSX_PLATFORM',
                  'win': 'Feature::WIN_PLATFORM',
diff --git a/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py b/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
index 10b0f1008a08..227e35a84741 100644
--- a/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
+++ b/www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py
@@ -1,6 +1,6 @@
---- tools/protoc_wrapper/protoc_wrapper.py.orig	2023-10-11 18:22:24 UTC
+--- tools/protoc_wrapper/protoc_wrapper.py.orig	2024-05-21 18:07:39 UTC
 +++ tools/protoc_wrapper/protoc_wrapper.py
-@@ -179,15 +179,19 @@ def main(argv):
+@@ -183,15 +183,19 @@ def main(argv):
      if not options.exclude_imports:
        protoc_cmd += ["--include_imports"]
  
diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__non__backed.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
index c714ddb33051..b5218a9b8d57 100644
--- a/www/chromium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
+++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__non__backed.cc
@@ -1,6 +1,6 @@
---- ui/base/clipboard/clipboard_non_backed.cc.orig	2024-02-23 21:04:38 UTC
+--- ui/base/clipboard/clipboard_non_backed.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/clipboard/clipboard_non_backed.cc
-@@ -460,7 +460,7 @@ ClipboardNonBacked::ClipboardNonBacked() {
+@@ -461,7 +461,7 @@ ClipboardNonBacked::ClipboardNonBacked() {
    // so create internal clipboards for platform supported clipboard buffers.
    constexpr ClipboardBuffer kClipboardBuffers[] = {
      ClipboardBuffer::kCopyPaste,
diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
index 80adc68ac0b7..05abd10a9d75 100644
--- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
+++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc
@@ -1,6 +1,6 @@
---- ui/base/ime/fake_text_input_client.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/base/ime/fake_text_input_client.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/ime/fake_text_input_client.cc
-@@ -205,7 +205,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
+@@ -210,7 +210,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
    return false;
  }
  
diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
index 06b024ce120e..980fb4f6fe29 100644
--- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
+++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h
@@ -1,6 +1,6 @@
---- ui/base/ime/fake_text_input_client.h.orig	2024-03-22 08:19:40 UTC
+--- ui/base/ime/fake_text_input_client.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/ime/fake_text_input_client.h
-@@ -96,7 +96,7 @@ class FakeTextInputClient : public TextInputClient {
+@@ -98,7 +98,7 @@ class FakeTextInputClient : public TextInputClient {
    void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
index 50064ea128ac..a7573dd150c3 100644
--- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
+++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc
@@ -1,4 +1,4 @@
---- ui/base/ime/init/input_method_initializer.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/base/ime/init/input_method_initializer.cc.orig	2024-05-21 18:07:39 UTC
 +++ ui/base/ime/init/input_method_initializer.cc
 @@ -10,7 +10,7 @@
  #include "build/chromeos_buildflags.h"
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/fake_input_method_context.h"
  #include "ui/base/ime/linux/linux_input_method_context_factory.h"
  #elif BUILDFLAG(IS_WIN)
-@@ -43,7 +43,7 @@ void RestartInputMethod() {
+@@ -33,7 +33,7 @@ void ShutdownInputMethod() {
  }
  
  void InitializeInputMethodForTesting() {
@@ -18,7 +18,7 @@
    GetInputMethodContextFactoryForTest() =
        base::BindRepeating([](LinuxInputMethodContextDelegate* delegate)
                                -> std::unique_ptr<LinuxInputMethodContext> {
-@@ -56,7 +56,7 @@ void InitializeInputMethodForTesting() {
+@@ -46,7 +46,7 @@ void InitializeInputMethodForTesting() {
  
  void ShutdownInputMethodForTesting() {
  #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \
diff --git a/www/chromium/files/patch-ui_base_ime_text__input__client.h b/www/chromium/files/patch-ui_base_ime_text__input__client.h
index 42f87d362249..abd7f982a33d 100644
--- a/www/chromium/files/patch-ui_base_ime_text__input__client.h
+++ b/www/chromium/files/patch-ui_base_ime_text__input__client.h
@@ -1,6 +1,6 @@
---- ui/base/ime/text_input_client.h.orig	2023-07-16 15:47:57 UTC
+--- ui/base/ime/text_input_client.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/ime/text_input_client.h
-@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient
+@@ -266,7 +266,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient
    // fields that are considered 'private' (e.g. in incognito tabs).
    virtual bool ShouldDoLearning() = 0;
  
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
index 81567323b96f..ab16af3b3433 100644
--- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -1,4 +1,4 @@
---- ui/base/resource/resource_bundle.cc.orig	2024-01-30 07:53:34 UTC
+--- ui/base/resource/resource_bundle.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/resource/resource_bundle.cc
 @@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() {
  }
diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
index 43cf1c8e77d5..58abc9175e79 100644
--- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
+++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc
@@ -1,8 +1,8 @@
---- ui/base/test/skia_gold_pixel_diff.cc.orig	2023-09-13 12:11:42 UTC
+--- ui/base/test/skia_gold_pixel_diff.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/test/skia_gold_pixel_diff.cc
 @@ -115,7 +115,7 @@ const char* GetPlatformName() {
    return "macOS";
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc
index 2a6cf5fba425..1fa66ff0867d 100644
--- a/www/chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,15 +1,15 @@
---- ui/base/ui_base_features.cc.orig	2024-05-01 07:03:57 UTC
+--- ui/base/ui_base_features.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/ui_base_features.cc
-@@ -228,7 +228,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
+@@ -245,7 +245,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_WIN) ||                                   \
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ||              \
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
       !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -327,7 +327,7 @@ bool IsForcedColorsEnabled() {
+@@ -339,7 +339,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
index 956b744f20fd..3898741a724f 100644
--- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -1,4 +1,4 @@
---- ui/base/webui/web_ui_util.cc.orig	2024-01-30 07:53:34 UTC
+--- ui/base/webui/web_ui_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/webui/web_ui_util.cc
 @@ -39,7 +39,7 @@ namespace {
  constexpr float kMaxScaleFactor = 1000.0f;
@@ -9,9 +9,9 @@
    return "Roboto, " + GetFontFamily();
  #else
    return GetFontFamily();
-@@ -217,7 +217,7 @@ std::string GetFontFamily() {
+@@ -216,7 +216,7 @@ std::string GetFontFamily() {
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
index a9743e8d4bc5..b04170f2b31b 100644
--- a/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__cursor__loader.cc
@@ -1,6 +1,6 @@
---- ui/base/x/x11_cursor_loader.cc.orig	2024-01-30 07:53:34 UTC
+--- ui/base/x/x11_cursor_loader.cc.orig	2024-05-21 18:07:39 UTC
 +++ ui/base/x/x11_cursor_loader.cc
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
  #include "ui/gfx/x/connection.h"
  #include "ui/gfx/x/xproto.h"
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -137,7 +137,11 @@ std::string CursorPathFromLibXcursor() {
+@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() {
      void operator()(void* ptr) const { dlclose(ptr); }
    };
  
@@ -21,7 +21,7 @@
    if (!lib)
      return "";
  
-@@ -248,7 +252,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
+@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile(
      const std::string& rm_xcursor_theme) {
    constexpr const char kDefaultTheme[] = "default";
    std::string themes[] = {
@@ -30,7 +30,7 @@
      // The toolkit theme has the highest priority.
      LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName()
                          : std::string(),
-@@ -440,7 +444,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
+@@ -442,7 +446,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const
      return size;
    }
  
diff --git a/www/chromium/files/patch-ui_base_x_x11__display__util.cc b/www/chromium/files/patch-ui_base_x_x11__display__util.cc
index 1b5a6ad09de3..7a9b2a253de9 100644
--- a/www/chromium/files/patch-ui_base_x_x11__display__util.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__display__util.cc
@@ -1,4 +1,4 @@
---- ui/base/x/x11_display_util.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/base/x/x11_display_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/x/x11_display_util.cc
 @@ -14,7 +14,6 @@
  
@@ -60,7 +60,7 @@
 -  if (!response || response->format != 32 || response->value_len != 4) {
 -    return gfx::Rect();
 -  }
--  const uint32_t* value = response->value->front_as<uint32_t>();
+-  const uint32_t* value = response->value->cast_to<uint32_t>();
 -  return gfx::Rect(value[0], value[1], value[2], value[3]);
 -}
 -
@@ -81,11 +81,11 @@
 -
 -gfx::ICCProfile GetIccProfileSync(x11::Future<x11::GetPropertyReply> future) {
 -  auto response = future.Sync();
--  if (!response || !response->value->size()) {
+-  if (!response || !response->value_len) {
 -    return gfx::ICCProfile();
 -  }
--  return gfx::ICCProfile::FromData(response->value->data(),
--                                   response->value->size());
+-  return gfx::ICCProfile::FromData(response->value->bytes(),
+-                                   response->value_len * response->format / 8u);
 -}
 -
 -x11::Future<x11::RandR::GetOutputPropertyReply> GetEdidFuture(
@@ -313,7 +313,7 @@
 +  if (!resources) {
 +    return kDefaultInterval;
 +  }
-   // TODO(crbug.com/726842): It might make sense here to pick the output that
+   // TODO(crbug.com/41321728): It might make sense here to pick the output that
    // the window is on. On the other hand, if compositing is enabled, all drawing
    // might be synced to the primary output anyway. Needs investigation.
 -  auto frequency = displays[primary_display_index].display_frequency();
diff --git a/www/chromium/files/patch-ui_base_x_x11__util.cc b/www/chromium/files/patch-ui_base_x_x11__util.cc
index 8e53d0051144..318730922727 100644
--- a/www/chromium/files/patch-ui_base_x_x11__util.cc
+++ b/www/chromium/files/patch-ui_base_x_x11__util.cc
@@ -1,6 +1,6 @@
---- ui/base/x/x11_util.cc.orig	2024-02-23 21:04:38 UTC
+--- ui/base/x/x11_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/base/x/x11_util.cc
-@@ -699,4 +699,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win
+@@ -703,4 +703,20 @@ gfx::ImageSkia GetNativeWindowIcon(intptr_t target_win
    return gfx::ImageSkia::CreateFrom1xBitmap(result);
  }
  
diff --git a/www/chromium/files/patch-ui_color_color__id.h b/www/chromium/files/patch-ui_color_color__id.h
index d580b0aea026..172c1b49d53a 100644
--- a/www/chromium/files/patch-ui_color_color__id.h
+++ b/www/chromium/files/patch-ui_color_color__id.h
@@ -1,9 +1,9 @@
---- ui/color/color_id.h.orig	2024-03-22 08:19:40 UTC
+--- ui/color/color_id.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/color/color_id.h
-@@ -611,7 +611,7 @@
-   E_CPONLY(kColorNativeColor6) \
-   E_CPONLY(kColorNativeBaseColor) \
-   E_CPONLY(kColorNativeSecondaryColor)
+@@ -620,7 +620,7 @@
+   \
+   E_CPONLY(kColorCrosSysPositive) \
+   E_CPONLY(kColorCrosSysComplementVariant)
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #define PLATFORM_SPECIFIC_COLOR_IDS \
diff --git a/www/chromium/files/patch-ui_color_color__provider__utils.cc b/www/chromium/files/patch-ui_color_color__provider__utils.cc
index fb6d892016ed..0fac26f5fa15 100644
--- a/www/chromium/files/patch-ui_color_color__provider__utils.cc
+++ b/www/chromium/files/patch-ui_color_color__provider__utils.cc
@@ -1,6 +1,6 @@
---- ui/color/color_provider_utils.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/color/color_provider_utils.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/color/color_provider_utils.cc
-@@ -200,7 +200,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst
+@@ -186,7 +186,7 @@ std::string_view SystemThemeName(ui::SystemTheme syste
    switch (system_theme) {
      case ui::SystemTheme::kDefault:
        return "kDefault";
diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc
index fbd6a8157e5f..afd7aff75f13 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.cc
+++ b/www/chromium/files/patch-ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/compositor/compositor.cc.orig	2024-05-21 18:07:39 UTC
 +++ ui/compositor/compositor.cc
-@@ -910,7 +910,7 @@ void Compositor::OnResume() {
+@@ -922,7 +922,7 @@ void Compositor::OnResume() {
      obs.ResetIfActive();
  }
  
diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h
index 4ca7bf54f599..b2b24fe0849d 100644
--- a/www/chromium/files/patch-ui_compositor_compositor.h
+++ b/www/chromium/files/patch-ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor.h.orig	2024-04-19 13:02:56 UTC
+--- ui/compositor/compositor.h.orig	2024-05-21 18:07:39 UTC
 +++ ui/compositor/compositor.h
-@@ -455,7 +455,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -456,7 +456,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
    // base::PowerSuspendObserver:
    void OnResume() override;
  
diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h
index 71087c757b0e..6006486cea92 100644
--- a/www/chromium/files/patch-ui_compositor_compositor__observer.h
+++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h
@@ -1,6 +1,6 @@
---- ui/compositor/compositor_observer.h.orig	2024-02-23 21:04:38 UTC
+--- ui/compositor/compositor_observer.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/compositor/compositor_observer.h
-@@ -46,7 +46,7 @@ class COMPOSITOR_EXPORT CompositorObserver {
+@@ -52,7 +52,7 @@ class COMPOSITOR_EXPORT CompositorObserver {
    // Called when a child of the compositor is resizing.
    virtual void OnCompositingChildResizing(Compositor* compositor) {}
  
diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
index e3ac5296cccb..42bc6f8912e8 100644
--- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
+++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
@@ -1,6 +1,6 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2024-02-23 21:04:38 UTC
+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/events/keycodes/dom/keycode_converter.cc
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  #include "ui/events/keycodes/dom/dom_code.h"
  #include "ui/events/keycodes/dom/dom_key.h"
  
@@ -9,7 +9,7 @@
  #include <linux/input.h>
  #endif
  
-@@ -24,7 +24,7 @@ namespace {
+@@ -26,7 +26,7 @@ namespace {
  #if BUILDFLAG(IS_WIN)
  #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \
    { usb, win, code }
@@ -18,7 +18,7 @@
  #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \
    { usb, xkb, code }
  #elif BUILDFLAG(IS_APPLE)
-@@ -63,7 +63,7 @@ struct DomKeyMapEntry {
+@@ -65,7 +65,7 @@ struct DomKeyMapEntry {
  #undef DOM_KEY_UNI
  #undef DOM_KEY_MAP_DECLARATION_END
  
@@ -27,7 +27,7 @@
  
  // The offset between XKB Keycode and evdev code.
  constexpr int kXkbKeycodeOffset = 8;
-@@ -184,7 +184,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c
+@@ -186,7 +186,7 @@ int KeycodeConverter::DomCodeToNativeKeycode(DomCode c
    return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code));
  }
  
diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h
index 2570b8068bdd..0fec07e61fd1 100644
--- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h
+++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h
@@ -1,6 +1,6 @@
---- ui/events/keycodes/dom/keycode_converter.h.orig	2024-02-23 21:04:38 UTC
+--- ui/events/keycodes/dom/keycode_converter.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/events/keycodes/dom/keycode_converter.h
-@@ -63,7 +63,7 @@ class KeycodeConverter {
+@@ -64,7 +64,7 @@ class KeycodeConverter {
    // Convert a DomCode into a native keycode.
    static int DomCodeToNativeKeycode(DomCode code);
  
diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn
index 125041728f71..122f1a316587 100644
--- a/www/chromium/files/patch-ui_gfx_BUILD.gn
+++ b/www/chromium/files/patch-ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/gfx/BUILD.gn.orig	2024-02-23 21:04:38 UTC
+--- ui/gfx/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ ui/gfx/BUILD.gn
-@@ -664,7 +664,7 @@ source_set("memory_buffer_sources") {
+@@ -663,7 +663,7 @@ source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/chromium/files/patch-ui_gfx_codec_png__codec.cc b/www/chromium/files/patch-ui_gfx_codec_png__codec.cc
deleted file mode 100644
index 1f47a3f99d25..000000000000
--- a/www/chromium/files/patch-ui_gfx_codec_png__codec.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/gfx/codec/png_codec.cc.orig	2023-10-11 18:22:24 UTC
-+++ ui/gfx/codec/png_codec.cc
-@@ -12,7 +12,7 @@
- #include "base/metrics/histogram_macros.h"
- #include "base/notreached.h"
- #include "base/strings/string_util.h"
--#include "third_party/libpng/png.h"
-+#include <png.h>
- #include "third_party/skia/include/core/SkBitmap.h"
- #include "third_party/skia/include/core/SkColorPriv.h"
- #include "third_party/skia/include/core/SkUnPreMultiply.h"
diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
index 5a4d38022d21..525b921796f7 100644
--- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
+++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc
@@ -1,6 +1,6 @@
---- ui/gfx/gpu_memory_buffer.cc.orig	2023-04-05 11:05:06 UTC
+--- ui/gfx/gpu_memory_buffer.cc.orig	2024-05-21 18:07:39 UTC
 +++ ui/gfx/gpu_memory_buffer.cc
-@@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
+@@ -55,7 +55,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c
    handle.region = region.Duplicate();
    handle.offset = offset;
    handle.stride = stride;
diff --git a/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc b/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc
index d3aeaf960fc3..6d2a921bfe07 100644
--- a/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc
+++ b/www/chromium/files/patch-ui_gfx_linux_gbm__wrapper.cc
@@ -1,6 +1,6 @@
---- ui/gfx/linux/gbm_wrapper.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/gfx/linux/gbm_wrapper.cc.orig	2024-05-21 18:07:39 UTC
 +++ ui/gfx/linux/gbm_wrapper.cc
-@@ -313,7 +313,7 @@ class Device final : public ui::GbmDevice {
+@@ -314,7 +314,7 @@ class Device final : public ui::GbmDevice {
      // of 1x1 BOs which are destroyed before creating the final BO creation used
      // to instantiate the returned GbmBuffer.
      gfx::Size size_for_verification =
diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h
index 5e9219df91d6..08b0423d57c3 100644
--- a/www/chromium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h
@@ -1,8 +1,8 @@
---- ui/gfx/native_widget_types.h.orig	2024-02-23 21:04:38 UTC
+--- ui/gfx/native_widget_types.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/gfx/native_widget_types.h
 @@ -104,7 +104,7 @@ class SkBitmap;
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
@@ -11,7 +11,7 @@
  using AtkObject = struct _AtkObject;
 @@ -220,7 +220,7 @@ using NativeViewAccessible = struct objc_object*;
  #endif
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc b/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc
index ca6343b440e5..97a711a34209 100644
--- a/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc
+++ b/www/chromium/files/patch-ui_gfx_render__text__fuzzer.cc
@@ -1,15 +1,15 @@
---- ui/gfx/render_text_fuzzer.cc.orig	2022-08-31 12:19:35 UTC
+--- ui/gfx/render_text_fuzzer.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/gfx/render_text_fuzzer.cc
-@@ -14,7 +14,7 @@
+@@ -17,7 +17,7 @@
+ #include "ui/gfx/canvas.h"
  #include "ui/gfx/font_util.h"
- #include "ui/gfx/render_text.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
  #endif
  
-@@ -37,7 +37,7 @@ struct Environment {
+@@ -40,7 +40,7 @@ struct Environment {
  
      CHECK(base::i18n::InitializeICU());
  
diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn
index 4628783b179c..7c6e3e332db5 100644
--- a/www/chromium/files/patch-ui_gl_BUILD.gn
+++ b/www/chromium/files/patch-ui_gl_BUILD.gn
@@ -1,4 +1,4 @@
---- ui/gl/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- ui/gl/BUILD.gn.orig	2024-05-21 18:07:39 UTC
 +++ ui/gl/BUILD.gn
 @@ -153,8 +153,6 @@ component("gl") {
      defines += [ "GPU_ENABLE_SERVICE_LOGGING" ]
@@ -9,7 +9,7 @@
    all_dependent_configs = [ ":gl_config" ]
  
    public_configs = [ "//third_party/khronos:khronos_headers" ]
-@@ -172,7 +170,6 @@ component("gl") {
+@@ -171,7 +169,6 @@ component("gl") {
    ]
    public_deps = [
      "//base",
@@ -17,7 +17,7 @@
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -379,7 +376,6 @@ component("gl") {
+@@ -378,7 +375,6 @@ component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -25,7 +25,7 @@
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -579,7 +575,6 @@ test("gl_unittests") {
+@@ -578,7 +574,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/chromium/files/patch-ui_gl_gl__switches.cc b/www/chromium/files/patch-ui_gl_gl__switches.cc
index 4f330b022936..21adc148c7fb 100644
--- a/www/chromium/files/patch-ui_gl_gl__switches.cc
+++ b/www/chromium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/gl/gl_switches.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/gl/gl_switches.cc
 @@ -11,7 +11,7 @@
  #include "base/android/build_info.h"
@@ -9,7 +9,7 @@
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -298,7 +298,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -299,7 +299,7 @@ bool IsDefaultANGLEVulkan() {
        base::android::SDK_VERSION_Q)
      return false;
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -18,7 +18,7 @@
    angle::SystemInfo system_info;
    if (!angle::GetSystemInfoVulkan(&system_info))
      return false;
-@@ -310,7 +310,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -311,7 +311,7 @@ bool IsDefaultANGLEVulkan() {
  
    const auto& active_gpu = system_info.gpus[system_info.activeGPUIndex];
  
diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
index b48faf4e7997..b592fc8a2d7c 100644
--- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
+++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc
@@ -1,6 +1,6 @@
---- ui/gtk/printing/print_dialog_gtk.cc.orig	2023-11-03 10:09:45 UTC
+--- ui/gtk/printing/print_dialog_gtk.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/gtk/printing/print_dialog_gtk.cc
-@@ -433,7 +433,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -434,7 +434,7 @@ void PrintDialogGtk::ShowDialog(
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
        GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
        GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
index 24f1e8424a78..0ef68698ef27 100644
--- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
+++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc
@@ -1,8 +1,8 @@
---- ui/message_center/views/message_popup_view.cc.orig	2023-12-10 06:10:27 UTC
+--- ui/message_center/views/message_popup_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/message_center/views/message_popup_view.cc
 @@ -135,7 +135,7 @@ void MessagePopupView::Show() {
    params.z_order = ui::ZOrderLevel::kFloatingWindow;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h
index a91b318f64f6..c53024c98c52 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme.h
+++ b/www/chromium/files/patch-ui_native__theme_native__theme.h
@@ -1,8 +1,8 @@
---- ui/native_theme/native_theme.h.orig	2023-10-11 18:22:24 UTC
+--- ui/native_theme/native_theme.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/native_theme/native_theme.h
 @@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
      kCheckbox,
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
index e1b853aed5cd..340aac2fd075 100644
--- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
+++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc
@@ -1,8 +1,8 @@
---- ui/native_theme/native_theme_base.cc.orig	2023-11-03 10:09:45 UTC
+--- ui/native_theme/native_theme_base.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/native_theme/native_theme_base.cc
-@@ -235,7 +235,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+@@ -236,7 +236,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
        break;
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
index e6d500e4b971..ff4e116592fe 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_common_wayland__util.cc
@@ -1,11 +1,11 @@
---- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/common/wayland_util.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/common/wayland_util.cc
-@@ -337,7 +337,7 @@ void TransformToWlArray(
+@@ -336,7 +336,7 @@ void TransformToWlArray(
  }
  
  base::TimeTicks EventMillisecondsToTimeTicks(uint32_t milliseconds) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // TODO(crbug.com/1499638): `milliseconds` comes from Weston that
+   // TODO(crbug.com/40287874): `milliseconds` comes from Weston that
    // uses timestamp from libinput, which is different from TimeTicks.
    // Use EventTimeForNow(), for now.
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
index e275c510acba..e3546014f53f 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__connection.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_connection.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/host/wayland_connection.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/host/wayland_connection.cc
-@@ -539,7 +539,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c
+@@ -532,7 +532,7 @@ bool WaylandConnection::ShouldUseOverlayDelegation() c
    // isn't present on any non-exo Wayland compositors.
    bool should_use_overlay_delegation =
        IsWaylandOverlayDelegationEnabled() && !fractional_scale_manager_v1();
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
index 9408ca36b7fc..5242cb7ff25a 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__input__method__context.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/ozone/platform/wayland/host/wayland_input_method_context.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/host/wayland_input_method_context.cc
-@@ -54,7 +54,7 @@ namespace {
+@@ -55,7 +55,7 @@ namespace {
  // Only enable the preedit string for sequence mode (i.e. when using dead keys
  // or the Compose key) on Linux ozone/wayland (see b/220370007).
  constexpr CharacterComposer::PreeditStringMode kPreeditStringMode =
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc
new file mode 100644
index 000000000000..4fce2692a198
--- /dev/null
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__popup.cc
@@ -0,0 +1,11 @@
+--- ui/ozone/platform/wayland/host/wayland_popup.cc.orig	2024-05-21 18:07:39 UTC
++++ ui/ozone/platform/wayland/host/wayland_popup.cc
+@@ -34,7 +34,7 @@ WaylandPopup::WaylandPopup(PlatformWindowDelegate* del
+                            WaylandWindow* parent)
+     : WaylandWindow(delegate, connection) {
+   set_parent_window(parent);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // TODO(crbug.com/330384470): Whether the popup appear depends on whether
+   // anchor point is outside of the parent xdg_surface. On Mutter the popup will
+   // not show when outside.
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
index 7da4f5d6aa20..453c25cc3260 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -606,7 +606,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
+@@ -602,7 +602,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
    const bool did_active_change = is_active_ != window_states.is_activated;
    is_active_ = window_states.is_activated;
  
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
index 91708306c24d..96030f51d514 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig	2024-05-21 18:07:39 UTC
 +++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h
-@@ -265,7 +265,7 @@ class WaylandToplevelWindow : public WaylandWindow,
+@@ -263,7 +263,7 @@ class WaylandToplevelWindow : public WaylandWindow,
    // The display ID to switch to in case the state is `kFullscreen`.
    int64_t fullscreen_display_id_ = display::kInvalidDisplayId;
  
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc
index df43b637cc76..008c5518e079 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_window.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/ozone/platform/wayland/host/wayland_window.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/host/wayland_window.cc
-@@ -245,7 +245,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
+@@ -294,7 +294,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
    // Whenever the window gets the pointer focus back, the cursor shape must be
    // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not
    // restored by the Wayland compositor.
@@ -9,7 +9,7 @@
    if (focused && async_cursor_) {
      async_cursor_->AddCursorLoadedCallback(
          base::BindOnce(&WaylandWindow::OnCursorLoaded,
-@@ -506,7 +506,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
+@@ -553,7 +553,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
  void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) {
    DCHECK(platform_cursor);
  
@@ -18,7 +18,7 @@
    auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor);
  
    if (async_cursor_ == async_cursor) {
-@@ -716,7 +716,7 @@ std::string WaylandWindow::WindowStates::ToString() co
+@@ -762,7 +762,7 @@ std::string WaylandWindow::WindowStates::ToString() co
    } else {
      base::TrimString(states, " ", &states);
    }
@@ -27,7 +27,7 @@
    states += "; tiled_edges: ";
    std::string tiled = "";
    if (tiled_edges.left) {
-@@ -1185,12 +1185,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
+@@ -1242,12 +1242,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
          cursor->bitmaps(), hotspot_in_dips,
          std::ceil(cursor->cursor_image_scale_factor()));
    }
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
index c93a9a642594..382c182b93c0 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/host/wayland_window.h.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/host/wayland_window.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/host/wayland_window.h
 @@ -40,7 +40,7 @@
  #include "ui/platform_window/platform_window_init_properties.h"
@@ -9,7 +9,7 @@
  #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h"
  #endif
  
-@@ -251,7 +251,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -259,7 +259,7 @@ class WaylandWindow : public PlatformWindow,
      bool is_snapped_primary = false;
      bool is_snapped_secondary = false;
      bool is_floated = false;
@@ -18,7 +18,7 @@
      WindowTiledEdges tiled_edges;
  #endif
  
-@@ -510,7 +510,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -552,7 +552,7 @@ class WaylandWindow : public PlatformWindow,
  
    void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor);
  
@@ -27,7 +27,7 @@
    void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
                        scoped_refptr<BitmapCursor> bitmap_cursor);
  #endif
-@@ -571,7 +571,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -622,7 +622,7 @@ class WaylandWindow : public PlatformWindow,
  
    wl::Object<zaura_surface> aura_surface_;
  
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
index 8521b49f315e..d7776fd2d0d4 100644
--- a/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -67,13 +67,13 @@
+@@ -66,13 +66,13 @@
  #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
  #endif
  
@@ -16,7 +16,7 @@
  #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h"
  #endif
  
-@@ -268,7 +268,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -267,7 +267,7 @@ class OzonePlatformWayland : public OzonePlatform,
  
      buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>(
          connection_->buffer_manager_host());
@@ -25,7 +25,7 @@
      cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get());
  #else
      cursor_factory_ = std::make_unique<BitmapCursorFactory>();
-@@ -278,7 +278,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -277,7 +277,7 @@ class OzonePlatformWayland : public OzonePlatform,
  
      supported_buffer_formats_ =
          connection_->buffer_manager_host()->GetSupportedBufferFormats();
@@ -34,7 +34,7 @@
      linux_ui_delegate_ =
          std::make_unique<LinuxUiDelegateWayland>(connection_.get());
  #endif
-@@ -344,7 +344,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -343,7 +343,7 @@ class OzonePlatformWayland : public OzonePlatform,
        properties->supports_global_screen_coordinates =
            kDefaultScreenCoordinateEnabled;
  
@@ -43,7 +43,7 @@
        // TODO(crbug.com/40800718): Revisit (and maybe remove) once proper
        // support, probably backed by org.freedesktop.portal.Screenshot.PickColor
        // API is implemented. Note: this is restricted to Linux Desktop as Lacros
-@@ -532,7 +532,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -536,7 +536,7 @@ class OzonePlatformWayland : public OzonePlatform,
    DrmRenderNodePathFinder path_finder_;
  #endif
  
diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
index 19f020fa14de..086aa114e75c 100644
--- a/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
+++ b/www/chromium/files/patch-ui_ozone_platform_x11_x11__window.cc
@@ -1,11 +1,11 @@
---- ui/ozone/platform/x11/x11_window.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/ozone/platform/x11/x11_window.cc.orig	2024-06-20 12:56:26 UTC
 +++ ui/ozone/platform/x11/x11_window.cc
-@@ -1501,7 +1501,7 @@ void X11Window::OnXWindowStateChanged() {
+@@ -1495,7 +1495,7 @@ void X11Window::OnXWindowStateChanged() {
    WindowTiledEdges tiled_state = GetTiledState();
    if (tiled_state != tiled_state_) {
      tiled_state_ = tiled_state;
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      platform_window_delegate_->OnWindowTiledStateChanged(tiled_state);
+     UpdateDecorationInsets();
  #endif
-   }
diff --git a/www/chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h b/www/chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
index d897cd56b7bd..108c8136eac6 100644
--- a/www/chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
+++ b/www/chromium/files/patch-ui_ozone_test_mock__platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/ozone/test/mock_platform_window_delegate.h.orig	2024-03-22 08:19:40 UTC
+--- ui/ozone/test/mock_platform_window_delegate.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/ozone/test/mock_platform_window_delegate.h
-@@ -33,7 +33,7 @@ class MockPlatformWindowDelegate : public PlatformWind
+@@ -35,7 +35,7 @@ class MockPlatformWindowDelegate : public PlatformWind
    MOCK_METHOD2(OnWindowStateChanged,
                 void(PlatformWindowState old_state,
                      PlatformWindowState new_state));
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc
index 9f9259ce1dae..cceb49e19772 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.cc
@@ -1,8 +1,8 @@
---- ui/platform_window/platform_window_delegate.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/platform_window/platform_window_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/platform_window/platform_window_delegate.cc
-@@ -48,7 +48,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
- 
- PlatformWindowDelegate::~PlatformWindowDelegate() = default;
+@@ -61,7 +61,7 @@ gfx::Insets PlatformWindowDelegate::CalculateInsetsInD
+   return gfx::Insets();
+ }
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
index 0412cece8109..8362abac70f3 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig	2024-03-22 08:19:40 UTC
+--- ui/platform_window/platform_window_delegate.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/platform_window/platform_window_delegate.h
-@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -180,7 +180,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
index 3ad5a97e178b..ec3268b794a1 100644
--- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
+++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h
@@ -1,4 +1,4 @@
---- ui/platform_window/platform_window_init_properties.h.orig	2024-03-22 08:19:40 UTC
+--- ui/platform_window/platform_window_init_properties.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/platform_window/platform_window_init_properties.h
 @@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate;
  class ScenicWindowDelegate;
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
index 8dd995607854..23d5ea6d0522 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,4 +1,4 @@
---- ui/views/controls/textfield/textfield.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/views/controls/textfield/textfield.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/controls/textfield/textfield.cc
 @@ -85,7 +85,7 @@
  #include "base/win/win_util.h"
@@ -18,7 +18,7 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -743,7 +743,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
    if (!textfield)
      return handled;
  
@@ -27,7 +27,7 @@
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
    if (!handled && linux_ui &&
-@@ -925,7 +925,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -926,7 +926,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -36,16 +36,16 @@
    // Skip any accelerator handling that conflicts with custom keybindings.
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1978,7 +1978,7 @@ bool Textfield::ShouldDoLearning() {
+@@ -1979,7 +1979,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
 -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(https://crbug.com/952355): Implement this method to support Korean IME
+ // TODO(crbug.com/41452689): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2482,14 +2482,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2483,14 +2483,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
index defb178d2594..114ed89dbca2 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h
@@ -1,4 +1,4 @@
---- ui/views/controls/textfield/textfield.h.orig	2024-04-19 13:02:56 UTC
+--- ui/views/controls/textfield/textfield.h.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/controls/textfield/textfield.h
 @@ -47,7 +47,7 @@
  #include "ui/views/view_observer.h"
@@ -9,7 +9,7 @@
  #include <vector>
  #endif
  
-@@ -461,7 +461,7 @@ class VIEWS_EXPORT Textfield : public View,
+@@ -462,7 +462,7 @@ class VIEWS_EXPORT Textfield : public View,
    // Set whether the text should be used to improve typing suggestions.
    void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
  
diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
index 5514fd7acff4..98a0706a53c9 100644
--- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,8 +1,8 @@
---- ui/views/corewm/tooltip_aura.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/corewm/tooltip_aura.cc
 @@ -36,7 +36,7 @@ namespace {
  bool CanUseTranslucentTooltipWidget() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
index 080c684d70fc..353a480d2c9c 100644
--- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc
+++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc
@@ -1,17 +1,17 @@
---- ui/views/focus/focus_manager.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/views/focus/focus_manager.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/focus/focus_manager.cc
-@@ -579,7 +579,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -582,7 +582,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
    // Processing an accelerator can delete things. Because we
    // need these objects afterwards on Linux, save widget_ as weak pointer and
    // save the close_on_deactivate property value of widget_delegate in a
-@@ -596,7 +596,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -599,7 +599,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
index 0f0d27f9930a..3dfb77bbaeb5 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2024-03-22 08:19:40 UTC
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
-@@ -196,7 +196,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
+@@ -200,7 +200,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
    return selected_operation_;
  }
  
diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index 1cfef206e7d8..10137093ce0f 100644
--- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
  #include "ui/wm/core/window_util.h"
  #include "ui/wm/public/window_move_client.h"
  
@@ -9,16 +9,7 @@
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -272,7 +272,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
-   if (params.type == Widget::InitParams::TYPE_WINDOW)
-     GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
- 
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-   const bool requires_accelerated_widget = params.requires_accelerated_widget;
- #else
-   const bool requires_accelerated_widget = false;
-@@ -356,7 +356,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -358,7 +358,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -27,7 +18,7 @@
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1117,7 +1117,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
+@@ -1142,7 +1142,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/chromium/files/patch-ui_views_widget_root__view.cc b/www/chromium/files/patch-ui_views_widget_root__view.cc
index ee65b9522e37..5cb75c76c49d 100644
--- a/www/chromium/files/patch-ui_views_widget_root__view.cc
+++ b/www/chromium/files/patch-ui_views_widget_root__view.cc
@@ -1,4 +1,4 @@
---- ui/views/widget/root_view.cc.orig	2024-02-23 21:04:38 UTC
+--- ui/views/widget/root_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/widget/root_view.cc
 @@ -127,7 +127,7 @@ class AnnounceTextView : public View {
  #if BUILDFLAG(IS_CHROMEOS)
@@ -6,6 +6,6 @@
      node_data->role = ax::mojom::Role::kStaticText;
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     // TODO(crbug.com/1024898): Use live regions (do not use alerts).
+     // TODO(crbug.com/40658933): Use live regions (do not use alerts).
      // May require setting kLiveStatus, kContainerLiveStatus to "polite".
      node_data->role = ax::mojom::Role::kAlert;
diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc
index b7fb4023c802..045c62f1cf0e 100644
--- a/www/chromium/files/patch-ui_views_widget_widget.cc
+++ b/www/chromium/files/patch-ui_views_widget_widget.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/widget.cc.orig	2024-04-19 13:02:56 UTC
+--- ui/views/widget/widget.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/widget/widget.cc
-@@ -54,7 +54,7 @@
+@@ -57,7 +57,7 @@
  #include "ui/views/window/custom_frame_view.h"
  #include "ui/views/window/dialog_delegate.h"
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -2106,7 +2106,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2152,7 +2152,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
    if (parent_)
      return parent_->GetNativeTheme();
  
diff --git a/www/chromium/files/patch-ui_views_widget_widget.h b/www/chromium/files/patch-ui_views_widget_widget.h
deleted file mode 100644
index 194c34c4af5d..000000000000
--- a/www/chromium/files/patch-ui_views_widget_widget.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/widget/widget.h.orig	2024-04-19 13:02:56 UTC
-+++ ui/views/widget/widget.h
-@@ -427,7 +427,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
-     // If set, the widget was created in headless mode.
-     bool headless_mode = false;
- 
--#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
-     // Indicates whether the desktop native widget is required for the widget.
-     // This may enforce changing the type of the underlying platform window.
-     // See crbug.com/1280332
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
index afa50f7176c3..b275ec9823e5 100644
--- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -1,8 +1,8 @@
---- ui/views/window/custom_frame_view.cc.orig	2022-10-24 13:33:33 UTC
+--- ui/views/window/custom_frame_view.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/window/custom_frame_view.cc
-@@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const {
+@@ -267,7 +267,7 @@ int CustomFrameView::CaptionButtonY() const {
    // drawn flush with the screen edge, they still obey Fitts' Law.
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // TODO(crbug.com/40118868): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
index 85484b6dbb1e..bb1f1c3ed063 100644
--- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- ui/views/window/dialog_delegate.cc.orig	2023-12-10 06:10:27 UTC
+--- ui/views/window/dialog_delegate.cc.orig	2024-06-17 12:56:06 UTC
 +++ ui/views/window/dialog_delegate.cc
-@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -104,7 +104,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn
index ae13e3cd9bfd..95e6314ebd70 100644
--- a/www/chromium/files/patch-v8_BUILD.gn
+++ b/www/chromium/files/patch-v8_BUILD.gn
@@ -1,21 +1,28 @@
---- v8/BUILD.gn.orig	2024-04-19 13:02:56 UTC
+--- v8/BUILD.gn.orig	2024-06-17 12:56:06 UTC
 +++ v8/BUILD.gn
-@@ -1455,6 +1455,14 @@ config("toolchain") {
-   } else if (target_os == "chromeos") {
-     defines += [ "V8_HAVE_TARGET_OS" ]
-     defines += [ "V8_TARGET_OS_CHROMEOS" ]
-+  } else if (target_os == "openbsd") {
-+    defines += [ "V8_HAVE_TARGET_OS" ]
-+    defines += [ "V8_TARGET_OS_OPENBSD" ]
-+    defines += [ "V8_TARGET_OS_BSD" ]
-+  } else if (target_os == "freebsd") {
-+    defines += [ "V8_HAVE_TARGET_OS" ]
-+    defines += [ "V8_TARGET_OS_FREEBSD" ]
-+    defines += [ "V8_TARGET_OS_BSD" ]
-   }
+@@ -890,6 +890,8 @@ external_v8_defines = [
+   "V8_TARGET_OS_MACOS",
+   "V8_TARGET_OS_WIN",
+   "V8_TARGET_OS_CHROMEOS",
++  "V8_TARGET_OS_OPENBSD",
++  "V8_TARGET_OS_FREEBSD",
+ ]
+ 
+ enabled_external_v8_defines = []
+@@ -962,6 +964,12 @@ if (target_os == "android") {
+ } else if (target_os == "chromeos") {
+   enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
+   enabled_external_v8_defines += [ "V8_TARGET_OS_CHROMEOS" ]
++} else if (target_os == "openbsd") {
++  enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
++  enabled_external_v8_defines += [ "V8_TARGET_OS_OPENBSD" ]
++} else if (target_os == "freebsd") {
++  enabled_external_v8_defines += [ "V8_HAVE_TARGET_OS" ]
++  enabled_external_v8_defines += [ "V8_TARGET_OS_FREEBSD" ]
+ }
  
-   # TODO(infra): Support v8_enable_prof on Windows.
-@@ -2442,6 +2450,12 @@ template("run_mksnapshot") {
+ disabled_external_v8_defines = external_v8_defines - enabled_external_v8_defines
+@@ -2458,6 +2466,12 @@ template("run_mksnapshot") {
        if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
          args += [ "--reorder-builtins" ]
        }
@@ -28,7 +35,7 @@
      }
  
      # This is needed to distinguish between generating code for the simulator
-@@ -6448,7 +6462,7 @@ v8_component("v8_libbase") {
+@@ -6495,7 +6509,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -37,7 +44,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -6459,6 +6473,18 @@ v8_component("v8_libbase") {
+@@ -6506,6 +6520,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/chromium/files/patch-v8_include_v8-internal.h b/www/chromium/files/patch-v8_include_v8-internal.h
index ced45871e0d6..babae8e00f4b 100644
--- a/www/chromium/files/patch-v8_include_v8-internal.h
+++ b/www/chromium/files/patch-v8_include_v8-internal.h
@@ -1,6 +1,6 @@
---- v8/include/v8-internal.h.orig	2024-02-23 21:04:38 UTC
+--- v8/include/v8-internal.h.orig	2024-06-17 12:56:06 UTC
 +++ v8/include/v8-internal.h
-@@ -175,7 +175,7 @@ using SandboxedPointer_t = Address;
+@@ -185,7 +185,7 @@ using SandboxedPointer_t = Address;
  #ifdef V8_ENABLE_SANDBOX
  
  // Size of the sandbox, excluding the guard regions surrounding it.
diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc
index 6b75eb042528..846e86d5cb98 100644
--- a/www/chromium/files/patch-v8_src_api_api.cc
+++ b/www/chromium/files/patch-v8_src_api_api.cc
@@ -1,4 +1,4 @@
---- v8/src/api/api.cc.orig	2024-04-19 13:02:56 UTC
+--- v8/src/api/api.cc.orig	2024-06-17 12:56:06 UTC
 +++ v8/src/api/api.cc
 @@ -144,7 +144,7 @@
  #include "src/wasm/wasm-serialization.h"
@@ -9,7 +9,7 @@
  #include <signal.h>
  #include <unistd.h>
  
-@@ -6396,7 +6396,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6434,7 +6434,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
index 42359ce002dc..ee1371482d73 100644
--- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig	2024-03-22 08:19:40 UTC
+--- v8/src/base/platform/platform-posix.cc.orig	2024-05-21 18:07:39 UTC
 +++ v8/src/base/platform/platform-posix.cc
 @@ -54,7 +54,7 @@
  #if V8_OS_DARWIN
@@ -18,7 +18,7 @@
  #define MAP_ANONYMOUS MAP_ANON
  #endif
  
-@@ -303,8 +303,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
+@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
    }
  }
  
@@ -34,7 +34,7 @@
    uintptr_t raw_addr;
    {
      MutexGuard guard(rng_mutex.Pointer());
-@@ -399,6 +406,7 @@ void* OS::GetRandomMmapAddr() {
+@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() {
  #endif
    return reinterpret_cast<void*>(raw_addr);
  }
diff --git a/www/chromium/files/patch-v8_src_execution_isolate.cc b/www/chromium/files/patch-v8_src_execution_isolate.cc
index 281fb94c55ea..ceb1b1cb0974 100644
--- a/www/chromium/files/patch-v8_src_execution_isolate.cc
+++ b/www/chromium/files/patch-v8_src_execution_isolate.cc
@@ -1,6 +1,6 @@
---- v8/src/execution/isolate.cc.orig	2024-04-19 13:02:56 UTC
+--- v8/src/execution/isolate.cc.orig	2024-06-17 12:56:06 UTC
 +++ v8/src/execution/isolate.cc
-@@ -153,6 +153,10 @@
+@@ -157,6 +157,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -11,7 +11,7 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -4232,6 +4236,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -4535,6 +4539,13 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
diff --git a/www/chromium/files/patch-v8_src_flags_flags.cc b/www/chromium/files/patch-v8_src_flags_flags.cc
index 9dbc8dda71fd..4d78cf5d0622 100644
--- a/www/chromium/files/patch-v8_src_flags_flags.cc
+++ b/www/chromium/files/patch-v8_src_flags_flags.cc
@@ -1,4 +1,4 @@
---- v8/src/flags/flags.cc.orig	2024-04-19 13:02:56 UTC
+--- v8/src/flags/flags.cc.orig	2024-05-21 18:07:39 UTC
 +++ v8/src/flags/flags.cc
 @@ -15,6 +15,10 @@
  #include <set>
@@ -23,7 +23,7 @@
  
  // {v8_flags} needs to be aligned to a memory page, and the size needs to be a
  // multiple of a page size. This is required for memory-protection of the memory
-@@ -789,6 +797,10 @@ void FlagList::FreezeFlags() {
+@@ -807,6 +815,10 @@ void FlagList::FreezeFlags() {
    // Note that for string flags we only protect the pointer itself, but not the
    // string storage. TODO(12887): Fix this.
    base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
diff --git a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc
index 860e5afb8cd8..dc42872b54ce 100644
--- a/www/chromium/files/patch-v8_src_sandbox_sandbox.cc
+++ b/www/chromium/files/patch-v8_src_sandbox_sandbox.cc
@@ -1,6 +1,6 @@
---- v8/src/sandbox/sandbox.cc.orig	2023-02-08 09:03:45 UTC
+--- v8/src/sandbox/sandbox.cc.orig	2024-06-17 12:56:06 UTC
 +++ v8/src/sandbox/sandbox.cc
-@@ -46,7 +46,7 @@ static Address DetermineAddressSpaceLimit() {
+@@ -47,7 +47,7 @@ static Address DetermineAddressSpaceLimit() {
    }
  #endif  // V8_TARGET_ARCH_X64
  
diff --git a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
index 19a96c42378d..fa6b43c1bd27 100644
--- a/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
+++ b/www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32-inl.h
@@ -1,6 +1,6 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2024-04-19 13:02:56 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h.orig	2024-06-17 12:56:06 UTC
 +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32-inl.h
-@@ -510,7 +510,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -492,7 +492,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -587,7 +587,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -569,7 +569,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -663,7 +663,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -645,7 +645,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -681,7 +681,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -663,7 +663,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
    DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max());
-@@ -751,7 +751,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -733,7 +733,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -819,7 +819,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -801,7 +801,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -934,7 +934,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -916,7 +916,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -1030,7 +1030,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1044,7 +1044,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1057,7 +1057,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1071,7 +1071,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1085,7 +1085,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1099,7 +1099,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1114,7 +1114,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 5cea0e799185..61212bffdcc3 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -128,6 +128,9 @@ bin/chrome
 %%DATADIR%%/product_logo_48.png
 %%DATADIR%%/protoc
 %%DATADIR%%/resources.pak
+%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper/content.js
+%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper/gdocs_script.js
+%%DATADIR%%/resources/accessibility/reading_mode_gdocs_helper_manifest.json
 %%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd
 %%DATADIR%%/resources/inspector_overlay/main.js
 %%DATADIR%%/snapshot_blob.bin
diff --git a/www/colly/Makefile b/www/colly/Makefile
index ef86cc761725..987d82711abc 100644
--- a/www/colly/Makefile
+++ b/www/colly/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	colly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/devd/Makefile b/www/devd/Makefile
index 56d92bbcc248..16f120f27dc2 100644
--- a/www/devd/Makefile
+++ b/www/devd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	devd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9
-PORTREVISION=	22
+PORTREVISION=	24
 CATEGORIES=	www devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/eden/Makefile b/www/eden/Makefile
index 190ce2397ff4..e0f4df5591b2 100644
--- a/www/eden/Makefile
+++ b/www/eden/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	eden
 PORTVERSION=	0.7.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	21
+PORTREVISION=	23
 CATEGORIES=	www
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/www/fabio/Makefile b/www/fabio/Makefile
index 8ae0cc07c4ea..d74615823f2d 100644
--- a/www/fabio/Makefile
+++ b/www/fabio/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	fabio
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	stl@ossuary.net
diff --git a/www/filtron/Makefile b/www/filtron/Makefile
index 074827b3b982..de809aab0907 100644
--- a/www/filtron/Makefile
+++ b/www/filtron/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	filtron
 PORTVERSION=	g20180218
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index d846380ae544..5383b1d772b7 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	firefox
-DISTVERSION=	115.10.0
+DISTVERSION=	115.13.0
 PORTEPOCH=	1
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
+		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
 PKGNAMESUFFIX=	-esr
 DISTFILES=	${DISTNAME}esr.source${EXTRACT_SUFX}
 
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 4bf4e78079dc..c631787e5ee0 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712602749
-SHA256 (firefox-115.10.0esr.source.tar.xz) = 0afd3c733d95f7047f258d1a9768d06d856217fe736d85bfb370db9dd926eef2
-SIZE (firefox-115.10.0esr.source.tar.xz) = 507826764
+TIMESTAMP = 1719912680
+SHA256 (firefox-115.13.0esr.source.tar.xz) = f3d15a55b35db66acaa6353b70251adb98a5de216981cd0dc43ec4c9f7f97a60
+SIZE (firefox-115.13.0esr.source.tar.xz) = 507730844
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 49bc1ad9acfb..14a897f494ad 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	firefox
-DISTVERSION=	125.0.3
+DISTVERSION=	128.0
 PORTEPOCH=	2
 CATEGORIES=	www wayland
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -11,10 +11,10 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 WWW=		https://www.mozilla.com/firefox
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.99:security/nss \
+		nss>=3.101:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
-		harfbuzz>=8.3.0:print/harfbuzz \
+		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
 		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index bca7ae69e02c..b85b5adf2a9b 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714250399
-SHA256 (firefox-125.0.3.source.tar.xz) = 461c66b85e4a0345dcce422d3b66212489f3cca8f22a9a8f43a07a0c98bd5616
-SIZE (firefox-125.0.3.source.tar.xz) = 551590872
+TIMESTAMP = 1719875233
+SHA256 (firefox-128.0.source.tar.xz) = 358b2f67c6c96c2a857588e1678e10bf233d5c324ff845055f2da043d1bf59ca
+SIZE (firefox-128.0.source.tar.xz) = 561251876
diff --git a/www/firefox/files/patch-bug1890593 b/www/firefox/files/patch-bug1890593
deleted file mode 100644
index 75a4da270e1a..000000000000
--- a/www/firefox/files/patch-bug1890593
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 9ef1582be54a8ff301336b397130e4d313fa3371
-Author: Christoph Moench-Tegeder <cmt@burggraben.net>
-Date:   Tue Apr 9 21:27:21 2024 +0200
-
-    bug 1890593 - GetSystemWPADSetting for libproxy-enabled builds
-    
-    In #621429 a call to nsUnixSystemProxySettings::GetSystemWPADSetting()
-    was added, but that function is not available for builds with
-    MOZ_ENABLE_LIBPROXY. The funtion is trivial enough to just
-    copy it across - else there'd more boilerplate than actual code.
-
-diff --git toolkit/system/unixproxy/nsLibProxySettings.cpp toolkit/system/unixproxy/nsLibProxySettings.cpp
-index 4f6f43fb76e9..f2c782455426 100644
---- toolkit/system/unixproxy/nsLibProxySettings.cpp
-+++ toolkit/system/unixproxy/nsLibProxySettings.cpp
-@@ -99,6 +99,12 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
-   return NS_OK;
- }
- 
-+NS_IMETHODIMP
-+nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) {
-+  *aSystemWPADSetting = false;
-+  return NS_OK;
-+}
-+
- NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
-   return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>();
- }
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 95bd181256e8..2ee46579d43d 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -64,7 +64,7 @@ index 000000000000..24e8d7a03274
 +# Match bundled graphite2 configuration
 +AllowCompilerWarnings()
 +
-+FINAL_LIBRARY = 'gkmedias'
++FINAL_LIBRARY = 'xul'
 diff --git gfx/harfbuzz/README-mozilla.fbsd gfx/harfbuzz/README-mozilla.fbsd
 new file mode 100644
 index 000000000000..2a10eb1e2b42
diff --git a/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h b/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
index 656127071a78..4bfe48f0592c 100644
--- a/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
+++ b/www/firefox/files/patch-gfx_skia_skia_src_base_SkEndian.h
@@ -1,11 +1,13 @@
---- gfx/skia/skia/src/base/SkEndian.h.orig	2023-06-16 01:32:16.999830000 +0200
-+++ gfx/skia/skia/src/base/SkEndian.h	2023-06-16 01:32:41.701673000 +0200
-@@ -131,7 +131,7 @@
-     #define SkTEndian_SwapLE64(n)    (n)
- #else   // SK_CPU_BENDIAN
-     #define SkEndian_SwapBE16(n)    (n)
--    #define SkEndian_SwapBE32(n)    (n)
-+    #define SkEndian_SwapBE32(n)    uint32_t(n)
-     #define SkEndian_SwapBE64(n)    (n)
-     #define SkEndian_SwapLE16(n)    SkEndianSwap16(n)
-     #define SkEndian_SwapLE32(n)    SkEndianSwap32(n)
+diff --git gfx/skia/skia/src/base/SkEndian.h gfx/skia/skia/src/base/SkEndian.h
+index d015f8bff2bf..cc390a53f30c 100644
+--- gfx/skia/skia/src/base/SkEndian.h
++++ gfx/skia/skia/src/base/SkEndian.h
+@@ -140,7 +140,7 @@ static inline void SkEndianSwap64s(uint64_t array[], int count) {
+     #define SkEndian_SwapLE64(n)    SkEndianSwap64(n)
+ 
+     #define SkTEndian_SwapBE16(n)    (n)
+-    #define SkTEndian_SwapBE32(n)    (n)
++    #define SkTEndian_SwapBE32(n)    uint32_t(n)
+     #define SkTEndian_SwapBE64(n)    (n)
+     #define SkTEndian_SwapLE16(n)    SkTEndianSwap16<n>::value
+     #define SkTEndian_SwapLE32(n)    SkTEndianSwap32<n>::value
diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
index 0cee5dac92a1..e23f0eb4f904 100644
--- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
+++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
@@ -4,13 +4,17 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get
         uint32_t hwcaps = getauxval(AT_HWCAP);
                           ^
 
---- gfx/skia/skia/src/core/SkCpu.cpp.orig	2020-02-07 22:13:22 UTC
+diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp
+index cdac7db2be2c..4da2ee4bd4b4 100644
+--- gfx/skia/skia/src/core/SkCpu.cpp
 +++ gfx/skia/skia/src/core/SkCpu.cpp
-@@ -72,6 +72,23 @@
-         return features;
-     }
+@@ -81,6 +81,22 @@
+         if (hwcap & HWCAP_LOONGARCH_LSX)  { features |= SkCpu::LOONGARCH_SX; }
+         if (hwcap & HWCAP_LOONGARCH_LASX) { features |= SkCpu::LOONGARCH_ASX; }
  
-+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
++        return features;
++    }
++#elif
 +    #include <machine/armreg.h>
 +    #ifndef ID_AA64ISAR0_CRC32_VAL
 +    #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
@@ -24,9 +28,6 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get
 +        if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
 +            features |= SkCpu::CRC32;
 +        }
-+        return features;
-+    }
-+
- #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
-     #include <sys/auxv.h>
- 
+         return features;
+     }
+ #else
diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h b/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
index 64e279cf29f0..05cf110b1192 100644
--- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
+++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkRasterPipeline.h
@@ -1,11 +1,13 @@
---- gfx/skia/skia/src/core/SkRasterPipeline.h.orig	2023-06-10 14:20:18.155477000 +0200
-+++ gfx/skia/skia/src/core/SkRasterPipeline.h	2023-06-10 14:20:30.760915000 +0200
-@@ -24,7 +24,7 @@
- struct SkImageInfo;
+diff --git gfx/skia/skia/src/core/SkRasterPipeline.h gfx/skia/skia/src/core/SkRasterPipeline.h
+index 2475ea0d398d..67967483656d 100644
+--- gfx/skia/skia/src/core/SkRasterPipeline.h
++++ gfx/skia/skia/src/core/SkRasterPipeline.h
+@@ -27,7 +27,7 @@ struct SkImageInfo;
  struct skcms_TransferFunction;
  
--#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32)
-+#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__)
+ #if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && \
+-        !defined(SK_CPU_LOONGARCH)
++        !defined(SK_CPU_LOONGARCH) && !defined(__powerpc__)
      #define SK_HAS_MUSTTAIL 1
  #else
      #define SK_HAS_MUSTTAIL 0
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index caec639c4c69..b59060f6acdc 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,10 +1,10 @@
-commit 01127134cdeb090ebf87ffdf452c586ca3a3d838
+commit 39df5a98686dce37f31f3741ec4f7198be4251c9
 Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
 
-    regenerate FreeBSD libwebrtc patch for Firefox 125
+    regenerate FreeBSD libwebrtc patch for Firefox 128
 
 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index b0671b5d4adb..642f867db664 100644
+index 2dbd5881583e..332ca04819ee 100644
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 +++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27,7 +27,7 @@ index b0671b5d4adb..642f867db664 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -215,7 +215,7 @@ index b0671b5d4adb..642f867db664 100644
  
  Library("resource_adaptation_api_gn")
 diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index e090bcdfc55c..935f8560bd05 100644
+index df2c86715cac..6c4e403f6dc1 100644
 --- third_party/libwebrtc/api/array_view_gn/moz.build
 +++ third_party/libwebrtc/api/array_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -238,7 +238,7 @@ index e090bcdfc55c..935f8560bd05 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -406,7 +406,7 @@ index e090bcdfc55c..935f8560bd05 100644
 -
  Library("array_view_gn")
 diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index 6a2d55b776db..8512989cc3ea 100644
+index 4d678a1de7c9..e163a7c1f440 100644
 --- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -429,7 +429,7 @@ index 6a2d55b776db..8512989cc3ea 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -605,7 +605,7 @@ index 6a2d55b776db..8512989cc3ea 100644
 -
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index ee6df1d36f53..d217e83eb683 100644
+index cbd6f2e6f0d5..3bfa575693b2 100644
 --- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -628,7 +628,7 @@ index ee6df1d36f53..d217e83eb683 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -816,7 +816,7 @@ index ee6df1d36f53..d217e83eb683 100644
  
  Library("aec3_config_gn")
 diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 0c3ce503ad9e..4e9cb792fd2e 100644
+index 746585483f96..33ea9b79d47b 100644
 --- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -840,7 +840,7 @@ index 0c3ce503ad9e..4e9cb792fd2e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -1039,7 +1039,7 @@ index 0c3ce503ad9e..4e9cb792fd2e 100644
  
  Library("aec3_factory_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 1317ad89b0d7..2fecbfa52bb7 100644
+index e2561db08f06..59da7761dd35 100644
 --- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1062,7 +1062,7 @@ index 1317ad89b0d7..2fecbfa52bb7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -1257,7 +1257,7 @@ index 1317ad89b0d7..2fecbfa52bb7 100644
  
  Library("audio_frame_api_gn")
 diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index e04682bee3fa..cdd13155790d 100644
+index 7dd1c4b91100..960b60c3311c 100644
 --- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1280,7 +1280,7 @@ index e04682bee3fa..cdd13155790d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -1444,7 +1444,7 @@ index e04682bee3fa..cdd13155790d 100644
 -
  Library("audio_frame_processor_gn")
 diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index c74637daa356..d4a66ce81d9b 100644
+index 36d43783a3e7..fd0111ba0ffd 100644
 --- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1467,7 +1467,7 @@ index c74637daa356..d4a66ce81d9b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -1642,7 +1642,7 @@ index c74637daa356..d4a66ce81d9b 100644
 -
  Library("audio_mixer_api_gn")
 diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index eb9e4ec6697b..08b8d7df91dd 100644
+index 06f43e765114..6c06b87bcfe3 100644
 --- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 +++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1665,7 +1665,7 @@ index eb9e4ec6697b..08b8d7df91dd 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -1833,7 +1833,7 @@ index eb9e4ec6697b..08b8d7df91dd 100644
 -
  Library("echo_control_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index 9dcc9826de61..0973b9bab0b3 100644
+index 5811f4d9321b..0f11017e2f6c 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -1856,7 +1856,7 @@ index 9dcc9826de61..0973b9bab0b3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -2051,7 +2051,7 @@ index 9dcc9826de61..0973b9bab0b3 100644
  
  Library("audio_decoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index b5c7fe8b37a8..8e851ee1eac0 100644
+index f4fb06ef3f09..90113fd85d92 100644
 --- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2074,7 +2074,7 @@ index b5c7fe8b37a8..8e851ee1eac0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -2269,7 +2269,7 @@ index b5c7fe8b37a8..8e851ee1eac0 100644
  
  Library("audio_encoder_L16_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 8eaebf875c3c..acac009b8893 100644
+index faed7e9b0f61..84835da8965c 100644
 --- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2292,7 +2292,7 @@ index 8eaebf875c3c..acac009b8893 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -2487,7 +2487,7 @@ index 8eaebf875c3c..acac009b8893 100644
  
  Library("audio_codecs_api_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index 3ce5ad2d5d21..edfab7737136 100644
+index 5de9c2960769..a0d91297b550 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
 @@ -12,13 +12,23 @@ AllowCompilerWarnings()
@@ -2512,7 +2512,7 @@ index 3ce5ad2d5d21..edfab7737136 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -2711,7 +2711,7 @@ index 3ce5ad2d5d21..edfab7737136 100644
  
  Library("builtin_audio_decoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index e8acc1186e04..dd0e328737c6 100644
+index 5ff7dfd0ffd4..334acbe7d342 100644
 --- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
 @@ -12,13 +12,23 @@ AllowCompilerWarnings()
@@ -2736,7 +2736,7 @@ index e8acc1186e04..dd0e328737c6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -2935,7 +2935,7 @@ index e8acc1186e04..dd0e328737c6 100644
  
  Library("builtin_audio_encoder_factory_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index 2dbe0fd6bce3..a29327a65377 100644
+index e1c8fa6a08bc..7799b83b91bb 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -2958,7 +2958,7 @@ index 2dbe0fd6bce3..a29327a65377 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -3153,7 +3153,7 @@ index 2dbe0fd6bce3..a29327a65377 100644
  
  Library("audio_decoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index a1b1f8e9fccb..68424c136524 100644
+index 39513d15b310..aff5480ad0b3 100644
 --- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3176,7 +3176,7 @@ index a1b1f8e9fccb..68424c136524 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -3371,7 +3371,7 @@ index a1b1f8e9fccb..68424c136524 100644
  
  Library("audio_encoder_g711_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index 838977ba1042..4577862a247d 100644
+index cf9228dcab3c..7eb3130288e3 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3394,7 +3394,7 @@ index 838977ba1042..4577862a247d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -3589,7 +3589,7 @@ index 838977ba1042..4577862a247d 100644
  
  Library("audio_decoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 2b1c0d220c3e..cdb668cf70bc 100644
+index 3b1a814ac7b2..048ddee2cbdb 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3612,7 +3612,7 @@ index 2b1c0d220c3e..cdb668cf70bc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -3787,7 +3787,7 @@ index 2b1c0d220c3e..cdb668cf70bc 100644
 -
  Library("audio_encoder_g722_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 367caa077f2d..3a983cc69d40 100644
+index 57bdfeaf74c0..f04086fa4375 100644
 --- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -3810,7 +3810,7 @@ index 367caa077f2d..3a983cc69d40 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -4005,7 +4005,7 @@ index 367caa077f2d..3a983cc69d40 100644
  
  Library("audio_encoder_g722_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
-index b8bf808d3d73..af4f54885d1e 100644
+index ae2d4f5dc9b4..8d5eb0cadc34 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_decoder_ilbc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4028,7 +4028,7 @@ index b8bf808d3d73..af4f54885d1e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -4227,7 +4227,7 @@ index b8bf808d3d73..af4f54885d1e 100644
  
  Library("audio_decoder_ilbc_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
-index 909cc8c26f96..9e4afff2cb93 100644
+index 2ec1c97ea240..ee5d451c740d 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4250,7 +4250,7 @@ index 909cc8c26f96..9e4afff2cb93 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -4414,7 +4414,7 @@ index 909cc8c26f96..9e4afff2cb93 100644
 -
  Library("audio_encoder_ilbc_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
-index 08b426b9abd7..b52f29085529 100644
+index ff9d947abb85..cdb5435b0bf3 100644
 --- third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4437,7 +4437,7 @@ index 08b426b9abd7..b52f29085529 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -4636,7 +4636,7 @@ index 08b426b9abd7..b52f29085529 100644
  
  Library("audio_encoder_ilbc_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index c36b4324e4b3..19274344f17c 100644
+index 06926f2550c6..3bb8979209c8 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4659,7 +4659,7 @@ index c36b4324e4b3..19274344f17c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -4854,7 +4854,7 @@ index c36b4324e4b3..19274344f17c 100644
  
  Library("audio_decoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index a9896dd203d6..e666d73db50a 100644
+index a40417692306..11dc887d7856 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -4877,7 +4877,7 @@ index a9896dd203d6..e666d73db50a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -5052,7 +5052,7 @@ index a9896dd203d6..e666d73db50a 100644
 -
  Library("audio_decoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index 7c7ed25cbc12..2a0eaf5162ae 100644
+index a52b290d08bc..191d27589e54 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5075,7 +5075,7 @@ index 7c7ed25cbc12..2a0eaf5162ae 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -5274,7 +5274,7 @@ index 7c7ed25cbc12..2a0eaf5162ae 100644
  
  Library("audio_decoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index 7a8b6dc2e652..a1e0aebdd00b 100644
+index 1847aa9f2334..b1a86854c6cd 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5297,7 +5297,7 @@ index 7a8b6dc2e652..a1e0aebdd00b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -5492,7 +5492,7 @@ index 7a8b6dc2e652..a1e0aebdd00b 100644
  
  Library("audio_encoder_multiopus_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index f68dce0d9dee..1814a45bd0b9 100644
+index b4ed20ad8589..220221aeeed4 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -5516,7 +5516,7 @@ index f68dce0d9dee..1814a45bd0b9 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,174 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -5700,7 +5700,7 @@ index f68dce0d9dee..1814a45bd0b9 100644
  
  Library("audio_encoder_opus_config_gn")
 diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index f44d8836ef29..3c36a8e40946 100644
+index dc73c7abc386..b76dd0fcc777 100644
 --- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 +++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5723,7 +5723,7 @@ index f44d8836ef29..3c36a8e40946 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -5922,7 +5922,7 @@ index f44d8836ef29..3c36a8e40946 100644
  
  Library("audio_encoder_opus_gn")
 diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index 5e169a3ffe4c..dee079f27798 100644
+index 974d1dbdf2c7..90ca4ab68ba8 100644
 --- third_party/libwebrtc/api/audio_options_api_gn/moz.build
 +++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -5945,7 +5945,7 @@ index 5e169a3ffe4c..dee079f27798 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -6133,7 +6133,7 @@ index 5e169a3ffe4c..dee079f27798 100644
  
  Library("audio_options_api_gn")
 diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index 530662eb2f31..1fb50aa9e1e4 100644
+index 500eff54bbfd..a1f84da5a485 100644
 --- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6156,7 +6156,7 @@ index 530662eb2f31..1fb50aa9e1e4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -6324,7 +6324,7 @@ index 530662eb2f31..1fb50aa9e1e4 100644
 -
  Library("bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 5656999ecb9a..93c7cd55cf2e 100644
+index 372f0888fbba..86c73a9fd726 100644
 --- third_party/libwebrtc/api/call_api_gn/moz.build
 +++ third_party/libwebrtc/api/call_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -6347,7 +6347,7 @@ index 5656999ecb9a..93c7cd55cf2e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -6510,10 +6510,10 @@ index 5656999ecb9a..93c7cd55cf2e 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("call_api_gn")
-diff --git third_party/libwebrtc/api/callfactory_api_gn/moz.build third_party/libwebrtc/api/callfactory_api_gn/moz.build
-index 157a34ec8e62..d9e58de1c43a 100644
---- third_party/libwebrtc/api/callfactory_api_gn/moz.build
-+++ third_party/libwebrtc/api/callfactory_api_gn/moz.build
+diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+index 2a9b6d96dd75..c032ee4fe916 100644
+--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
++++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -6534,9 +6534,9 @@ index 157a34ec8e62..d9e58de1c43a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6584,10 +6584,6 @@ index 157a34ec8e62..d9e58de1c43a 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -6628,13 +6624,6 @@ index 157a34ec8e62..d9e58de1c43a 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
--
--    OS_LIBS += [
--        "crypt32",
--        "iphlpapi",
--        "secur32",
--        "winmm"
--    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
@@ -6660,7 +6649,7 @@ index 157a34ec8e62..d9e58de1c43a 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -164,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
  
      DEFINES["WEBRTC_ENABLE_AVX2"] = True
  
@@ -6711,11 +6700,11 @@ index 157a34ec8e62..d9e58de1c43a 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("callfactory_api_gn")
-diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index 4147b3868be0..1f0c3440b172 100644
---- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+ Library("frame_decryptor_interface_gn")
+diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+index f1716e6b6267..7d3b6bae0048 100644
+--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
++++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -6736,7 +6725,7 @@ index 4147b3868be0..1f0c3440b172 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -6902,11 +6891,11 @@ index 4147b3868be0..1f0c3440b172 100644
 -
 -    DEFINES["_GNU_SOURCE"] = True
 -
- Library("frame_decryptor_interface_gn")
-diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index 93034ef6e23e..2f5ff0067bee 100644
---- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+ Library("frame_encryptor_interface_gn")
+diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
+index fae93b139253..5726c9c835be 100644
+--- third_party/libwebrtc/api/crypto/options_gn/moz.build
++++ third_party/libwebrtc/api/crypto/options_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -6927,9 +6916,9 @@ index 93034ef6e23e..2f5ff0067bee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6948,10 +6937,6 @@ index 93034ef6e23e..2f5ff0067bee 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "log"
--    ]
--
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -7026,6 +7011,10 @@ index 93034ef6e23e..2f5ff0067bee 100644
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -7042,10 +7031,12 @@ index 93034ef6e23e..2f5ff0067bee 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
-@@ -153,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
- 
-     DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -7067,16 +7058,21 @@ index 93034ef6e23e..2f5ff0067bee 100644
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
 -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
-     DEFINES["USE_X11"] = "1"
- 
+-
+-    DEFINES["USE_X11"] = "1"
+-
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
 -
 -    OS_LIBS += [
 -        "unwind"
 -    ]
 -
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -7086,18 +7082,27 @@ index 93034ef6e23e..2f5ff0067bee 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
--
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
 -    DEFINES["_GNU_SOURCE"] = True
--
- Library("frame_encryptor_interface_gn")
-diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index 9b5cca4f8b98..33542ced4242 100644
---- third_party/libwebrtc/api/crypto/options_gn/moz.build
-+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("options_gn")
+diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+index 9388642ab5e6..2a4db566b430 100644
+--- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
++++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
  DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
  DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
@@ -7118,9 +7123,9 @@ index 9b5cca4f8b98..33542ced4242 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7139,6 +7144,10 @@ index 9b5cca4f8b98..33542ced4242 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -7164,6 +7173,10 @@ index 9b5cca4f8b98..33542ced4242 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    OS_LIBS += [
+-        "rt"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -7204,6 +7217,13 @@ index 9b5cca4f8b98..33542ced4242 100644
 -    DEFINES["_WIN32_WINNT"] = "0x0A00"
 -    DEFINES["_WINDOWS"] = True
 -    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
@@ -7300,9 +7320,9 @@ index 9b5cca4f8b98..33542ced4242 100644
 -    DEFINES["_GNU_SOURCE"] = True
 +    DEFINES["USE_X11"] = "1"
  
- Library("options_gn")
+ Library("environment_factory_gn")
 diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index e7105ff57383..b7d434e7f0e5 100644
+index 5b7b361ac342..b18f7c018485 100644
 --- third_party/libwebrtc/api/environment/environment_gn/moz.build
 +++ third_party/libwebrtc/api/environment/environment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7325,7 +7345,7 @@ index e7105ff57383..b7d434e7f0e5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -7489,7 +7509,7 @@ index e7105ff57383..b7d434e7f0e5 100644
 -
  Library("environment_gn")
 diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index 619ea937f07b..29117e092916 100644
+index 653eae8f233f..383f2f1c9661 100644
 --- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7512,7 +7532,7 @@ index 619ea937f07b..29117e092916 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -7680,7 +7700,7 @@ index 619ea937f07b..29117e092916 100644
 -
  Library("fec_controller_api_gn")
 diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 01ce20c5a613..bbfe2fc66a9b 100644
+index 76e121ec9f5e..544a531d83f1 100644
 --- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7703,7 +7723,7 @@ index 01ce20c5a613..bbfe2fc66a9b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -7898,7 +7918,7 @@ index 01ce20c5a613..bbfe2fc66a9b 100644
  
  Library("field_trials_registry_gn")
 diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 967e416aad11..41db496b2998 100644
+index a6ac64bf50c6..541f2359270f 100644
 --- third_party/libwebrtc/api/field_trials_view_gn/moz.build
 +++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -7921,7 +7941,7 @@ index 967e416aad11..41db496b2998 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -8085,7 +8105,7 @@ index 967e416aad11..41db496b2998 100644
 -
  Library("field_trials_view_gn")
 diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index ea4cac127680..42bd8a0ebee8 100644
+index 2ed19fd691d7..5a66e1d8aace 100644
 --- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 +++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8108,7 +8128,7 @@ index ea4cac127680..42bd8a0ebee8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -8283,7 +8303,7 @@ index ea4cac127680..42bd8a0ebee8 100644
 -
  Library("frame_transformer_interface_gn")
 diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index 980c9d9ca606..96dce96e8ab5 100644
+index feea8c2c0ba6..7c48aab74157 100644
 --- third_party/libwebrtc/api/function_view_gn/moz.build
 +++ third_party/libwebrtc/api/function_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8306,7 +8326,7 @@ index 980c9d9ca606..96dce96e8ab5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -8474,7 +8494,7 @@ index 980c9d9ca606..96dce96e8ab5 100644
 -
  Library("function_view_gn")
 diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index b3a3b0ee1b12..b71b016ae856 100644
+index 6729abedf9bd..314418594b0e 100644
 --- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8497,7 +8517,7 @@ index b3a3b0ee1b12..b71b016ae856 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -8661,7 +8681,7 @@ index b3a3b0ee1b12..b71b016ae856 100644
 -
  Library("jingle_logging_api_gn")
 diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index fbbb882ebf1f..a8d741a090d2 100644
+index f815d7da4e62..d8c0189951f6 100644
 --- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 +++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8684,7 +8704,7 @@ index fbbb882ebf1f..a8d741a090d2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -8848,7 +8868,7 @@ index fbbb882ebf1f..a8d741a090d2 100644
 -
  Library("jingle_peerconnection_api_gn")
 diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index dcdca04077c0..364fda084155 100644
+index 706b1d5026cc..673b106c6cea 100644
 --- third_party/libwebrtc/api/location_gn/moz.build
 +++ third_party/libwebrtc/api/location_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -8871,7 +8891,7 @@ index dcdca04077c0..364fda084155 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -9035,7 +9055,7 @@ index dcdca04077c0..364fda084155 100644
 -
  Library("location_gn")
 diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index f90e27491698..7ecc837f314f 100644
+index 6bedaf55cd03..6f4e516cb13f 100644
 --- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 +++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9058,7 +9078,7 @@ index f90e27491698..7ecc837f314f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -9222,7 +9242,7 @@ index f90e27491698..7ecc837f314f 100644
 -
  Library("make_ref_counted_gn")
 diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index 759c156fb76f..67560deca0bc 100644
+index 8cc4995908e8..4d4d0bbcdb02 100644
 --- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9245,7 +9265,7 @@ index 759c156fb76f..67560deca0bc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -9440,7 +9460,7 @@ index 759c156fb76f..67560deca0bc 100644
  
  Library("media_stream_interface_gn")
 diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index ede22e499888..a18489ff59f5 100644
+index 5ffa4ac6c78f..6eaccfb29fc6 100644
 --- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 +++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9463,7 +9483,7 @@ index ede22e499888..a18489ff59f5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -9631,7 +9651,7 @@ index ede22e499888..a18489ff59f5 100644
 -
  Library("metronome_gn")
 diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index 5d18a89d1945..9f85d1d43198 100644
+index 0486a791d10f..254ccec7ed2e 100644
 --- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9654,7 +9674,7 @@ index 5d18a89d1945..9f85d1d43198 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -9853,7 +9873,7 @@ index 5d18a89d1945..9f85d1d43198 100644
  
  Library("default_neteq_controller_factory_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index 7ed92b818331..45a550ec1872 100644
+index ec0207e6b81a..217b5be2076d 100644
 --- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -9876,7 +9896,7 @@ index 7ed92b818331..45a550ec1872 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -10075,7 +10095,7 @@ index 7ed92b818331..45a550ec1872 100644
  
  Library("neteq_api_gn")
 diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index c08d59e8acb0..568e7bbc811a 100644
+index 830a41cbcb2f..04fd38417177 100644
 --- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10098,7 +10118,7 @@ index c08d59e8acb0..568e7bbc811a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -10277,7 +10297,7 @@ index c08d59e8acb0..568e7bbc811a 100644
 -
  Library("neteq_controller_api_gn")
 diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index ef3938ecf2df..6b28cb62c9fc 100644
+index 4f4101599f07..3129a92d497c 100644
 --- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 +++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10300,7 +10320,7 @@ index ef3938ecf2df..6b28cb62c9fc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -10488,7 +10508,7 @@ index ef3938ecf2df..6b28cb62c9fc 100644
  
  Library("tick_timer_gn")
 diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 1cfd2c0837b6..900b054a1cb4 100644
+index 84ec63723306..ff25666ad5f9 100644
 --- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 +++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10511,7 +10531,7 @@ index 1cfd2c0837b6..900b054a1cb4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -10675,7 +10695,7 @@ index 1cfd2c0837b6..900b054a1cb4 100644
 -
  Library("network_state_predictor_api_gn")
 diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index 5cac655d9009..4d79158262ef 100644
+index e90b551e4d69..d402c9d495af 100644
 --- third_party/libwebrtc/api/priority_gn/moz.build
 +++ third_party/libwebrtc/api/priority_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10698,7 +10718,7 @@ index 5cac655d9009..4d79158262ef 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -10862,7 +10882,7 @@ index 5cac655d9009..4d79158262ef 100644
 -
  Library("priority_gn")
 diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index 0fcde97e6b0f..b37e89e4fcab 100644
+index b5ded03ae3a4..2a36041b5e46 100644
 --- third_party/libwebrtc/api/ref_count_gn/moz.build
 +++ third_party/libwebrtc/api/ref_count_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -10885,7 +10905,7 @@ index 0fcde97e6b0f..b37e89e4fcab 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -11049,7 +11069,7 @@ index 0fcde97e6b0f..b37e89e4fcab 100644
 -
  Library("ref_count_gn")
 diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 96c04d125890..e7c234797960 100644
+index 42e693bf022a..e2d783b7b812 100644
 --- third_party/libwebrtc/api/refcountedbase_gn/moz.build
 +++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11072,7 +11092,7 @@ index 96c04d125890..e7c234797960 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -11236,7 +11256,7 @@ index 96c04d125890..e7c234797960 100644
 -
  Library("refcountedbase_gn")
 diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 3c9d5f7f9b88..b394febab922 100644
+index 1ff7960b4dd0..47846b31a453 100644
 --- third_party/libwebrtc/api/rtc_error_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_error_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11259,7 +11279,7 @@ index 3c9d5f7f9b88..b394febab922 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -11454,7 +11474,7 @@ index 3c9d5f7f9b88..b394febab922 100644
  
  Library("rtc_error_gn")
 diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index 991c0366b6b1..dde96c64f726 100644
+index e478cf3e4c3c..8a92a62b9562 100644
 --- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 +++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11477,7 +11497,7 @@ index 991c0366b6b1..dde96c64f726 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -11672,7 +11692,7 @@ index 991c0366b6b1..dde96c64f726 100644
  
  Library("rtc_event_log_gn")
 diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 24f4f8fb24fe..84b819ba9e90 100644
+index 5b5cac9bf046..8691523b8dfc 100644
 --- third_party/libwebrtc/api/rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11695,7 +11715,7 @@ index 24f4f8fb24fe..84b819ba9e90 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -11890,7 +11910,7 @@ index 24f4f8fb24fe..84b819ba9e90 100644
  
  Library("rtp_headers_gn")
 diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index fda93e184ec6..50846adb8b4e 100644
+index 7bd7a37fb361..67fffb26c146 100644
 --- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -11913,7 +11933,7 @@ index fda93e184ec6..50846adb8b4e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -12108,7 +12128,7 @@ index fda93e184ec6..50846adb8b4e 100644
  
  Library("rtp_packet_info_gn")
 diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 09590e547db4..9330001cc876 100644
+index ada3bfe3a22b..dd1ba2bc5bd3 100644
 --- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12131,7 +12151,7 @@ index 09590e547db4..9330001cc876 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -12319,7 +12339,7 @@ index 09590e547db4..9330001cc876 100644
  
  Library("rtp_parameters_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index e7259b40e084..3f2c9b2e4cd7 100644
+index 5b41bb13cbbe..2ae22cf178d8 100644
 --- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12342,7 +12362,7 @@ index e7259b40e084..3f2c9b2e4cd7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -12506,7 +12526,7 @@ index e7259b40e084..3f2c9b2e4cd7 100644
 -
  Library("rtp_sender_interface_gn")
 diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index c493f010c8bd..fc343fe57be9 100644
+index 89f5c0fcc118..ba3ef53ada72 100644
 --- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12529,7 +12549,7 @@ index c493f010c8bd..fc343fe57be9 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -12724,7 +12744,7 @@ index c493f010c8bd..fc343fe57be9 100644
  
  Library("rtp_sender_setparameters_callback_gn")
 diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index 66b863defb7a..f12c6a35f934 100644
+index c3b4e7f67e56..1acea51df010 100644
 --- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 +++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12747,7 +12767,7 @@ index 66b863defb7a..f12c6a35f934 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -12911,7 +12931,7 @@ index 66b863defb7a..f12c6a35f934 100644
 -
  Library("rtp_transceiver_direction_gn")
 diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index 6593008ce69b..e482239ee788 100644
+index bd244c29b5cb..58ee4b71716c 100644
 --- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
 +++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -12934,7 +12954,7 @@ index 6593008ce69b..e482239ee788 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -13098,7 +13118,7 @@ index 6593008ce69b..e482239ee788 100644
 -
  Library("scoped_refptr_gn")
 diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index d50c0f4f320f..591815f47c77 100644
+index e129bf8a010e..c2d4b302936a 100644
 --- third_party/libwebrtc/api/sequence_checker_gn/moz.build
 +++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13121,7 +13141,7 @@ index d50c0f4f320f..591815f47c77 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -13289,7 +13309,7 @@ index d50c0f4f320f..591815f47c77 100644
 -
  Library("sequence_checker_gn")
 diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index 1f52ba37d7d4..26728a141487 100644
+index 222193edde3f..8b3da9c6ba70 100644
 --- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
 +++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13312,7 +13332,7 @@ index 1f52ba37d7d4..26728a141487 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -13479,8 +13499,195 @@ index 1f52ba37d7d4..26728a141487 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("simulated_network_api_gn")
+diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
+index 0d9947daa8ce..5d6f286d394b 100644
+--- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
++++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+ 
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("default_task_queue_factory_gn")
 diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index 43229b22ed5c..e8094ed7f16d 100644
+index e0e0b4688e62..47a601850a28 100644
 --- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13503,7 +13710,7 @@ index 43229b22ed5c..e8094ed7f16d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -13691,7 +13898,7 @@ index 43229b22ed5c..e8094ed7f16d 100644
  
  Library("pending_task_safety_flag_gn")
 diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index 8c04d40cf594..e9f40adf5dcc 100644
+index b3eb74837f20..94718b5d1065 100644
 --- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 +++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13714,7 +13921,7 @@ index 8c04d40cf594..e9f40adf5dcc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -13901,8 +14108,195 @@ index 8c04d40cf594..e9f40adf5dcc 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("task_queue_gn")
+diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
+index 0885f16a0655..ef5775ccf647 100644
+--- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
++++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+ 
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("bandwidth_estimation_settings_gn")
 diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 2b732ca51e9d..716e91c361d1 100644
+index 42410686d0be..82767eaae01a 100644
 --- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 +++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -13925,7 +14319,7 @@ index 2b732ca51e9d..716e91c361d1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -14109,7 +14503,7 @@ index 2b732ca51e9d..716e91c361d1 100644
  
  Library("bitrate_settings_gn")
 diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index dba9cee6bdd0..12180edceced 100644
+index e0f8f023787b..b9b426e20a50 100644
 --- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 +++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14132,7 +14526,7 @@ index dba9cee6bdd0..12180edceced 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -14307,7 +14701,7 @@ index dba9cee6bdd0..12180edceced 100644
 -
  Library("datagram_transport_interface_gn")
 diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index dd3370838d67..10d7b6bb4d54 100644
+index 0b2e41f78c7b..665be1aad89b 100644
 --- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
 +++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14330,7 +14724,7 @@ index dd3370838d67..10d7b6bb4d54 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -14525,7 +14919,7 @@ index dd3370838d67..10d7b6bb4d54 100644
  
  Library("field_trial_based_config_gn")
 diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 80dee942e0ee..929cc485f211 100644
+index 70efa923b78f..6f3cfe2f16c5 100644
 --- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14548,7 +14942,7 @@ index 80dee942e0ee..929cc485f211 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -14748,7 +15142,7 @@ index 80dee942e0ee..929cc485f211 100644
  
  Library("goog_cc_gn")
 diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index e11b34ba718e..a67647ff4e6a 100644
+index abbedfaee9af..08b107c8a46a 100644
 --- third_party/libwebrtc/api/transport/network_control_gn/moz.build
 +++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14771,7 +15165,7 @@ index e11b34ba718e..a67647ff4e6a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -14966,7 +15360,7 @@ index e11b34ba718e..a67647ff4e6a 100644
  
  Library("network_control_gn")
 diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index 568c7d976884..cf683816e0d6 100644
+index 16ec75fa0170..dc43798be44c 100644
 --- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -14989,7 +15383,7 @@ index 568c7d976884..cf683816e0d6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -15177,7 +15571,7 @@ index 568c7d976884..cf683816e0d6 100644
  
  Library("dependency_descriptor_gn")
 diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 9d993f6f68a1..791e45051d89 100644
+index 83c88e8037fe..3656e84885cd 100644
 --- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
 +++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15200,7 +15594,7 @@ index 9d993f6f68a1..791e45051d89 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -15375,7 +15769,7 @@ index 9d993f6f68a1..791e45051d89 100644
 -
  Library("rtp_source_gn")
 diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index ad873a179659..d7df0d5d7208 100644
+index 51a16e295eef..62b2c614ce5a 100644
 --- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
 +++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15398,7 +15792,7 @@ index ad873a179659..d7df0d5d7208 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -15562,7 +15956,7 @@ index ad873a179659..d7df0d5d7208 100644
 -
  Library("stun_types_gn")
 diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index 506cb2f24dd1..f01561893920 100644
+index a726caad2813..f12489fba6e4 100644
 --- third_party/libwebrtc/api/transport_api_gn/moz.build
 +++ third_party/libwebrtc/api/transport_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15585,7 +15979,7 @@ index 506cb2f24dd1..f01561893920 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -15773,7 +16167,7 @@ index 506cb2f24dd1..f01561893920 100644
  
  Library("transport_api_gn")
 diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index b2bb9b7c5fd0..91d77bc12c86 100644
+index 398b03d0a231..41e7c078d060 100644
 --- third_party/libwebrtc/api/units/data_rate_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -15796,7 +16190,7 @@ index b2bb9b7c5fd0..91d77bc12c86 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -15984,7 +16378,7 @@ index b2bb9b7c5fd0..91d77bc12c86 100644
  
  Library("data_rate_gn")
 diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index ceaa9da9a29a..31b25242e9a9 100644
+index 8f61d0131463..5a8fb7125160 100644
 --- third_party/libwebrtc/api/units/data_size_gn/moz.build
 +++ third_party/libwebrtc/api/units/data_size_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16007,7 +16401,7 @@ index ceaa9da9a29a..31b25242e9a9 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -16195,7 +16589,7 @@ index ceaa9da9a29a..31b25242e9a9 100644
  
  Library("data_size_gn")
 diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 8b0607cf752f..f780d340c448 100644
+index 40a6bf261710..fa6c15bc81e1 100644
 --- third_party/libwebrtc/api/units/frequency_gn/moz.build
 +++ third_party/libwebrtc/api/units/frequency_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16218,7 +16612,7 @@ index 8b0607cf752f..f780d340c448 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -16406,7 +16800,7 @@ index 8b0607cf752f..f780d340c448 100644
  
  Library("frequency_gn")
 diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index 62205516148a..2df892f4a708 100644
+index d9ede8c812f2..b129d8b4f2d8 100644
 --- third_party/libwebrtc/api/units/time_delta_gn/moz.build
 +++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16429,7 +16823,7 @@ index 62205516148a..2df892f4a708 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -16617,7 +17011,7 @@ index 62205516148a..2df892f4a708 100644
  
  Library("time_delta_gn")
 diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index 083b864ff086..f4f43207ca71 100644
+index 9e5ed8541e57..ca185af59de3 100644
 --- third_party/libwebrtc/api/units/timestamp_gn/moz.build
 +++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16640,7 +17034,7 @@ index 083b864ff086..f4f43207ca71 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -16828,7 +17222,7 @@ index 083b864ff086..f4f43207ca71 100644
  
  Library("timestamp_gn")
 diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index 620fba65aa45..114f6b43ad03 100644
+index cafafadf4452..0be4593415cf 100644
 --- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -16851,7 +17245,7 @@ index 620fba65aa45..114f6b43ad03 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -17051,7 +17445,7 @@ index 620fba65aa45..114f6b43ad03 100644
  
  Library("builtin_video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index 4c92d824ae4e..3aab4972d1b0 100644
+index d804e2fd3671..a40fcef67844 100644
 --- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17074,7 +17468,7 @@ index 4c92d824ae4e..3aab4972d1b0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -17269,7 +17663,7 @@ index 4c92d824ae4e..3aab4972d1b0 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index 25d2d0998ea5..9bbfe7ab6b7c 100644
+index a444a71189b9..01e5ec845e10 100644
 --- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 +++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17292,7 +17686,7 @@ index 25d2d0998ea5..9bbfe7ab6b7c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -17487,7 +17881,7 @@ index 25d2d0998ea5..9bbfe7ab6b7c 100644
  
  Library("encoded_image_gn")
 diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 048097ce50fd..b0ddb83924e2 100644
+index 01a33c4b813f..35e492ad1546 100644
 --- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 +++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17510,7 +17904,7 @@ index 048097ce50fd..b0ddb83924e2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -17710,7 +18104,7 @@ index 048097ce50fd..b0ddb83924e2 100644
  
  Library("frame_buffer_gn")
 diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index a5b4399e4ad4..c5cf761665a3 100644
+index 4d6199a71433..63f6010eb884 100644
 --- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17733,7 +18127,7 @@ index a5b4399e4ad4..c5cf761665a3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -17908,7 +18302,7 @@ index a5b4399e4ad4..c5cf761665a3 100644
 -
  Library("recordable_encoded_frame_gn")
 diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 6ee89b6451ad..581ca3830235 100644
+index a0c4da6d5809..afb0f88ed8fd 100644
 --- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -17931,7 +18325,7 @@ index 6ee89b6451ad..581ca3830235 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -18095,7 +18489,7 @@ index 6ee89b6451ad..581ca3830235 100644
 -
  Library("render_resolution_gn")
 diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index de79a64a660c..8b1b3fe09fa1 100644
+index e55dfe7d2c22..d5993bf113b5 100644
 --- third_party/libwebrtc/api/video/resolution_gn/moz.build
 +++ third_party/libwebrtc/api/video/resolution_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18118,7 +18512,7 @@ index de79a64a660c..8b1b3fe09fa1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -18282,7 +18676,7 @@ index de79a64a660c..8b1b3fe09fa1 100644
 -
  Library("resolution_gn")
 diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index 4483b3eaef01..26cb2efe4e07 100644
+index c061e657ab8a..03c9ed5c202b 100644
 --- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18305,7 +18699,7 @@ index 4483b3eaef01..26cb2efe4e07 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -18493,7 +18887,7 @@ index 4483b3eaef01..26cb2efe4e07 100644
  
  Library("video_adaptation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index 1196221e634e..a7dbc316cfc0 100644
+index 9581b4202af9..d526540c4a75 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18516,7 +18910,7 @@ index 1196221e634e..a7dbc316cfc0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -18704,7 +19098,7 @@ index 1196221e634e..a7dbc316cfc0 100644
  
  Library("video_bitrate_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index ff4934b7b562..df387e75d820 100644
+index 71a1a7f2dc3e..4ca5af462591 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18727,7 +19121,7 @@ index ff4934b7b562..df387e75d820 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -18902,7 +19296,7 @@ index ff4934b7b562..df387e75d820 100644
 -
  Library("video_bitrate_allocator_factory_gn")
 diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index 758cbb7521f5..d83935fe0710 100644
+index aecab75d2eac..0ad41db37d78 100644
 --- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -18925,7 +19319,7 @@ index 758cbb7521f5..d83935fe0710 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -19113,7 +19507,7 @@ index 758cbb7521f5..d83935fe0710 100644
  
  Library("video_bitrate_allocator_gn")
 diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 2275aa4aa15b..8bfda2bd2815 100644
+index 1ff8d8117fa6..5bcaf00344da 100644
 --- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19136,7 +19530,7 @@ index 2275aa4aa15b..8bfda2bd2815 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -19300,7 +19694,7 @@ index 2275aa4aa15b..8bfda2bd2815 100644
 -
  Library("video_codec_constants_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 203b03a0a377..67fafe98aa0c 100644
+index 37f7adf1843d..8697e1d06d1e 100644
 --- third_party/libwebrtc/api/video/video_frame_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19323,7 +19717,7 @@ index 203b03a0a377..67fafe98aa0c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -19518,7 +19912,7 @@ index 203b03a0a377..67fafe98aa0c 100644
  
  Library("video_frame_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index 12435133353f..7b3d8fef889c 100644
+index 2b8bd493aff9..c6b33b8a1e23 100644
 --- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19541,7 +19935,7 @@ index 12435133353f..7b3d8fef889c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -19736,7 +20130,7 @@ index 12435133353f..7b3d8fef889c 100644
  
  Library("video_frame_i010_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index 6616ea0dd6ed..900162a802f7 100644
+index 8b4bd96df239..bcbd30fd4d21 100644
 --- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19759,7 +20153,7 @@ index 6616ea0dd6ed..900162a802f7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -19954,7 +20348,7 @@ index 6616ea0dd6ed..900162a802f7 100644
  
  Library("video_frame_metadata_gn")
 diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index ab7548fe8dd8..3ebf86087e9b 100644
+index 3416d040b2ea..263eaf0e7885 100644
 --- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -19977,7 +20371,7 @@ index ab7548fe8dd8..3ebf86087e9b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -20145,7 +20539,7 @@ index ab7548fe8dd8..3ebf86087e9b 100644
 -
  Library("video_frame_type_gn")
 diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index 7f88b15c07b6..13701e033163 100644
+index d9d7097f2f89..2603fe99c69f 100644
 --- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20168,7 +20562,7 @@ index 7f88b15c07b6..13701e033163 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -20336,7 +20730,7 @@ index 7f88b15c07b6..13701e033163 100644
 -
  Library("video_layers_allocation_gn")
 diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index 2f02f285f2af..039f412a6c99 100644
+index 7c696af228c6..da97d3a9cc11 100644
 --- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20359,7 +20753,7 @@ index 2f02f285f2af..039f412a6c99 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -20554,7 +20948,7 @@ index 2f02f285f2af..039f412a6c99 100644
  
  Library("video_rtp_headers_gn")
 diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index f75eac803f84..fa61dad4d254 100644
+index f54c46500445..dd230e6e136c 100644
 --- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 +++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20577,7 +20971,7 @@ index f75eac803f84..fa61dad4d254 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -20752,7 +21146,7 @@ index f75eac803f84..fa61dad4d254 100644
 -
  Library("video_stream_encoder_gn")
 diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 866df39c97a7..a20debacf2b1 100644
+index b1bb1e3323e8..162090a6363d 100644
 --- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20775,7 +21169,7 @@ index 866df39c97a7..a20debacf2b1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -20943,7 +21337,7 @@ index 866df39c97a7..a20debacf2b1 100644
 -
  Library("bitstream_parser_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index e8139cb6f264..554a2bc0b150 100644
+index ca9c0f599a99..1b58004533ae 100644
 --- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -20966,7 +21360,7 @@ index e8139cb6f264..554a2bc0b150 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -21166,7 +21560,7 @@ index e8139cb6f264..554a2bc0b150 100644
  
  Library("rtc_software_fallback_wrappers_gn")
 diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index 491c4880cc46..874d12b31e06 100644
+index b0c90b8ad2ee..4933d9ebafdb 100644
 --- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21189,7 +21583,7 @@ index 491c4880cc46..874d12b31e06 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -21377,7 +21771,7 @@ index 491c4880cc46..874d12b31e06 100644
  
  Library("scalability_mode_gn")
 diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index c6c127e5b607..c866cb6d800f 100644
+index de1ff19cd39c..f5d7824d0dc2 100644
 --- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21400,9 +21794,9 @@ index c6c127e5b607..c866cb6d800f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -53,185 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,185 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21595,7 +21989,7 @@ index c6c127e5b607..c866cb6d800f 100644
  
  Library("video_codecs_api_gn")
 diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 7131057c2f1c..eff6026011a0 100644
+index 394091421449..a19bee0723d3 100644
 --- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 +++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21618,7 +22012,7 @@ index 7131057c2f1c..eff6026011a0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -21818,7 +22212,7 @@ index 7131057c2f1c..eff6026011a0 100644
  
  Library("vp8_temporal_layers_factory_gn")
 diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index 9e9852b71fa3..b1b79e03c8ee 100644
+index 636a3df69c9a..abcef0e2e4c3 100644
 --- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
 +++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -21841,7 +22235,7 @@ index 9e9852b71fa3..b1b79e03c8ee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -22005,7 +22399,7 @@ index 9e9852b71fa3..b1b79e03c8ee 100644
 -
  Library("video_track_source_constraints_gn")
 diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index da615157b20d..bb58c94c5403 100644
+index 2888ef09bd9b..0b9c1637ce34 100644
 --- third_party/libwebrtc/audio/audio_gn/moz.build
 +++ third_party/libwebrtc/audio/audio_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22028,7 +22422,7 @@ index da615157b20d..bb58c94c5403 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -55,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -22228,7 +22622,7 @@ index da615157b20d..bb58c94c5403 100644
  
  Library("audio_gn")
 diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index 6489497db43a..aab0bc81b0aa 100644
+index 315f691f3e09..1848f414171d 100644
 --- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 +++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22251,7 +22645,7 @@ index 6489497db43a..aab0bc81b0aa 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -22450,7 +22844,7 @@ index 6489497db43a..aab0bc81b0aa 100644
  
  Library("audio_frame_operations_gn")
 diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index 79a2aa9defd9..6e627cb67c35 100644
+index 3dab96b5a372..bcaf67293b6b 100644
 --- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 +++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22473,7 +22867,7 @@ index 79a2aa9defd9..6e627cb67c35 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -52,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -22673,7 +23067,7 @@ index 79a2aa9defd9..6e627cb67c35 100644
  
  Library("resource_adaptation_gn")
 diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index a53966813f73..6f80ac1cc6e5 100644
+index 6ca0ee773997..92276ee6b298 100644
 --- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 +++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22696,7 +23090,7 @@ index a53966813f73..6f80ac1cc6e5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -22871,7 +23265,7 @@ index a53966813f73..6f80ac1cc6e5 100644
 -
  Library("audio_sender_interface_gn")
 diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index db772f8d3965..79b7f726fe25 100644
+index 57adb400db54..754fdf86307a 100644
 --- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -22894,7 +23288,7 @@ index db772f8d3965..79b7f726fe25 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -23093,7 +23487,7 @@ index db772f8d3965..79b7f726fe25 100644
  
  Library("bitrate_allocator_gn")
 diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index f7c51b4a7ccd..d5840ec1a784 100644
+index 59f87d2fdf4d..537c7fe06fcd 100644
 --- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 +++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23116,7 +23510,7 @@ index f7c51b4a7ccd..d5840ec1a784 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -23315,7 +23709,7 @@ index f7c51b4a7ccd..d5840ec1a784 100644
  
  Library("bitrate_configurator_gn")
 diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 20f1f973a5da..172d26827022 100644
+index da452122ce12..84614d18ac06 100644
 --- third_party/libwebrtc/call/call_gn/moz.build
 +++ third_party/libwebrtc/call/call_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23338,7 +23732,7 @@ index 20f1f973a5da..172d26827022 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -23538,7 +23932,7 @@ index 20f1f973a5da..172d26827022 100644
  
  Library("call_gn")
 diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index a7db90d471a3..0c8e7e07006f 100644
+index 3c7b6a05d3ab..a65ef1040061 100644
 --- third_party/libwebrtc/call/call_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23561,7 +23955,7 @@ index a7db90d471a3..0c8e7e07006f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -23761,7 +24155,7 @@ index a7db90d471a3..0c8e7e07006f 100644
  
  Library("call_interfaces_gn")
 diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index f25941483566..99fc4b2ce9c4 100644
+index 0b3511082a51..52c6e002375f 100644
 --- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 +++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23784,7 +24178,7 @@ index f25941483566..99fc4b2ce9c4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -23963,7 +24357,7 @@ index f25941483566..99fc4b2ce9c4 100644
 -
  Library("receive_stream_interface_gn")
 diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index d5223f0b8b4e..384f284c4233 100644
+index f2fb2ab649bb..ed390dd2fce3 100644
 --- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -23986,7 +24380,7 @@ index d5223f0b8b4e..384f284c4233 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -24185,7 +24579,7 @@ index d5223f0b8b4e..384f284c4233 100644
  
  Library("rtp_interfaces_gn")
 diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index b6b43b0afac7..a35b27249321 100644
+index 35c68ca3368d..f18af2328452 100644
 --- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24208,7 +24602,7 @@ index b6b43b0afac7..a35b27249321 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -24408,7 +24802,7 @@ index b6b43b0afac7..a35b27249321 100644
  
  Library("rtp_receiver_gn")
 diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index 54d111541751..864bbdfd7819 100644
+index c99d9d8e8a66..4e15db834a33 100644
 --- third_party/libwebrtc/call/rtp_sender_gn/moz.build
 +++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24431,7 +24825,7 @@ index 54d111541751..864bbdfd7819 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -24631,7 +25025,7 @@ index 54d111541751..864bbdfd7819 100644
  
  Library("rtp_sender_gn")
 diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index 28745e4fc6de..43695342b267 100644
+index 50ff0cff2e55..ee871323396a 100644
 --- third_party/libwebrtc/call/version_gn/moz.build
 +++ third_party/libwebrtc/call/version_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24654,7 +25048,7 @@ index 28745e4fc6de..43695342b267 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -24838,7 +25232,7 @@ index 28745e4fc6de..43695342b267 100644
  
  Library("version_gn")
 diff --git third_party/libwebrtc/call/video_stream_api_gn/moz.build third_party/libwebrtc/call/video_stream_api_gn/moz.build
-index cf58d3748ec0..c2ee6bd9eb51 100644
+index 9aa475a12fc6..7488f3667ecd 100644
 --- third_party/libwebrtc/call/video_stream_api_gn/moz.build
 +++ third_party/libwebrtc/call/video_stream_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -24861,7 +25255,7 @@ index cf58d3748ec0..c2ee6bd9eb51 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -25060,7 +25454,7 @@ index cf58d3748ec0..c2ee6bd9eb51 100644
  
  Library("video_stream_api_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 708eb92e1e45..0b18db99441c 100644
+index fc1e13a8933c..505627b692c3 100644
 --- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
 @@ -17,12 +17,22 @@ CXXFLAGS += [
@@ -25084,7 +25478,7 @@ index 708eb92e1e45..0b18db99441c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,137 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -25228,7 +25622,7 @@ index 708eb92e1e45..0b18db99441c 100644
  
  Library("common_audio_avx2_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index deb2dbe3011d..4adf2cb0a3ff 100644
+index 0827bbf31a41..7a873e6e680c 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25251,7 +25645,7 @@ index deb2dbe3011d..4adf2cb0a3ff 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -25420,7 +25814,7 @@ index deb2dbe3011d..4adf2cb0a3ff 100644
 -
  Library("common_audio_c_arm_asm_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index 77ad77a1d59c..57ae8a9c5502 100644
+index 99cceabf2989..709978b9f184 100644
 --- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25443,7 +25837,7 @@ index 77ad77a1d59c..57ae8a9c5502 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -80,117 +90,12 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -25730,7 +26124,7 @@ index 77ad77a1d59c..57ae8a9c5502 100644
  
  Library("common_audio_c_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index 9fc98aac37b4..ccbce8a93a86 100644
+index 1ab56ac80918..42e92caa7571 100644
 --- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25753,7 +26147,7 @@ index 9fc98aac37b4..ccbce8a93a86 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -25952,7 +26346,7 @@ index 9fc98aac37b4..ccbce8a93a86 100644
  
  Library("common_audio_cc_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index ee91cec7752d..208fd6af96b7 100644
+index 79a78f783794..12a1a532fbed 100644
 --- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -25975,7 +26369,7 @@ index ee91cec7752d..208fd6af96b7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -26174,7 +26568,7 @@ index ee91cec7752d..208fd6af96b7 100644
  
  Library("common_audio_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index 3890cd0f9429..665f9d57f8fa 100644
+index acd2e8bc36f7..417e933a842e 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
 @@ -12,12 +12,23 @@ AllowCompilerWarnings()
@@ -26199,7 +26593,7 @@ index 3890cd0f9429..665f9d57f8fa 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,151 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -26355,7 +26749,7 @@ index 3890cd0f9429..665f9d57f8fa 100644
 -
  Library("common_audio_neon_c_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index b8b06ffc74bc..7b093b38218c 100644
+index c415a7145299..25ddc9cd7e7a 100644
 --- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
 @@ -12,12 +12,23 @@ AllowCompilerWarnings()
@@ -26380,7 +26774,7 @@ index b8b06ffc74bc..7b093b38218c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,151 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -26536,7 +26930,7 @@ index b8b06ffc74bc..7b093b38218c 100644
 -
  Library("common_audio_neon_gn")
 diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 7f0b17b28760..60b8bdd048ee 100644
+index 435c33a394e5..146ddde10702 100644
 --- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
 +++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -26560,7 +26954,7 @@ index 7f0b17b28760..60b8bdd048ee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,159 +55,23 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -26727,7 +27121,7 @@ index 7f0b17b28760..60b8bdd048ee 100644
  
  Library("common_audio_sse2_gn")
 diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index e5cef248325a..8c94cafaea8c 100644
+index 2faac2a93134..2bb083f83813 100644
 --- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26750,7 +27144,7 @@ index e5cef248325a..8c94cafaea8c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -26949,7 +27343,7 @@ index e5cef248325a..8c94cafaea8c 100644
  
  Library("fir_filter_factory_gn")
 diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index 4140a3529209..a2f52d00f787 100644
+index af029033e761..47a1e94fccaa 100644
 --- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 +++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -26972,7 +27366,7 @@ index 4140a3529209..a2f52d00f787 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -27136,7 +27530,7 @@ index 4140a3529209..a2f52d00f787 100644
 -
  Library("fir_filter_gn")
 diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index ec0b21c2fc07..920ecc6786e2 100644
+index 962dbed44bf8..a3de988aa645 100644
 --- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
 +++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27159,7 +27553,7 @@ index ec0b21c2fc07..920ecc6786e2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -27338,7 +27732,7 @@ index ec0b21c2fc07..920ecc6786e2 100644
 -
  Library("sinc_resampler_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index 6efbe87f02e4..6516aa36e738 100644
+index 6245fdf7ef93..c9bc0ab140da 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27361,7 +27755,7 @@ index 6efbe87f02e4..6516aa36e738 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,101 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -27605,7 +27999,7 @@ index 6efbe87f02e4..6516aa36e738 100644
  
  Library("fft_size_128_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index d1e512c383fe..e684b91a0664 100644
+index 7c2503bc9ccd..9f95cef3ece3 100644
 --- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27628,7 +28022,7 @@ index d1e512c383fe..e684b91a0664 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -27812,7 +28206,7 @@ index d1e512c383fe..e684b91a0664 100644
  
  Library("fft_size_256_gn")
 diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index 718ca3b4e8a9..bfb7cde7d729 100644
+index ec09e725fff7..10e9f97d6da5 100644
 --- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 +++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -27835,7 +28229,7 @@ index 718ca3b4e8a9..bfb7cde7d729 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,119 +49,21 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -28080,7 +28474,7 @@ index 718ca3b4e8a9..bfb7cde7d729 100644
  
  Library("spl_sqrt_floor_gn")
 diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index 4572d78fab12..aaaed70ce9a2 100644
+index fb64d190c30d..9a932841e6b6 100644
 --- third_party/libwebrtc/common_video/common_video_gn/moz.build
 +++ third_party/libwebrtc/common_video/common_video_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28103,7 +28497,7 @@ index 4572d78fab12..aaaed70ce9a2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -55,185 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -28298,7 +28692,7 @@ index 4572d78fab12..aaaed70ce9a2 100644
  
  Library("common_video_gn")
 diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 0727032aea53..b83174b75ce7 100644
+index 08c88c4702cf..9db89bc82aab 100644
 --- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 +++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28321,7 +28715,7 @@ index 0727032aea53..b83174b75ce7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -28485,7 +28879,7 @@ index 0727032aea53..b83174b75ce7 100644
 -
  Library("frame_counts_gn")
 diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index 1b9792fe565e..ecc27ae7537e 100644
+index b16531fbf8e2..d38bf09f56cb 100644
 --- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
 +++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28508,7 +28902,7 @@ index 1b9792fe565e..ecc27ae7537e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -28696,7 +29090,7 @@ index 1b9792fe565e..ecc27ae7537e 100644
  
  Library("generic_frame_descriptor_gn")
 diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index f2614358531f..c4bdc6ec5e67 100644
+index 5e1ddc355d5b..eaa9a598140a 100644
 --- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
 +++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28719,7 +29113,7 @@ index f2614358531f..c4bdc6ec5e67 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -28883,7 +29277,7 @@ index f2614358531f..c4bdc6ec5e67 100644
 -
  Library("registered_field_trials_gn")
 diff --git third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
-index 2f9f14acb430..f8143d2798f0 100644
+index 6c29dea76a50..3ae54a950c46 100644
 --- third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
 +++ third_party/libwebrtc/experiments/registered_field_trials_header_gn/moz.build
 @@ -31,9 +31,4 @@ LOCAL_INCLUDES += [
@@ -28897,7 +29291,7 @@ index 2f9f14acb430..f8143d2798f0 100644
 -
  Library("registered_field_trials_header_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index 806981ed688c..5286d0893211 100644
+index bf124013de2a..458504cb1a8a 100644
 --- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -28920,7 +29314,7 @@ index 806981ed688c..5286d0893211 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,185 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -29115,7 +29509,7 @@ index 806981ed688c..5286d0893211 100644
  
  Library("rtc_event_audio_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index d1f1deac9a5a..c9e2dbbd60a6 100644
+index c7c2a5f88033..05a45c19eaba 100644
 --- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29138,7 +29532,7 @@ index d1f1deac9a5a..c9e2dbbd60a6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,185 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -29333,7 +29727,7 @@ index d1f1deac9a5a..c9e2dbbd60a6 100644
  
  Library("rtc_event_bwe_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index 2c6740f28f86..e03e19ffe137 100644
+index 630358f34942..84d1261d676d 100644
 --- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29356,7 +29750,7 @@ index 2c6740f28f86..e03e19ffe137 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -29551,7 +29945,7 @@ index 2c6740f28f86..e03e19ffe137 100644
  
  Library("rtc_event_field_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index 2936d8ef48a0..a2cfdaa1e322 100644
+index 46e013a0d4d4..35119b6eae57 100644
 --- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29574,7 +29968,7 @@ index 2936d8ef48a0..a2cfdaa1e322 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -29742,7 +30136,7 @@ index 2936d8ef48a0..a2cfdaa1e322 100644
 -
  Library("rtc_event_log_parse_status_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index 6ecf9077cf03..ccdfd183ece3 100644
+index 4c491af3963c..aa2e0940ea0a 100644
 --- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29765,7 +30159,7 @@ index 6ecf9077cf03..ccdfd183ece3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -29953,7 +30347,7 @@ index 6ecf9077cf03..ccdfd183ece3 100644
  
  Library("rtc_event_number_encodings_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index f0e8d5d4e8ed..76f4e6aaf79d 100644
+index aec4465f8ac3..90a07fc5ca25 100644
 --- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -29976,7 +30370,7 @@ index f0e8d5d4e8ed..76f4e6aaf79d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -30171,7 +30565,7 @@ index f0e8d5d4e8ed..76f4e6aaf79d 100644
  
  Library("rtc_event_pacing_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index 082924c2d04a..c36201f6936f 100644
+index 3edc922b8f08..828a59406490 100644
 --- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30194,7 +30588,7 @@ index 082924c2d04a..c36201f6936f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -30393,7 +30787,7 @@ index 082924c2d04a..c36201f6936f 100644
  
  Library("rtc_event_rtp_rtcp_gn")
 diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 6e74aef635a8..ce50ff600882 100644
+index 616e73dcf5ec..b0b40454f315 100644
 --- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30416,7 +30810,7 @@ index 6e74aef635a8..ce50ff600882 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -30611,7 +31005,7 @@ index 6e74aef635a8..ce50ff600882 100644
  
  Library("rtc_event_video_gn")
 diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 935bf8bbf982..554779329f71 100644
+index 6fd95dde97d0..bf513371f32d 100644
 --- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 +++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30634,7 +31028,7 @@ index 935bf8bbf982..554779329f71 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -30828,8 +31222,206 @@ index 935bf8bbf982..554779329f71 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("rtc_stream_config_gn")
+diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
+index 1cb4f853abba..bbf25c8397df 100644
+--- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
++++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -160,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+ 
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("adapted_video_track_source_gn")
 diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index b5ebd454d311..0e5621e98050 100644
+index cf10ada0cf66..a2e116825f9e 100644
 --- third_party/libwebrtc/media/codec_gn/moz.build
 +++ third_party/libwebrtc/media/codec_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -30852,7 +31444,7 @@ index b5ebd454d311..0e5621e98050 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -31047,7 +31639,7 @@ index b5ebd454d311..0e5621e98050 100644
  
  Library("codec_gn")
 diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index c6653685687c..dc7b58e842ae 100644
+index fc0c50aa726b..65afa6523e40 100644
 --- third_party/libwebrtc/media/media_channel_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31070,7 +31662,7 @@ index c6653685687c..dc7b58e842ae 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -31250,7 +31842,7 @@ index c6653685687c..dc7b58e842ae 100644
 -
  Library("media_channel_gn")
 diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index 27bfa53fffd8..172ee56822ee 100644
+index b7db93813a60..02018a9118e9 100644
 --- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
 +++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31273,7 +31865,7 @@ index 27bfa53fffd8..172ee56822ee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -31437,7 +32029,7 @@ index 27bfa53fffd8..172ee56822ee 100644
 -
  Library("media_channel_impl_gn")
 diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index 95a0c3a056ad..f824cfa02a97 100644
+index fb7440ec4a07..8b99c9931019 100644
 --- third_party/libwebrtc/media/media_constants_gn/moz.build
 +++ third_party/libwebrtc/media/media_constants_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31460,7 +32052,7 @@ index 95a0c3a056ad..f824cfa02a97 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -31644,7 +32236,7 @@ index 95a0c3a056ad..f824cfa02a97 100644
  
  Library("media_constants_gn")
 diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 944901a1ca8b..5002ea1e568b 100644
+index 22f56f08a780..b9d567d474ee 100644
 --- third_party/libwebrtc/media/rid_description_gn/moz.build
 +++ third_party/libwebrtc/media/rid_description_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31667,7 +32259,7 @@ index 944901a1ca8b..5002ea1e568b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -31831,7 +32423,7 @@ index 944901a1ca8b..5002ea1e568b 100644
 -
  Library("rid_description_gn")
 diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index a5b3661adc45..a8cbb815b3dc 100644
+index eb9cb4e29d04..d886ebdf06fa 100644
 --- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -31854,9 +32446,9 @@ index a5b3661adc45..a8cbb815b3dc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -46,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -39,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31965,10 +32557,6 @@ index a5b3661adc45..a8cbb815b3dc 100644
  
 -if CONFIG["TARGET_CPU"] == "arm":
 -
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
 -    DEFINES["WEBRTC_ARCH_ARM"] = True
 -    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
 -    DEFINES["WEBRTC_HAS_NEON"] = True
@@ -31985,12 +32573,10 @@ index a5b3661adc45..a8cbb815b3dc 100644
  
  if CONFIG["TARGET_CPU"] == "x86":
  
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
+@@ -165,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
 -if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
 -
 -    DEFINES["_DEBUG"] = True
@@ -32012,21 +32598,16 @@ index a5b3661adc45..a8cbb815b3dc 100644
 -    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
 -
 -if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_X11"] = "1"
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+ 
 -if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
 -
 -    OS_LIBS += [
 -        "unwind"
 -    ]
 -
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
 -
 -    DEFINES["_GNU_SOURCE"] = True
@@ -32036,25 +32617,16 @@ index a5b3661adc45..a8cbb815b3dc 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--    CXXFLAGS += [
--        "-msse2"
--    ]
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
+-
 -if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
+-
 -    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
+-
  Library("rtc_media_base_gn")
 diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index 8f3f81cc5b25..5f7ef130f434 100644
+index 4b6ba11d7681..f8b511ad7260 100644
 --- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32077,7 +32649,7 @@ index 8f3f81cc5b25..5f7ef130f434 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -32240,8 +32812,226 @@ index 8f3f81cc5b25..5f7ef130f434 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("rtc_media_config_gn")
+diff --git third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
+index 10b08d64fbe2..68edc3038e9b 100644
+--- third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
++++ third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("rtc_sdp_video_format_utils_gn")
 diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 6b1032e1b0d5..d923f1e5407f 100644
+index 1929dd6e9399..285c3d71156e 100644
 --- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 +++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32264,7 +33054,7 @@ index 6b1032e1b0d5..d923f1e5407f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -32464,7 +33254,7 @@ index 6b1032e1b0d5..d923f1e5407f 100644
  
  Library("rtc_simulcast_encoder_adapter_gn")
 diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index e2e5c11695a9..3a5eee57c3c6 100644
+index 22b3cc9d6461..c7e26cb4b401 100644
 --- third_party/libwebrtc/media/rtp_utils_gn/moz.build
 +++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32487,7 +33277,7 @@ index e2e5c11695a9..3a5eee57c3c6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -32651,7 +33441,7 @@ index e2e5c11695a9..3a5eee57c3c6 100644
 -
  Library("rtp_utils_gn")
 diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index 1582a42c0d4d..4c9a675fed35 100644
+index 67ed8e9a461d..7cd0a0f85eea 100644
 --- third_party/libwebrtc/media/stream_params_gn/moz.build
 +++ third_party/libwebrtc/media/stream_params_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32674,7 +33464,7 @@ index 1582a42c0d4d..4c9a675fed35 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -32837,8 +33627,880 @@ index 1582a42c0d4d..4c9a675fed35 100644
 -    DEFINES["_GNU_SOURCE"] = True
 -
  Library("stream_params_gn")
+diff --git third_party/libwebrtc/media/video_adapter_gn/moz.build third_party/libwebrtc/media/video_adapter_gn/moz.build
+index 1ce6badaf84c..87e2c14c5774 100644
+--- third_party/libwebrtc/media/video_adapter_gn/moz.build
++++ third_party/libwebrtc/media/video_adapter_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("video_adapter_gn")
+diff --git third_party/libwebrtc/media/video_broadcaster_gn/moz.build third_party/libwebrtc/media/video_broadcaster_gn/moz.build
+index c1ebd4508d5a..851aace5f42c 100644
+--- third_party/libwebrtc/media/video_broadcaster_gn/moz.build
++++ third_party/libwebrtc/media/video_broadcaster_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("video_broadcaster_gn")
+diff --git third_party/libwebrtc/media/video_common_gn/moz.build third_party/libwebrtc/media/video_common_gn/moz.build
+index b99fdbd29446..568207bcf3e4 100644
+--- third_party/libwebrtc/media/video_common_gn/moz.build
++++ third_party/libwebrtc/media/video_common_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("video_common_gn")
+diff --git third_party/libwebrtc/media/video_source_base_gn/moz.build third_party/libwebrtc/media/video_source_base_gn/moz.build
+index b74ce609e95f..48c6de6f6cd5 100644
+--- third_party/libwebrtc/media/video_source_base_gn/moz.build
++++ third_party/libwebrtc/media/video_source_base_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-    OS_LIBS += [
+-        "log"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
+-
+-    OS_LIBS += [
+-        "crypt32",
+-        "iphlpapi",
+-        "secur32",
+-        "winmm"
+-    ]
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    CXXFLAGS += [
+-        "-mfpu=neon"
+-    ]
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_X11"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
+-
+     CXXFLAGS += [
+         "-msse2"
+     ]
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-    CXXFLAGS += [
+-        "-msse2"
+-    ]
++if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+-    DEFINES["_GNU_SOURCE"] = True
++    DEFINES["USE_X11"] = "1"
+ 
+ Library("video_source_base_gn")
 diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index dfff9870432d..b34d55194ffa 100644
+index 495a5d8cac13..cbf73a5b937e 100644
 --- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -32861,7 +34523,7 @@ index dfff9870432d..b34d55194ffa 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -33056,7 +34718,7 @@ index dfff9870432d..b34d55194ffa 100644
  
  Library("async_audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 88fa77a0e25d..1beb494d070e 100644
+index 995b2a2a3b31..867012af59fb 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33079,7 +34741,7 @@ index 88fa77a0e25d..1beb494d070e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -33278,7 +34940,7 @@ index 88fa77a0e25d..1beb494d070e 100644
  
  Library("audio_coding_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 851dd7b58ea3..662101a6da02 100644
+index 470578709e2f..94099348743b 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33301,7 +34963,7 @@ index 851dd7b58ea3..662101a6da02 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -33465,7 +35127,7 @@ index 851dd7b58ea3..662101a6da02 100644
 -
  Library("audio_coding_module_typedefs_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index e509916cfd65..07e4babacbee 100644
+index e484426fd2ab..197384a642be 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33488,7 +35150,7 @@ index e509916cfd65..07e4babacbee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -33683,7 +35345,7 @@ index e509916cfd65..07e4babacbee 100644
  
  Library("audio_coding_opus_common_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 782941906573..7e607a103229 100644
+index 1e7e932b55da..016f8f1e2439 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33706,7 +35368,7 @@ index 782941906573..7e607a103229 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -33905,7 +35567,7 @@ index 782941906573..7e607a103229 100644
  
  Library("audio_encoder_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index de87e8b03398..af6c05a7ac37 100644
+index 92221fcca1a0..2fafe9504826 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -33928,7 +35590,7 @@ index de87e8b03398..af6c05a7ac37 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -34112,7 +35774,7 @@ index de87e8b03398..af6c05a7ac37 100644
  
  Library("audio_network_adaptor_config_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 8a371a9aaf33..2bc0c19c36ad 100644
+index cb6c943d7c37..7505b52d141f 100644
 --- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34135,7 +35797,7 @@ index 8a371a9aaf33..2bc0c19c36ad 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -53,189 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -34334,7 +35996,7 @@ index 8a371a9aaf33..2bc0c19c36ad 100644
  
  Library("audio_network_adaptor_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
-index d7928549d7d4..f37caf681b50 100644
+index a0d24b9a5d28..48d685b4f5f3 100644
 --- third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34357,7 +36019,7 @@ index d7928549d7d4..f37caf681b50 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -34556,7 +36218,7 @@ index d7928549d7d4..f37caf681b50 100644
  
  Library("default_neteq_factory_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index bedb8fc4771d..ca3e24ca4b66 100644
+index dcf3567d5c55..d969b721268a 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34579,7 +36241,7 @@ index bedb8fc4771d..ca3e24ca4b66 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -34763,7 +36425,7 @@ index bedb8fc4771d..ca3e24ca4b66 100644
  
  Library("g711_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 103d89c6d88f..5ca4c8481054 100644
+index b6962f1786ab..c37ec8d1a4f3 100644
 --- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -34786,7 +36448,7 @@ index 103d89c6d88f..5ca4c8481054 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -34981,7 +36643,7 @@ index 103d89c6d88f..5ca4c8481054 100644
  
  Library("g711_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index 48137ada8562..b91e6ceef362 100644
+index 99188c0a5833..502a17cd0e34 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35004,7 +36666,7 @@ index 48137ada8562..b91e6ceef362 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -35188,7 +36850,7 @@ index 48137ada8562..b91e6ceef362 100644
  
  Library("g722_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index 81eb8704662b..1023ae364204 100644
+index 56ac627776c9..a936eb41a9a1 100644
 --- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35211,7 +36873,7 @@ index 81eb8704662b..1023ae364204 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -35406,7 +37068,7 @@ index 81eb8704662b..1023ae364204 100644
  
  Library("g722_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
-index d3aa4e00180f..a4630b7e5435 100644
+index 9c374405df33..6e2fd6beb0d5 100644
 --- third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/ilbc_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35429,7 +37091,7 @@ index d3aa4e00180f..a4630b7e5435 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -111,189 +121,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -35628,7 +37290,7 @@ index d3aa4e00180f..a4630b7e5435 100644
  
  Library("ilbc_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
-index 9a397a1fdcf7..4a8e42c833db 100644
+index f3546882a1a3..7700d43a1597 100644
 --- third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/ilbc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35651,7 +37313,7 @@ index 9a397a1fdcf7..4a8e42c833db 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -35850,7 +37512,7 @@ index 9a397a1fdcf7..4a8e42c833db 100644
  
  Library("ilbc_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index fdfc4fc85541..dc793c09c02f 100644
+index c0b5ae4a7a4c..214b9d2bed65 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -35873,7 +37535,7 @@ index fdfc4fc85541..dc793c09c02f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -36037,7 +37699,7 @@ index fdfc4fc85541..dc793c09c02f 100644
 -
  Library("isac_bwinfo_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 1b599c5e5148..cab48c87fd99 100644
+index 15040244a118..72275c755c49 100644
 --- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36060,7 +37722,7 @@ index 1b599c5e5148..cab48c87fd99 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,174 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -36244,7 +37906,7 @@ index 1b599c5e5148..cab48c87fd99 100644
  
  Library("isac_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index b884cb8d99d1..cac379b6b793 100644
+index c03333a31981..ddbb058ccb47 100644
 --- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36267,7 +37929,7 @@ index b884cb8d99d1..cac379b6b793 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -36462,7 +38124,7 @@ index b884cb8d99d1..cac379b6b793 100644
  
  Library("legacy_encoded_audio_frame_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 834a8d1265d4..57d0a614a954 100644
+index a017d70518e7..63842535376f 100644
 --- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36485,9 +38147,9 @@ index 834a8d1265d4..57d0a614a954 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -78,189 +88,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -77,189 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36684,7 +38346,7 @@ index 834a8d1265d4..57d0a614a954 100644
  
  Library("neteq_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index ef0c150cb8b7..929298145fe6 100644
+index 1e7a8e8f6560..3763b892f8c5 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36707,7 +38369,7 @@ index ef0c150cb8b7..929298145fe6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -36891,7 +38553,7 @@ index ef0c150cb8b7..929298145fe6 100644
  
  Library("pcm16b_c_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index a1d9c8009d63..f2c0266976ea 100644
+index 2a2a2542335b..f79075092c57 100644
 --- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -36914,7 +38576,7 @@ index a1d9c8009d63..f2c0266976ea 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -37109,7 +38771,7 @@ index a1d9c8009d63..f2c0266976ea 100644
  
  Library("pcm16b_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index ab0d8129bb7d..7f59f0ce2a61 100644
+index 02ef2ce08e9c..9e46d6913b16 100644
 --- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37132,7 +38794,7 @@ index ab0d8129bb7d..7f59f0ce2a61 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -37331,7 +38993,7 @@ index ab0d8129bb7d..7f59f0ce2a61 100644
  
  Library("red_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index d077aaa930c2..644ed46e25af 100644
+index 02f3bf49e1c1..2302a1064808 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -37354,7 +39016,7 @@ index d077aaa930c2..644ed46e25af 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -37553,7 +39215,7 @@ index d077aaa930c2..644ed46e25af 100644
  
  Library("webrtc_cng_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index d48fd6817440..2cdd2e8966cc 100644
+index 9665cd22c68e..010763da2910 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
 @@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -37579,7 +39241,7 @@ index d48fd6817440..2cdd2e8966cc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,185 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -37774,7 +39436,7 @@ index d48fd6817440..2cdd2e8966cc 100644
  
  Library("webrtc_multiopus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index 02986beaa4e3..b9964a572e72 100644
+index 2d219b5cc091..9409b7e3fdee 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
 @@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -37800,7 +39462,7 @@ index 02986beaa4e3..b9964a572e72 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,189 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -37999,7 +39661,7 @@ index 02986beaa4e3..b9964a572e72 100644
  
  Library("webrtc_opus_gn")
 diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index e6c31b48b55c..75cf2ac66f90 100644
+index 4c1faef88198..b2e255ce3d6e 100644
 --- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
 @@ -12,14 +12,24 @@ AllowCompilerWarnings()
@@ -38025,7 +39687,7 @@ index e6c31b48b55c..75cf2ac66f90 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,185 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -38220,7 +39882,7 @@ index e6c31b48b55c..75cf2ac66f90 100644
  
  Library("webrtc_opus_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 4128efbbf853..9c87f7c0eb47 100644
+index acd3896de105..f0da29e5d200 100644
 --- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -38243,7 +39905,7 @@ index 4128efbbf853..9c87f7c0eb47 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -38407,7 +40069,7 @@ index 4128efbbf853..9c87f7c0eb47 100644
 -
  Library("audio_device_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index cc60512cdabe..76eea8d6f4b7 100644
+index 24bd59bd5356..67fb1a20b25e 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -38430,7 +40092,7 @@ index cc60512cdabe..76eea8d6f4b7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -38629,7 +40291,7 @@ index cc60512cdabe..76eea8d6f4b7 100644
  
  Library("audio_frame_manipulator_gn")
 diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 65959399415c..7e31717972c2 100644
+index c32088c064a8..7bf6880e3e0f 100644
 --- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -38653,7 +40315,7 @@ index 65959399415c..7e31717972c2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -38852,7 +40514,7 @@ index 65959399415c..7e31717972c2 100644
  
  Library("audio_mixer_impl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index 7435b6a4572e..45caaf66c9d3 100644
+index f994d264fc0d..0c5c8a020d6e 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -38875,7 +40537,7 @@ index 7435b6a4572e..45caaf66c9d3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -39043,7 +40705,7 @@ index 7435b6a4572e..45caaf66c9d3 100644
 -
  Library("adaptive_fir_filter_erl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 0d2471073d20..7f00a42dad1a 100644
+index bfab3391fd95..91c95c95d416 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39066,7 +40728,7 @@ index 0d2471073d20..7f00a42dad1a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -39245,7 +40907,7 @@ index 0d2471073d20..7f00a42dad1a 100644
 -
  Library("adaptive_fir_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index f9844b65210b..8581bbea27b3 100644
+index b8c459326a74..3b08188a5f58 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
 @@ -17,13 +17,23 @@ CXXFLAGS += [
@@ -39270,7 +40932,7 @@ index f9844b65210b..8581bbea27b3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -54,137 +64,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -39414,7 +41076,7 @@ index f9844b65210b..8581bbea27b3 100644
  
  Library("aec3_avx2_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index 8d9c4e6bd7f2..644f510a92b4 100644
+index 8c8af7ad0246..a706c74c28dd 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39437,7 +41099,7 @@ index 8d9c4e6bd7f2..644f510a92b4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -39601,7 +41263,7 @@ index 8d9c4e6bd7f2..644f510a92b4 100644
 -
  Library("aec3_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index d403ae8b96d1..b39c407de26b 100644
+index f29e37596167..a2b558b015d0 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -39624,7 +41286,7 @@ index d403ae8b96d1..b39c407de26b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -39803,7 +41465,7 @@ index d403ae8b96d1..b39c407de26b 100644
 -
  Library("aec3_fft_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 85e56542311d..0ef6f85dcfa2 100644
+index b984c66872a1..d3a048865141 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -39827,7 +41489,7 @@ index 85e56542311d..0ef6f85dcfa2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -100,189 +110,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40026,7 +41688,7 @@ index 85e56542311d..0ef6f85dcfa2 100644
  
  Library("aec3_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index aa1aaf15d9cf..a04b6dc8ae72 100644
+index 636d54205ecc..f3c9e69d0679 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40049,7 +41711,7 @@ index aa1aaf15d9cf..a04b6dc8ae72 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40217,7 +41879,7 @@ index aa1aaf15d9cf..a04b6dc8ae72 100644
 -
  Library("fft_data_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index 0ebdb0798f34..1fb2bf245b0b 100644
+index 0399096915b4..d38d62bb9ca0 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40240,7 +41902,7 @@ index 0ebdb0798f34..1fb2bf245b0b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40408,7 +42070,7 @@ index 0ebdb0798f34..1fb2bf245b0b 100644
 -
  Library("matched_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index 6444c3137ffb..080f579f017c 100644
+index 52ec8e5f7dfc..de62aae422cb 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40431,7 +42093,7 @@ index 6444c3137ffb..080f579f017c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40599,7 +42261,7 @@ index 6444c3137ffb..080f579f017c 100644
 -
  Library("render_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 9cf3a7842afc..8d526768fe2b 100644
+index 712a4c357172..5c642468adb2 100644
 --- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40622,7 +42284,7 @@ index 9cf3a7842afc..8d526768fe2b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40790,7 +42452,7 @@ index 9cf3a7842afc..8d526768fe2b 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 13420467de7a..4fd80b10de2e 100644
+index 198f71db4371..3a94c3362f81 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -40813,7 +42475,7 @@ index 13420467de7a..4fd80b10de2e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -40988,7 +42650,7 @@ index 13420467de7a..4fd80b10de2e 100644
 -
  Library("aec_dump_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index 4e8b16442dd6..29c503fd1b35 100644
+index ad723168abdc..97e0d9709187 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41011,7 +42673,7 @@ index 4e8b16442dd6..29c503fd1b35 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -41206,7 +42868,7 @@ index 4e8b16442dd6..29c503fd1b35 100644
  
  Library("null_aec_dump_factory_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 89ae50807341..336b06122354 100644
+index ef89571beeca..8ae46e8c3f1e 100644
 --- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41229,7 +42891,7 @@ index 89ae50807341..336b06122354 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -41424,7 +43086,7 @@ index 89ae50807341..336b06122354 100644
  
  Library("aec_dump_interface_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index ca3ffeb81e25..4dec482b58ab 100644
+index fc1a743ada41..575c93715eed 100644
 --- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41447,7 +43109,7 @@ index ca3ffeb81e25..4dec482b58ab 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,117 +54,7 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -41708,7 +43370,7 @@ index ca3ffeb81e25..4dec482b58ab 100644
 +
  Library("aecm_core_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index f26489f41313..0bf849711117 100644
+index c365d8251091..69cf5b32c800 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -41732,7 +43394,7 @@ index f26489f41313..0bf849711117 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -41931,7 +43593,7 @@ index f26489f41313..0bf849711117 100644
  
  Library("agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index ebf241f7a5db..81bfd7afd255 100644
+index 7f018adae5f0..c9930a29880f 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -41954,7 +43616,7 @@ index ebf241f7a5db..81bfd7afd255 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -42118,7 +43780,7 @@ index ebf241f7a5db..81bfd7afd255 100644
 -
  Library("gain_control_interface_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index aa5c6835cc92..7780faadc89c 100644
+index d129ca31f30f..9e5843ca9d55 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42141,7 +43803,7 @@ index aa5c6835cc92..7780faadc89c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -42340,7 +44002,7 @@ index aa5c6835cc92..7780faadc89c 100644
  
  Library("legacy_agc_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index a27255566212..6a905df4ed20 100644
+index 1b5ce0bb9058..94838195a243 100644
 --- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42363,7 +44025,7 @@ index a27255566212..6a905df4ed20 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -42562,7 +44224,7 @@ index a27255566212..6a905df4ed20 100644
  
  Library("level_estimation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index 5e3b5801ad2e..2c59f64717cf 100644
+index 301502022710..9d3e621ef2c1 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -42586,7 +44248,7 @@ index 5e3b5801ad2e..2c59f64717cf 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -42785,7 +44447,7 @@ index 5e3b5801ad2e..2c59f64717cf 100644
  
  Library("adaptive_digital_gain_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index d9520efe2fad..c8a383c619f6 100644
+index fe132f5f694c..35f0c449d032 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -42808,7 +44470,7 @@ index d9520efe2fad..c8a383c619f6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -42996,7 +44658,7 @@ index d9520efe2fad..c8a383c619f6 100644
  
  Library("biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index dbf53e8e8edd..8859fbd93187 100644
+index ae1541ded6d8..9e7828c0e215 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43019,7 +44681,7 @@ index dbf53e8e8edd..8859fbd93187 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -43218,7 +44880,7 @@ index dbf53e8e8edd..8859fbd93187 100644
  
  Library("clipping_predictor_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 44307f414752..bd6ed025dd1e 100644
+index 64f1d62c2def..057a01c35050 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43241,7 +44903,7 @@ index 44307f414752..bd6ed025dd1e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -43405,7 +45067,7 @@ index 44307f414752..bd6ed025dd1e 100644
 -
  Library("common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index e842cac9c346..638f16d62cad 100644
+index bc5907abea35..4ddef798f043 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43428,7 +45090,7 @@ index e842cac9c346..638f16d62cad 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -43627,7 +45289,7 @@ index e842cac9c346..638f16d62cad 100644
  
  Library("cpu_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index 60614d4cc1af..0dc44f1fda4d 100644
+index ed716566a46d..b746c1697b38 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -43651,7 +45313,7 @@ index 60614d4cc1af..0dc44f1fda4d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -43850,7 +45512,7 @@ index 60614d4cc1af..0dc44f1fda4d 100644
  
  Library("fixed_digital_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 691900e3567c..c8dc6b50f073 100644
+index 3f2132cc91d8..d80bca19c048 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -43873,7 +45535,7 @@ index 691900e3567c..c8dc6b50f073 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -44061,7 +45723,7 @@ index 691900e3567c..c8dc6b50f073 100644
  
  Library("gain_applier_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index ee04e973fbc1..910e1f47a627 100644
+index 9736df45221e..1b5b649273c9 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44084,7 +45746,7 @@ index ee04e973fbc1..910e1f47a627 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -44248,7 +45910,7 @@ index ee04e973fbc1..910e1f47a627 100644
 -
  Library("gain_map_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index 0bde4db9d450..ae8b8ea97657 100644
+index cd4bf219463d..b3d639b758c3 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -44272,7 +45934,7 @@ index 0bde4db9d450..ae8b8ea97657 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -44471,7 +46133,7 @@ index 0bde4db9d450..ae8b8ea97657 100644
  
  Library("input_volume_controller_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index b7d0a9ba8891..d92108c59272 100644
+index 59a271492490..d57ecd1e8c07 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44494,7 +46156,7 @@ index b7d0a9ba8891..d92108c59272 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -44689,7 +46351,7 @@ index b7d0a9ba8891..d92108c59272 100644
  
  Library("input_volume_stats_reporter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index 210539ab46ff..2057bc49645f 100644
+index bce906f682e9..4fb8352cdf6d 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -44713,7 +46375,7 @@ index 210539ab46ff..2057bc49645f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -44912,7 +46574,7 @@ index 210539ab46ff..2057bc49645f 100644
  
  Library("noise_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 7965a026ef10..a6688f3d2880 100644
+index 06d77c98fdb8..eacf88cb2c77 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -44935,7 +46597,7 @@ index 7965a026ef10..a6688f3d2880 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -45134,7 +46796,7 @@ index 7965a026ef10..a6688f3d2880 100644
  
  Library("rnn_vad_auto_correlation_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index bdfe90cf1641..7a188fed0014 100644
+index 9c27c5284f73..4a2e5ece584d 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45157,7 +46819,7 @@ index bdfe90cf1641..7a188fed0014 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -45336,7 +46998,7 @@ index bdfe90cf1641..7a188fed0014 100644
 -
  Library("rnn_vad_common_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 6a73ce96e470..06b7c1408598 100644
+index c06de8a64d6b..5a79d30a9da3 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45359,7 +47021,7 @@ index 6a73ce96e470..06b7c1408598 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -45558,7 +47220,7 @@ index 6a73ce96e470..06b7c1408598 100644
  
  Library("rnn_vad_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index 27b40f13a545..23a0102c4071 100644
+index 68a10c5f8ca5..c905cd958ae1 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45581,7 +47243,7 @@ index 27b40f13a545..23a0102c4071 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -45780,7 +47442,7 @@ index 27b40f13a545..23a0102c4071 100644
  
  Library("rnn_vad_layers_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index d66ed412b2bc..58600753bf59 100644
+index 8d629f368af1..79d839518c86 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -45803,7 +47465,7 @@ index d66ed412b2bc..58600753bf59 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -45991,7 +47653,7 @@ index d66ed412b2bc..58600753bf59 100644
  
  Library("rnn_vad_lp_residual_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index 0ddc85f5ac1e..76f782e606d1 100644
+index 89a8148e73b2..989a69261a88 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46014,7 +47676,7 @@ index 0ddc85f5ac1e..76f782e606d1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -46213,7 +47875,7 @@ index 0ddc85f5ac1e..76f782e606d1 100644
  
  Library("rnn_vad_pitch_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index 25e813a226e6..aeba82350dcf 100644
+index a650860e3ed1..d64690a99e7e 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46236,7 +47898,7 @@ index 25e813a226e6..aeba82350dcf 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -46404,7 +48066,7 @@ index 25e813a226e6..aeba82350dcf 100644
 -
  Library("rnn_vad_ring_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index f54dd88a23c6..941c1d83c87a 100644
+index 33988b17e143..790be6232bb6 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46427,7 +48089,7 @@ index f54dd88a23c6..941c1d83c87a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -46595,7 +48257,7 @@ index f54dd88a23c6..941c1d83c87a 100644
 -
  Library("rnn_vad_sequence_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index d8b88047d758..d120c6a00f95 100644
+index 1e27faa5870d..a3b90470369b 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46618,7 +48280,7 @@ index d8b88047d758..d120c6a00f95 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -46817,7 +48479,7 @@ index d8b88047d758..d120c6a00f95 100644
  
  Library("rnn_vad_spectral_features_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index 4a3c5bf28b24..bea61cc9a325 100644
+index 6ffad4636659..ecf6e2b21491 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -46840,7 +48502,7 @@ index 4a3c5bf28b24..bea61cc9a325 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -47008,7 +48670,7 @@ index 4a3c5bf28b24..bea61cc9a325 100644
 -
  Library("rnn_vad_symmetric_matrix_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index 01313fa46097..176b86944ca2 100644
+index 38fbb48de3fe..3c36b3d1087c 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
 @@ -17,12 +17,22 @@ CXXFLAGS += [
@@ -47032,7 +48694,7 @@ index 01313fa46097..176b86944ca2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -49,137 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -47176,7 +48838,7 @@ index 01313fa46097..176b86944ca2 100644
  
  Library("vector_math_avx2_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index 3f889133092c..8d526768fe2b 100644
+index d3bb22b9a525..5c642468adb2 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47199,7 +48861,7 @@ index 3f889133092c..8d526768fe2b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -47378,7 +49040,7 @@ index 3f889133092c..8d526768fe2b 100644
 -
  Library("vector_math_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index 6562d840b746..7a45c00e5966 100644
+index 271c46c540d7..aebdf4b8ac28 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -47402,7 +49064,7 @@ index 6562d840b746..7a45c00e5966 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,189 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -47601,7 +49263,7 @@ index 6562d840b746..7a45c00e5966 100644
  
  Library("saturation_protector_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index 3afaa88450fa..eee602cf0088 100644
+index cfb4bb80840a..da5dfc59ec93 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -47625,7 +49287,7 @@ index 3afaa88450fa..eee602cf0088 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -47824,7 +49486,7 @@ index 3afaa88450fa..eee602cf0088 100644
  
  Library("speech_level_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index 3aa09832b239..dbe8fdf62b34 100644
+index 00e3216b4597..8f4f2eb9cd09 100644
 --- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -47847,7 +49509,7 @@ index 3aa09832b239..dbe8fdf62b34 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -48046,7 +49708,7 @@ index 3aa09832b239..dbe8fdf62b34 100644
  
  Library("vad_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/api_gn/moz.build third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
-index 37e50af014ef..02a5a5977fb2 100644
+index e0d5597d5605..73327af215a3 100644
 --- third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48069,7 +49731,7 @@ index 37e50af014ef..02a5a5977fb2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -48264,7 +49926,7 @@ index 37e50af014ef..02a5a5977fb2 100644
  
  Library("api_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index 53fd9d9f9456..7d069ced5f05 100644
+index 9b5e11e947d9..1bd5feb70d36 100644
 --- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -48288,7 +49950,7 @@ index 53fd9d9f9456..7d069ced5f05 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -48487,7 +50149,7 @@ index 53fd9d9f9456..7d069ced5f05 100644
  
  Library("apm_logging_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 2087aeb9093f..07b14b4ad557 100644
+index 986ecc61c766..3d9e6a75e276 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -48511,7 +50173,7 @@ index 2087aeb9093f..07b14b4ad557 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,189 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -48710,7 +50372,7 @@ index 2087aeb9093f..07b14b4ad557 100644
  
  Library("audio_buffer_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 737ca5e83456..244e4b9f1e17 100644
+index 894361b57458..c605bd008d4e 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48733,7 +50395,7 @@ index 737ca5e83456..244e4b9f1e17 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -48928,7 +50590,7 @@ index 737ca5e83456..244e4b9f1e17 100644
  
  Library("audio_frame_proxies_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index b7391a78b169..e6ffd17bd131 100644
+index 7a283f1e109a..e9b1dc9e853e 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -48951,7 +50613,7 @@ index b7391a78b169..e6ffd17bd131 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -49119,7 +50781,7 @@ index b7391a78b169..e6ffd17bd131 100644
 -
  Library("audio_frame_view_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 5b4f4d5d5446..2d073c5534c0 100644
+index 4acaa7f014eb..66c1eab00fc1 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -49143,7 +50805,7 @@ index 5b4f4d5d5446..2d073c5534c0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -49342,7 +51004,7 @@ index 5b4f4d5d5446..2d073c5534c0 100644
  
  Library("audio_processing_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
-index 6b3e54c3f7f4..a1efc9d29d6b 100644
+index 4f36694047af..1fac698b31d9 100644
 --- third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/audio_processing_statistics_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -49365,7 +51027,7 @@ index 6b3e54c3f7f4..a1efc9d29d6b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -49549,7 +51211,7 @@ index 6b3e54c3f7f4..a1efc9d29d6b 100644
  
  Library("audio_processing_statistics_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index ad198344e2b8..2d0cb60d35c2 100644
+index ba0901058580..d8273687ada4 100644
 --- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -49572,7 +51234,7 @@ index ad198344e2b8..2d0cb60d35c2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -49771,7 +51433,7 @@ index ad198344e2b8..2d0cb60d35c2 100644
  
  Library("capture_levels_adjuster_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index ab31e685646b..2309786d2b1c 100644
+index 2fd9b99a64df..62d3f34fa3be 100644
 --- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -49795,7 +51457,7 @@ index ab31e685646b..2309786d2b1c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -49994,7 +51656,7 @@ index ab31e685646b..2309786d2b1c 100644
  
  Library("gain_controller2_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index af06d4142f2e..441defcc49c4 100644
+index 09d5dc988247..ce4fc0c9b48a 100644
 --- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50017,7 +51679,7 @@ index af06d4142f2e..441defcc49c4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -50216,7 +51878,7 @@ index af06d4142f2e..441defcc49c4 100644
  
  Library("high_pass_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index ac1c19134ab7..eb8ba5a7bc73 100644
+index 93c673ef1703..87ffa3a5cf65 100644
 --- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -50240,7 +51902,7 @@ index ac1c19134ab7..eb8ba5a7bc73 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -56,189 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -50439,7 +52101,7 @@ index ac1c19134ab7..eb8ba5a7bc73 100644
  
  Library("ns_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
-index da2a1b7ae331..67ab6a2a8454 100644
+index 0af06a9c3544..8e0e151a81c8 100644
 --- third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/optionally_built_submodule_creators_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50462,7 +52124,7 @@ index da2a1b7ae331..67ab6a2a8454 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -50661,7 +52323,7 @@ index da2a1b7ae331..67ab6a2a8454 100644
  
  Library("optionally_built_submodule_creators_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index d0c4b2bd8ed0..54810dea2903 100644
+index 8b21dc34fd6c..3a7dc84732d1 100644
 --- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50684,7 +52346,7 @@ index d0c4b2bd8ed0..54810dea2903 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -50872,7 +52534,7 @@ index d0c4b2bd8ed0..54810dea2903 100644
  
  Library("rms_level_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
-index 44571715b8e4..1ee08a185597 100644
+index f3ccbefcdb8e..53e064f05b08 100644
 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -50895,7 +52557,7 @@ index 44571715b8e4..1ee08a185597 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -51059,7 +52721,7 @@ index 44571715b8e4..1ee08a185597 100644
 -
  Library("transient_suppressor_api_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
-index d700fc1a32bc..21fd63ba8c66 100644
+index 0ec5dcb6c535..b42e3cf6c30e 100644
 --- third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/transient/transient_suppressor_impl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51082,7 +52744,7 @@ index d700fc1a32bc..21fd63ba8c66 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -51281,7 +52943,7 @@ index d700fc1a32bc..21fd63ba8c66 100644
  
  Library("transient_suppressor_impl_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
-index c67675f43128..a816267ba48b 100644
+index 50a6a9d55ce5..418e3f81e786 100644
 --- third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/transient/voice_probability_delay_unit_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51304,7 +52966,7 @@ index c67675f43128..a816267ba48b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -51492,7 +53154,7 @@ index c67675f43128..a816267ba48b 100644
  
  Library("voice_probability_delay_unit_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index b6566a8950b5..f5811a132b51 100644
+index f1b3493b7a96..93278d71202e 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51515,7 +53177,7 @@ index b6566a8950b5..f5811a132b51 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -51703,7 +53365,7 @@ index b6566a8950b5..f5811a132b51 100644
  
  Library("cascaded_biquad_filter_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index c20d5b618927..c97c6e245e5c 100644
+index 12b385e2e905..fc6f3d337810 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51726,7 +53388,7 @@ index c20d5b618927..c97c6e245e5c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,178 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -51914,7 +53576,7 @@ index c20d5b618927..c97c6e245e5c 100644
  
  Library("legacy_delay_estimator_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index 936decab70ac..c3d938676efc 100644
+index f1e1bc555af4..7ef8884828c3 100644
 --- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -51937,7 +53599,7 @@ index 936decab70ac..c3d938676efc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -52125,7 +53787,7 @@ index 936decab70ac..c3d938676efc 100644
  
  Library("pffft_wrapper_gn")
 diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index 0ae31f5a2e27..951669e227b5 100644
+index 4794a478e8a0..8cf74ef26590 100644
 --- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 +++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52148,7 +53810,7 @@ index 0ae31f5a2e27..951669e227b5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,189 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -52347,7 +54009,7 @@ index 0ae31f5a2e27..951669e227b5 100644
  
  Library("vad_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 1190193b94b9..ca0e2eb0d4f3 100644
+index 59d06c939618..1fda98e1fc3f 100644
 --- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52370,7 +54032,7 @@ index 1190193b94b9..ca0e2eb0d4f3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -52570,7 +54232,7 @@ index 1190193b94b9..ca0e2eb0d4f3 100644
  
  Library("congestion_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index 40fd1189aa13..7b699b35ae1c 100644
+index 2a3d216e40c0..099616509cba 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -52593,7 +54255,7 @@ index 40fd1189aa13..7b699b35ae1c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -52788,7 +54450,7 @@ index 40fd1189aa13..7b699b35ae1c 100644
  
  Library("alr_detector_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index e2087c61261d..ef4afa64817b 100644
+index b138b59fc656..7e2398647c6a 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -52811,7 +54473,7 @@ index e2087c61261d..ef4afa64817b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -53011,7 +54673,7 @@ index e2087c61261d..ef4afa64817b 100644
  
  Library("delay_based_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index 7b77d3dc865c..5d3384990b73 100644
+index 47ee346c89e8..2bd76ccbe13d 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53034,7 +54696,7 @@ index 7b77d3dc865c..5d3384990b73 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -49,189 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -53233,7 +54895,7 @@ index 7b77d3dc865c..5d3384990b73 100644
  
  Library("estimators_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 0e5182a469ec..e5abebc8e438 100644
+index fa641fccfe18..fc883ee32524 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53256,7 +54918,7 @@ index 0e5182a469ec..e5abebc8e438 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -53456,7 +55118,7 @@ index 0e5182a469ec..e5abebc8e438 100644
  
  Library("goog_cc_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index 04b78b5988c0..bf9b47761a6b 100644
+index d229d732df78..f1c13c16cc7d 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -53479,7 +55141,7 @@ index 04b78b5988c0..bf9b47761a6b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -53667,7 +55329,7 @@ index 04b78b5988c0..bf9b47761a6b 100644
  
  Library("link_capacity_estimator_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-index d290fbe9ecfd..92f384be816c 100644
+index 8065861f7854..efe50771e696 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -53690,7 +55352,7 @@ index d290fbe9ecfd..92f384be816c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -53885,7 +55547,7 @@ index d290fbe9ecfd..92f384be816c 100644
  
  Library("loss_based_bwe_v1_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index 709bcdb93719..3a63a38d3def 100644
+index 72c625902ca3..ce9cd35cdad2 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -53908,7 +55570,7 @@ index 709bcdb93719..3a63a38d3def 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -54107,7 +55769,7 @@ index 709bcdb93719..3a63a38d3def 100644
  
  Library("loss_based_bwe_v2_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 049ac6f47712..e3ef5aa27c28 100644
+index cb2bc83d2850..1da5621be1e2 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54130,7 +55792,7 @@ index 049ac6f47712..e3ef5aa27c28 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -54325,7 +55987,7 @@ index 049ac6f47712..e3ef5aa27c28 100644
  
  Library("probe_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index 6e1d0acff555..d0ba53b314f1 100644
+index af00c0132302..35073ee314de 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54348,7 +56010,7 @@ index 6e1d0acff555..d0ba53b314f1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -54543,7 +56205,7 @@ index 6e1d0acff555..d0ba53b314f1 100644
  
  Library("pushback_controller_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index 08cfdec69bc0..c2c328ca1180 100644
+index 52323451eb32..bbdcd96a5813 100644
 --- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -54566,7 +56228,7 @@ index 08cfdec69bc0..c2c328ca1180 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -54765,7 +56427,7 @@ index 08cfdec69bc0..c2c328ca1180 100644
  
  Library("send_side_bwe_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index 62800e263d1a..bb0f0dcf3f16 100644
+index 9226c07dda23..7ccf74c4df65 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -54788,7 +56450,7 @@ index 62800e263d1a..bb0f0dcf3f16 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -54988,7 +56650,7 @@ index 62800e263d1a..bb0f0dcf3f16 100644
  
  Library("control_handler_gn")
 diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index 41f64326b268..341ba2492f8d 100644
+index c2b8fead8d15..fb3cad9e95c0 100644
 --- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 +++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -55011,7 +56673,7 @@ index 41f64326b268..341ba2492f8d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -55210,7 +56872,7 @@ index 41f64326b268..341ba2492f8d 100644
  
  Library("transport_feedback_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index e02d81561426..ab560df6adc1 100644
+index c876f525cb70..577bf75c2d2a 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -55234,7 +56896,7 @@ index e02d81561426..ab560df6adc1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,113 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -55356,7 +57018,7 @@ index e02d81561426..ab560df6adc1 100644
 -
  Library("desktop_capture_differ_sse2_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 3f0146acbf6f..166be4e7ceb6 100644
+index a4fb8b3162bd..f70faede2fba 100644
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
 @@ -14,11 +14,21 @@ AllowCompilerWarnings()
@@ -55379,7 +57041,7 @@ index 3f0146acbf6f..166be4e7ceb6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -70,188 +80,13 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -55987,7 +57649,7 @@ index 3f0146acbf6f..166be4e7ceb6 100644
  Library("desktop_capture_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 deleted file mode 100644
-index 3b34c0cc8b0b..000000000000
+index 6b5cd9286eb3..000000000000
 --- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
 +++ /dev/null
 @@ -1,77 +0,0 @@
@@ -56021,7 +57683,7 @@ index 3b34c0cc8b0b..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -56069,7 +57731,7 @@ index 3b34c0cc8b0b..000000000000
 -
 -Library("desktop_capture_objc_gn")
 diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 3a663949bb31..515a6b7fe6df 100644
+index 927926f3e987..a578fb9b17ec 100644
 --- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 +++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56092,7 +57754,7 @@ index 3a663949bb31..515a6b7fe6df 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -49,168 +59,31 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -56269,7 +57931,7 @@ index 3a663949bb31..515a6b7fe6df 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 7613736af280..021306b00c2a 100644
+index 9b77a009fa9e..92a813cfb85e 100644
 --- third_party/libwebrtc/modules/module_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56292,7 +57954,7 @@ index 7613736af280..021306b00c2a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -56456,7 +58118,7 @@ index 7613736af280..021306b00c2a 100644
 -
  Library("module_api_gn")
 diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index c40e3cf5e935..03a6663f2ee5 100644
+index 474dec612359..81d04236da2b 100644
 --- third_party/libwebrtc/modules/module_api_public_gn/moz.build
 +++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56479,7 +58141,7 @@ index c40e3cf5e935..03a6663f2ee5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -56643,7 +58305,7 @@ index c40e3cf5e935..03a6663f2ee5 100644
 -
  Library("module_api_public_gn")
 diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index 86a280e5ccc9..8f331e2b7df5 100644
+index b69c69c3118c..05c37b4ffe8b 100644
 --- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
 +++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56666,7 +58328,7 @@ index 86a280e5ccc9..8f331e2b7df5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -56830,7 +58492,7 @@ index 86a280e5ccc9..8f331e2b7df5 100644
 -
  Library("module_fec_api_gn")
 diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index 8bb44ecf6256..e46741806ee3 100644
+index 2e3ab3d9878e..8cefa46cec03 100644
 --- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -56853,7 +58515,7 @@ index 8bb44ecf6256..e46741806ee3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -57041,7 +58703,7 @@ index 8bb44ecf6256..e46741806ee3 100644
  
  Library("interval_budget_gn")
 diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index 353f876c55bc..453c5e0ead44 100644
+index d7aa189ef37b..ba9c8323abb3 100644
 --- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 +++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57064,7 +58726,7 @@ index 353f876c55bc..453c5e0ead44 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,190 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -57264,7 +58926,7 @@ index 353f876c55bc..453c5e0ead44 100644
  
  Library("pacing_gn")
 diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
-index 2760d7e5e125..309f14a69dc0 100644
+index 93af22612ea0..d0d2d4a27fe2 100644
 --- third_party/libwebrtc/modules/portal/portal_gn/moz.build
 +++ third_party/libwebrtc/modules/portal/portal_gn/moz.build
 @@ -14,22 +14,18 @@ AllowCompilerWarnings()
@@ -57318,7 +58980,7 @@ index 2760d7e5e125..309f14a69dc0 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index 45104d15ca46..54de56dcae4e 100644
+index eab6f3f9d0fc..473f820cccd1 100644
 --- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -57341,7 +59003,7 @@ index 45104d15ca46..54de56dcae4e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -55,189 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -57540,7 +59202,7 @@ index 45104d15ca46..54de56dcae4e 100644
  
  Library("remote_bitrate_estimator_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index e42ea18507b3..8a8bd3e82b3a 100644
+index 6e1dfd18c099..42e99603f4f1 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57563,7 +59225,7 @@ index e42ea18507b3..8a8bd3e82b3a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -57747,7 +59409,7 @@ index e42ea18507b3..8a8bd3e82b3a 100644
  
  Library("leb128_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index 33d8799fb2bd..6a99f50c5c90 100644
+index b3425d3e67cf..e794e8940e60 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -57770,7 +59432,7 @@ index 33d8799fb2bd..6a99f50c5c90 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -85,189 +95,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -57969,7 +59631,7 @@ index 33d8799fb2bd..6a99f50c5c90 100644
  
  Library("rtp_rtcp_format_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index 8c4973643632..b9118e1215cd 100644
+index 517121987519..52af37433103 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
 @@ -13,11 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
@@ -57992,7 +59654,7 @@ index 8c4973643632..b9118e1215cd 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -98,190 +108,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -58192,7 +59854,7 @@ index 8c4973643632..b9118e1215cd 100644
  
  Library("rtp_rtcp_gn")
 diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index d2a102cfe3a1..172b2829c241 100644
+index bdee5bedc6db..1e2ecfd55661 100644
 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58215,7 +59877,7 @@ index d2a102cfe3a1..172b2829c241 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -58410,7 +60072,7 @@ index d2a102cfe3a1..172b2829c241 100644
  
  Library("rtp_video_header_gn")
 diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index c260743e2819..393d9c9b7322 100644
+index 9afa4154ee37..d211f0d4e0c2 100644
 --- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58433,7 +60095,7 @@ index c260743e2819..393d9c9b7322 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -58617,7 +60279,7 @@ index c260743e2819..393d9c9b7322 100644
  
  Library("fft_gn")
 diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index c2d2597a21a5..76439cf53388 100644
+index 2fa1910cc844..6accc1d41aba 100644
 --- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58640,7 +60302,7 @@ index c2d2597a21a5..76439cf53388 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -58824,7 +60486,7 @@ index c2d2597a21a5..76439cf53388 100644
  
  Library("g711_3p_gn")
 diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 468cc88c65a5..169ba1ccf906 100644
+index d1ff3aaad348..f7b9d5799283 100644
 --- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 +++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -58847,7 +60509,7 @@ index 468cc88c65a5..169ba1ccf906 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,174 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -59031,7 +60693,7 @@ index 468cc88c65a5..169ba1ccf906 100644
  
  Library("g722_3p_gn")
 diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index 6c17ac236e23..dda03191e506 100644
+index 97d828d64fc1..bd10964445c7 100644
 --- third_party/libwebrtc/modules/utility/utility_gn/moz.build
 +++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59054,7 +60716,7 @@ index 6c17ac236e23..dda03191e506 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,115 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -59236,7 +60898,7 @@ index 6c17ac236e23..dda03191e506 100644
 -
  Library("utility_gn")
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index f58aa8e782f0..a2ba3c8ac944 100644
+index 6af27f618bcd..d418565bbd05 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
 @@ -14,11 +14,21 @@ AllowCompilerWarnings()
@@ -59259,7 +60921,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -33,6 +43,10 @@ LOCAL_INCLUDES += [
  ]
@@ -59272,7 +60934,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
      "/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
  ]
  
-@@ -45,153 +59,13 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,152 +59,13 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59292,7 +60954,6 @@ index f58aa8e782f0..a2ba3c8ac944 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -59427,7 +61088,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
  
      LOCAL_INCLUDES += [
          "/gfx/angle/checkout/include/",
-@@ -210,76 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -209,76 +84,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -59507,7 +61168,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
  
      LOCAL_INCLUDES += [
          "/gfx/angle/checkout/include/",
-@@ -298,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -297,10 +107,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -59519,7 +61180,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
  
      LOCAL_INCLUDES += [
          "/gfx/angle/checkout/include/",
-@@ -320,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -319,14 +128,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -59536,7 +61197,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
  
      LOCAL_INCLUDES += [
          "/gfx/angle/checkout/include/",
-@@ -346,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -345,10 +154,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -59549,7 +61210,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
  
      LOCAL_INCLUDES += [
          "/gfx/angle/checkout/include/",
-@@ -368,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -367,4 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
      ]
  
@@ -59559,7 +61220,7 @@ index f58aa8e782f0..a2ba3c8ac944 100644
 +
  Library("video_capture_internal_impl_gn")
 diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 820d5655dfe4..30fbc8a16f91 100644
+index 145e54928644..d53c45076c66 100644
 --- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59582,9 +61243,9 @@ index 820d5655dfe4..30fbc8a16f91 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -47,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,189 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59604,7 +61265,6 @@ index 820d5655dfe4..30fbc8a16f91 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -59782,7 +61442,7 @@ index 820d5655dfe4..30fbc8a16f91 100644
  
  Library("video_capture_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 144097f87a25..3c56145fb1aa 100644
+index 065cf604b5d3..e9eebffdbcd2 100644
 --- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -59805,7 +61465,7 @@ index 144097f87a25..3c56145fb1aa 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -60000,7 +61660,7 @@ index 144097f87a25..3c56145fb1aa 100644
  
  Library("chain_diff_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index cf74ae964c79..4c79e5b318d9 100644
+index 53a7fc384c3d..bd7362a67f30 100644
 --- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60023,7 +61683,7 @@ index cf74ae964c79..4c79e5b318d9 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -60191,7 +61851,7 @@ index cf74ae964c79..4c79e5b318d9 100644
 -
  Library("codec_globals_headers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index bfe37b935d06..100155a39f1f 100644
+index b9784482e9bd..d6db6b79cea3 100644
 --- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60214,7 +61874,7 @@ index bfe37b935d06..100155a39f1f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -60409,7 +62069,7 @@ index bfe37b935d06..100155a39f1f 100644
  
  Library("av1_svc_config_gn")
 diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index 31e83f9c3105..5a661787308d 100644
+index a086f7cb0b6f..6b870ee54300 100644
 --- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60432,7 +62092,7 @@ index 31e83f9c3105..5a661787308d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -60631,7 +62291,7 @@ index 31e83f9c3105..5a661787308d 100644
  
  Library("encoded_frame_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index 1ad9c574ad8a..97d7596cd7ee 100644
+index e8fdf3750a0c..a7f10d9ed7a9 100644
 --- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60654,7 +62314,7 @@ index 1ad9c574ad8a..97d7596cd7ee 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -60849,7 +62509,7 @@ index 1ad9c574ad8a..97d7596cd7ee 100644
  
  Library("frame_dependencies_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index ccac90f50d1f..99867a1c8f90 100644
+index ecd9c1dd8d37..864af3b1dda1 100644
 --- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -60872,7 +62532,7 @@ index ccac90f50d1f..99867a1c8f90 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -61067,7 +62727,7 @@ index ccac90f50d1f..99867a1c8f90 100644
  
  Library("frame_helpers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index d50ed75a0006..309d2686d921 100644
+index 187cf6089c53..45337d14f78e 100644
 --- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61090,7 +62750,7 @@ index d50ed75a0006..309d2686d921 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,189 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -61289,7 +62949,7 @@ index d50ed75a0006..309d2686d921 100644
  
  Library("nack_requester_gn")
 diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index 2c161989c1d3..c1be9596e0a5 100644
+index 09929b1d482a..f3d5f329d665 100644
 --- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61312,7 +62972,7 @@ index 2c161989c1d3..c1be9596e0a5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -61511,7 +63171,7 @@ index 2c161989c1d3..c1be9596e0a5 100644
  
  Library("packet_buffer_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index 80eb00a9910e..c4b6ec469538 100644
+index 698684346412..da2c255ee0fc 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61534,7 +63194,7 @@ index 80eb00a9910e..c4b6ec469538 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -61729,7 +63389,7 @@ index 80eb00a9910e..c4b6ec469538 100644
  
  Library("scalability_mode_util_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index 931dfe8d894c..bb66a11cb47c 100644
+index 88f469760f7f..e0bfc360efea 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61752,7 +63412,7 @@ index 931dfe8d894c..bb66a11cb47c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -50,185 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -61947,7 +63607,7 @@ index 931dfe8d894c..bb66a11cb47c 100644
  
  Library("scalability_structures_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index 18aa68e6963c..9fad4e4a38d8 100644
+index d09a4aed3ab5..8d6c549ef978 100644
 --- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -61970,7 +63630,7 @@ index 18aa68e6963c..9fad4e4a38d8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -62158,7 +63818,7 @@ index 18aa68e6963c..9fad4e4a38d8 100644
  
  Library("scalable_video_controller_gn")
 diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index bbb5a75959f0..415872506d13 100644
+index 2bd3634ba957..a7a401eb155d 100644
 --- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62181,7 +63841,7 @@ index bbb5a75959f0..415872506d13 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -62376,7 +64036,7 @@ index bbb5a75959f0..415872506d13 100644
  
  Library("svc_rate_allocator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index 2347b0937ce7..81060f6b3f2c 100644
+index 9c48932149b9..8bbe558a2477 100644
 --- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62399,7 +64059,7 @@ index 2347b0937ce7..81060f6b3f2c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -62587,7 +64247,7 @@ index 2347b0937ce7..81060f6b3f2c 100644
  
  Library("decode_time_percentile_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index 274023c6e760..463feb1bc7a7 100644
+index 0e5991cffd44..8c91c74e87f1 100644
 --- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62610,7 +64270,7 @@ index 274023c6e760..463feb1bc7a7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -62798,7 +64458,7 @@ index 274023c6e760..463feb1bc7a7 100644
  
  Library("frame_delay_variation_kalman_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index d4ec330ed14a..284a46af8e7d 100644
+index a311c4a8024c..72c2e8f95f30 100644
 --- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -62821,7 +64481,7 @@ index d4ec330ed14a..284a46af8e7d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -63009,7 +64669,7 @@ index d4ec330ed14a..284a46af8e7d 100644
  
  Library("inter_frame_delay_variation_calculator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index e540f00f8c72..c38cf361ccf6 100644
+index 6d87c74bd732..42312fbebab1 100644
 --- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63032,7 +64692,7 @@ index e540f00f8c72..c38cf361ccf6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -63231,7 +64891,7 @@ index e540f00f8c72..c38cf361ccf6 100644
  
  Library("jitter_estimator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index 18a30a6ede64..13ea6d3315e7 100644
+index e05eebc11f52..362ec70ca4a8 100644
 --- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63254,7 +64914,7 @@ index 18a30a6ede64..13ea6d3315e7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -63442,7 +65102,7 @@ index 18a30a6ede64..13ea6d3315e7 100644
  
  Library("rtt_filter_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index 4c2a6eed6200..59227c6d26ab 100644
+index 10e36ea24cf2..f02054e9631b 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63465,7 +65125,7 @@ index 4c2a6eed6200..59227c6d26ab 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -63653,7 +65313,7 @@ index 4c2a6eed6200..59227c6d26ab 100644
  
  Library("timestamp_extrapolator_gn")
 diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index 76c4cfe66496..40909203b3cf 100644
+index 2ab95ef62991..4f51ffc604ee 100644
 --- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63676,7 +65336,7 @@ index 76c4cfe66496..40909203b3cf 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -63875,7 +65535,7 @@ index 76c4cfe66496..40909203b3cf 100644
  
  Library("timing_module_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index 141def90908b..fae7dffcca41 100644
+index 0e18b1aecaed..838e14e931d2 100644
 --- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -63898,9 +65558,9 @@ index 141def90908b..fae7dffcca41 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64093,7 +65753,7 @@ index 141def90908b..fae7dffcca41 100644
  
  Library("video_codec_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index 923ac7785a18..48e566809b99 100644
+index 709393035bb5..5eb98564a475 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64116,7 +65776,7 @@ index 923ac7785a18..48e566809b99 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -57,190 +67,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -64316,7 +65976,7 @@ index 923ac7785a18..48e566809b99 100644
  
  Library("video_coding_gn")
 diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index bc1510e0baa4..c914dfcbd7b5 100644
+index 75698c304f78..89bf22a8c48f 100644
 --- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64339,7 +65999,7 @@ index bc1510e0baa4..c914dfcbd7b5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -54,190 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -64539,7 +66199,7 @@ index bc1510e0baa4..c914dfcbd7b5 100644
  
  Library("video_coding_utility_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 8cb4b64625a9..e49d55137a91 100644
+index ce59cc861c99..d9cbac447de8 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
 @@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -64562,7 +66222,7 @@ index 8cb4b64625a9..e49d55137a91 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,178 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -64750,7 +66410,7 @@ index 8cb4b64625a9..e49d55137a91 100644
  
  Library("webrtc_libvpx_interface_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index 21d5eeee9fe0..7fbbf3bb99f1 100644
+index 352458cf8e21..965ef96422be 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
 @@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -64773,7 +66433,7 @@ index 21d5eeee9fe0..7fbbf3bb99f1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -49,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -64973,7 +66633,7 @@ index 21d5eeee9fe0..7fbbf3bb99f1 100644
  
  Library("webrtc_vp8_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 92fd7cf63049..b382aa7a36f5 100644
+index 0338ba659e01..f1da16b805a7 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -64996,7 +66656,7 @@ index 92fd7cf63049..b382aa7a36f5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -65184,7 +66844,7 @@ index 92fd7cf63049..b382aa7a36f5 100644
  
  Library("webrtc_vp8_scalability_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index caf91a5d2cba..9886a43a6d6c 100644
+index d7ae0d5805b3..9ebd70792c7b 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -65207,7 +66867,7 @@ index caf91a5d2cba..9886a43a6d6c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -65407,7 +67067,7 @@ index caf91a5d2cba..9886a43a6d6c 100644
  
  Library("webrtc_vp8_temporal_layers_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index 707d56355909..0eba1201fe1f 100644
+index c0d16a8e5163..1cf6175508db 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
 @@ -15,11 +15,21 @@ AllowCompilerWarnings()
@@ -65430,7 +67090,7 @@ index 707d56355909..0eba1201fe1f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -51,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -65630,7 +67290,7 @@ index 707d56355909..0eba1201fe1f 100644
  
  Library("webrtc_vp9_gn")
 diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index 883e5c70b24b..caec155ca861 100644
+index 6abd453136c9..c0f5ab3b81ef 100644
 --- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 +++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -65653,9 +67313,9 @@ index 883e5c70b24b..caec155ca861 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65675,7 +67335,6 @@ index 883e5c70b24b..caec155ca861 100644
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
 -    OS_LIBS += [
--        "GLESv2",
 -        "log"
 -    ]
 -
@@ -65704,10 +67363,6 @@ index 883e5c70b24b..caec155ca861 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--    OS_LIBS += [
--        "rt"
--    ]
--
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -65853,10 +67508,10 @@ index 883e5c70b24b..caec155ca861 100644
  
  Library("webrtc_vp9_helpers_gn")
 diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index ad1adce75739..55860774ec2c 100644
+index 3aa8fb086730..bef47f00e0a6 100644
 --- third_party/libwebrtc/moz.build
 +++ third_party/libwebrtc/moz.build
-@@ -265,6 +265,8 @@ DIRS += [
+@@ -273,6 +273,8 @@ DIRS += [
      "/third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn",
      "/third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn",
      "/third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn",
@@ -65865,7 +67520,7 @@ index ad1adce75739..55860774ec2c 100644
      "/third_party/libwebrtc/modules/module_api_gn",
      "/third_party/libwebrtc/modules/module_api_public_gn",
      "/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -464,102 +466,11 @@ DIRS += [
+@@ -472,102 +474,11 @@ DIRS += [
      "/third_party/libwebrtc/webrtc_gn"
  ]
  
@@ -65969,7 +67624,7 @@ index ad1adce75739..55860774ec2c 100644
          "/third_party/libwebrtc/modules/portal/portal_gn",
          "/third_party/libwebrtc/third_party/drm/drm_gn",
          "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -567,26 +478,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -575,26 +486,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
          "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
      ]
  
@@ -65997,7 +67652,7 @@ index ad1adce75739..55860774ec2c 100644
          "/third_party/libwebrtc/modules/portal/portal_gn",
          "/third_party/libwebrtc/third_party/drm/drm_gn",
          "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -594,11 +488,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
+@@ -602,11 +496,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
          "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
      ]
  
@@ -66010,7 +67665,7 @@ index ad1adce75739..55860774ec2c 100644
          "/third_party/libwebrtc/modules/portal/portal_gn",
          "/third_party/libwebrtc/third_party/drm/drm_gn",
          "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -606,7 +498,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
+@@ -614,7 +506,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
          "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
      ]
  
@@ -66019,7 +67674,7 @@ index ad1adce75739..55860774ec2c 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -614,8 +506,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -622,8 +514,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -66028,7 +67683,7 @@ index ad1adce75739..55860774ec2c 100644
          "/third_party/libwebrtc/modules/portal/portal_gn",
          "/third_party/libwebrtc/third_party/drm/drm_gn",
          "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -623,7 +513,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -631,7 +521,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
          "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
      ]
  
@@ -66037,7 +67692,7 @@ index ad1adce75739..55860774ec2c 100644
  
      DIRS += [
          "/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -631,69 +521,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -639,69 +529,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
          "/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
          "/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
          "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
@@ -66108,7 +67763,7 @@ index ad1adce75739..55860774ec2c 100644
 -        "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
 -    ]
 diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index c278a28f8f41..334fc3e241bd 100644
+index 415f09cfd1fe..de5b867157f4 100644
 --- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66131,7 +67786,7 @@ index c278a28f8f41..334fc3e241bd 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -66327,7 +67982,7 @@ index c278a28f8f41..334fc3e241bd 100644
  
  Library("async_dns_resolver_gn")
 diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index 40c8366f9771..e6471de4496d 100644
+index 9f3ce4d4b600..fb11aa9b0f1c 100644
 --- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66350,7 +68005,7 @@ index 40c8366f9771..e6471de4496d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -66514,7 +68169,7 @@ index 40c8366f9771..e6471de4496d 100644
 -
  Library("async_packet_socket_gn")
 diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-index c756a0eb110c..6a1b5eae3ba5 100644
+index 70a2aa730b19..27f099ef7b90 100644
 --- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66537,7 +68192,7 @@ index c756a0eb110c..6a1b5eae3ba5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -66732,7 +68387,7 @@ index c756a0eb110c..6a1b5eae3ba5 100644
  
  Library("audio_format_to_string_gn")
 diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index ca5959866c1c..94d68859a601 100644
+index 3dfd3b19d24b..933e5434bf8c 100644
 --- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66755,7 +68410,7 @@ index ca5959866c1c..94d68859a601 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -66943,7 +68598,7 @@ index ca5959866c1c..94d68859a601 100644
  
  Library("bit_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index 8c00ef1ac51a..0456682b1478 100644
+index 7b1ba50f99cf..b05e27ad3426 100644
 --- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -66966,7 +68621,7 @@ index 8c00ef1ac51a..0456682b1478 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -67161,7 +68816,7 @@ index 8c00ef1ac51a..0456682b1478 100644
  
  Library("bitrate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index 2047e015e4d7..63a6ddbeeec1 100644
+index c82c4c9965bf..36b9f5b6c119 100644
 --- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67184,7 +68839,7 @@ index 2047e015e4d7..63a6ddbeeec1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -67372,7 +69027,7 @@ index 2047e015e4d7..63a6ddbeeec1 100644
  
  Library("bitstream_reader_gn")
 diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index acbe827a94aa..2a2b6adff2b4 100644
+index 5e5d11ff6f7e..fa3cb7950b6c 100644
 --- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67395,7 +69050,7 @@ index acbe827a94aa..2a2b6adff2b4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -67563,7 +69218,7 @@ index acbe827a94aa..2a2b6adff2b4 100644
 -
  Library("buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index 4d9cc19bfba6..3105ccac7dc2 100644
+index 89a2c9e84e1c..01e755bb6f7c 100644
 --- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67586,7 +69241,7 @@ index 4d9cc19bfba6..3105ccac7dc2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -67774,7 +69429,7 @@ index 4d9cc19bfba6..3105ccac7dc2 100644
  
  Library("byte_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index 621abaa96d62..485929410a19 100644
+index b95d149625ed..4ed69f91caf9 100644
 --- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67797,7 +69452,7 @@ index 621abaa96d62..485929410a19 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -67961,7 +69616,7 @@ index 621abaa96d62..485929410a19 100644
 -
  Library("byte_order_gn")
 diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index ee982603d3c5..7b90d3cec001 100644
+index f147bdc64bd9..477bb6cf012e 100644
 --- third_party/libwebrtc/rtc_base/checks_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -67984,7 +69639,7 @@ index ee982603d3c5..7b90d3cec001 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -68172,7 +69827,7 @@ index ee982603d3c5..7b90d3cec001 100644
  
  Library("checks_gn")
 diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 62b89c7deb5f..537becb3aa19 100644
+index 711466336e15..80475fdc6a41 100644
 --- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68195,7 +69850,7 @@ index 62b89c7deb5f..537becb3aa19 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -68359,7 +70014,7 @@ index 62b89c7deb5f..537becb3aa19 100644
 -
  Library("compile_assert_c_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index ff33c5381a42..f8a255e5bd46 100644
+index fa4fdc873993..7c49ec6a5edd 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68382,7 +70037,7 @@ index ff33c5381a42..f8a255e5bd46 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -68570,7 +70225,7 @@ index ff33c5381a42..f8a255e5bd46 100644
  
  Library("flat_containers_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index 9b6add6b867b..3a040d68f592 100644
+index 7c9b3edd1676..95a2855408fd 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68593,7 +70248,7 @@ index 9b6add6b867b..3a040d68f592 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -68761,7 +70416,7 @@ index 9b6add6b867b..3a040d68f592 100644
 -
  Library("flat_map_gn")
 diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 4b398de383c4..6f4cccc313e8 100644
+index 02d364fe30a5..a7902a51d2f6 100644
 --- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68784,7 +70439,7 @@ index 4b398de383c4..6f4cccc313e8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -68952,7 +70607,7 @@ index 4b398de383c4..6f4cccc313e8 100644
 -
  Library("flat_set_gn")
 diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index cb8e9c4a5fc1..89d6eded82d3 100644
+index dd687b90f3ff..8ed0bc7ee1af 100644
 --- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -68975,7 +70630,7 @@ index cb8e9c4a5fc1..89d6eded82d3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -69163,7 +70818,7 @@ index cb8e9c4a5fc1..89d6eded82d3 100644
  
  Library("copy_on_write_buffer_gn")
 diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index a681a1274629..339e21e75364 100644
+index d860667eb591..f09bb05f3fda 100644
 --- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69186,7 +70841,7 @@ index a681a1274629..339e21e75364 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -69374,7 +71029,7 @@ index a681a1274629..339e21e75364 100644
  
  Library("criticalsection_gn")
 diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index f30da236c460..48add74427c6 100644
+index 5946a30db45f..1212206025b7 100644
 --- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69397,7 +71052,7 @@ index f30da236c460..48add74427c6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -69565,7 +71220,7 @@ index f30da236c460..48add74427c6 100644
 -
  Library("divide_round_gn")
 diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index 5f1d97d2e8b4..fdba8802853b 100644
+index fd82b23b98e3..e83d2e34dc26 100644
 --- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69588,7 +71243,7 @@ index 5f1d97d2e8b4..fdba8802853b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -69752,7 +71407,7 @@ index 5f1d97d2e8b4..fdba8802853b 100644
 -
  Library("dscp_gn")
 diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 9ff988a2515c..f402ae850f31 100644
+index 2ea470772f4b..1235e95439b9 100644
 --- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69775,7 +71430,7 @@ index 9ff988a2515c..f402ae850f31 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -69970,7 +71625,7 @@ index 9ff988a2515c..f402ae850f31 100644
  
  Library("event_tracer_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 1857d67850d0..9cc536965c58 100644
+index 09174a3a20ab..f906bc9cd246 100644
 --- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -69993,7 +71648,7 @@ index 1857d67850d0..9cc536965c58 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -70188,7 +71843,7 @@ index 1857d67850d0..9cc536965c58 100644
  
  Library("alr_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index 3a258e46965a..15521be543f6 100644
+index 233c203847c4..0142ed0457e9 100644
 --- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70211,7 +71866,7 @@ index 3a258e46965a..15521be543f6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -70406,7 +72061,7 @@ index 3a258e46965a..15521be543f6 100644
  
  Library("balanced_degradation_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
-index b8a6ccdd291d..eedfd17761b3 100644
+index e8ae0afef0a3..a46ef7998d57 100644
 --- third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/bandwidth_quality_scaler_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70429,7 +72084,7 @@ index b8a6ccdd291d..eedfd17761b3 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -70624,7 +72279,7 @@ index b8a6ccdd291d..eedfd17761b3 100644
  
  Library("bandwidth_quality_scaler_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
-index b436f5962dea..17833ef180df 100644
+index 00af297d92c7..cfa672be2411 100644
 --- third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/cpu_speed_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70647,7 +72302,7 @@ index b436f5962dea..17833ef180df 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -70842,7 +72497,7 @@ index b436f5962dea..17833ef180df 100644
  
  Library("cpu_speed_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index ad4be851e07d..5b8291b5a0f8 100644
+index 9866a74964c7..a09edc6dce96 100644
 --- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -70865,7 +72520,7 @@ index ad4be851e07d..5b8291b5a0f8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -71060,7 +72715,7 @@ index ad4be851e07d..5b8291b5a0f8 100644
  
  Library("encoder_info_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index 31a945e00fd8..6f561f98057c 100644
+index 520c4db65a2b..00eca302cf45 100644
 --- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71083,7 +72738,7 @@ index 31a945e00fd8..6f561f98057c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -46,185 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -71278,7 +72933,7 @@ index 31a945e00fd8..6f561f98057c 100644
  
  Library("field_trial_parser_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 3b5cbf462f8e..e4dbcc26dabc 100644
+index 397f0dd3ce6f..42e0bfc0b541 100644
 --- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71301,7 +72956,7 @@ index 3b5cbf462f8e..e4dbcc26dabc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -71496,7 +73151,7 @@ index 3b5cbf462f8e..e4dbcc26dabc 100644
  
  Library("keyframe_interval_settings_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index e2c4f2537ee2..0354b3c70d5e 100644
+index 5cd3bb4a2bf0..09ebf5322ea7 100644
 --- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71519,7 +73174,7 @@ index e2c4f2537ee2..0354b3c70d5e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -71714,7 +73369,7 @@ index e2c4f2537ee2..0354b3c70d5e 100644
  
  Library("min_video_bitrate_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index 2cdcea589746..a6c29e1fb3af 100644
+index 9c3e585bf972..89f9af863d4a 100644
 --- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71737,7 +73392,7 @@ index 2cdcea589746..a6c29e1fb3af 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -71932,7 +73587,7 @@ index 2cdcea589746..a6c29e1fb3af 100644
  
  Library("normalize_simulcast_size_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
-index 234db8e90613..222b58931e96 100644
+index a03ad630cd73..a008cbfdd569 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -71955,7 +73610,7 @@ index 234db8e90613..222b58931e96 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -72150,7 +73805,7 @@ index 234db8e90613..222b58931e96 100644
  
  Library("quality_rampup_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index 8ea1b5075424..916a31d69ac4 100644
+index d1b4330a18db..de18961b8154 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72173,7 +73828,7 @@ index 8ea1b5075424..916a31d69ac4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -72368,7 +74023,7 @@ index 8ea1b5075424..916a31d69ac4 100644
  
  Library("quality_scaler_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index 36a79a734721..f2d347a7f2ec 100644
+index 8e75fbc3b032..79fc2e93ba33 100644
 --- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72391,7 +74046,7 @@ index 36a79a734721..f2d347a7f2ec 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -72586,7 +74241,7 @@ index 36a79a734721..f2d347a7f2ec 100644
  
  Library("quality_scaling_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 416e7a35c745..23c2a12352e5 100644
+index 0051ac37f9e8..fe9271425d64 100644
 --- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72609,7 +74264,7 @@ index 416e7a35c745..23c2a12352e5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -72804,7 +74459,7 @@ index 416e7a35c745..23c2a12352e5 100644
  
  Library("rate_control_settings_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
-index 32fd27e4ef83..7fad9c144446 100644
+index 995eaa1df3d0..cfbbbdb328ef 100644
 --- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -72827,7 +74482,7 @@ index 32fd27e4ef83..7fad9c144446 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -73022,7 +74677,7 @@ index 32fd27e4ef83..7fad9c144446 100644
  
  Library("rtt_mult_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index bdf9e49985ea..837697bbafe8 100644
+index 2c239310fc08..5e98394eef8b 100644
 --- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73045,7 +74700,7 @@ index bdf9e49985ea..837697bbafe8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -73240,7 +74895,7 @@ index bdf9e49985ea..837697bbafe8 100644
  
  Library("stable_target_rate_experiment_gn")
 diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index e7a94c577606..249d52d48465 100644
+index 87a5e335eb06..ba58d3df2494 100644
 --- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73263,7 +74918,7 @@ index e7a94c577606..249d52d48465 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -73458,7 +75113,7 @@ index e7a94c577606..249d52d48465 100644
  
  Library("frequency_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index 54596d501f69..213bbd0450d5 100644
+index 03bb1071f60c..6e5808f68281 100644
 --- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73481,7 +75136,7 @@ index 54596d501f69..213bbd0450d5 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -73645,7 +75300,7 @@ index 54596d501f69..213bbd0450d5 100644
 -
  Library("gtest_prod_gn")
 diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index 48d98b418be0..30634ecae00b 100644
+index 3f7a2c1ffa1f..042fc6088182 100644
 --- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73668,7 +75323,7 @@ index 48d98b418be0..30634ecae00b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -73857,7 +75512,7 @@ index 48d98b418be0..30634ecae00b 100644
  Library("histogram_percentile_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 deleted file mode 100644
-index 6697a8f93cf0..000000000000
+index d89873bf7483..000000000000
 --- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
 +++ /dev/null
 @@ -1,95 +0,0 @@
@@ -73892,7 +75547,7 @@ index 6697a8f93cf0..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -73957,7 +75612,7 @@ index 6697a8f93cf0..000000000000
 -
 -Library("ifaddrs_android_gn")
 diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index 502a867a4b87..59bbc5420da2 100644
+index 06009fc8668e..4f9eacbcf8a7 100644
 --- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -73980,7 +75635,7 @@ index 502a867a4b87..59bbc5420da2 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -74144,7 +75799,7 @@ index 502a867a4b87..59bbc5420da2 100644
 -
  Library("ignore_wundef_gn")
 diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index 108fd06e5450..7377b5d7b0fe 100644
+index c2f9eb412bca..df8f9503cb8a 100644
 --- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74167,7 +75822,7 @@ index 108fd06e5450..7377b5d7b0fe 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -74362,7 +76017,7 @@ index 108fd06e5450..7377b5d7b0fe 100644
  
  Library("ip_address_gn")
 diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 85c9773f240e..59bf7125a288 100644
+index 2b47ed986c72..191af40a1a3f 100644
 --- third_party/libwebrtc/rtc_base/logging_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -74386,7 +76041,7 @@ index 85c9773f240e..59bf7125a288 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,185 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -74581,7 +76236,7 @@ index 85c9773f240e..59bf7125a288 100644
  
  Library("logging_gn")
 diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index 949d31b8704d..308e7658267e 100644
+index 7a54f6369568..ae2eb48d37a1 100644
 --- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74604,7 +76259,7 @@ index 949d31b8704d..308e7658267e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -74768,7 +76423,7 @@ index 949d31b8704d..308e7658267e 100644
 -
  Library("macromagic_gn")
 diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 8709bdd95ba6..32bf460aab31 100644
+index 06a17077bb82..21d3404240cd 100644
 --- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -74791,7 +76446,7 @@ index 8709bdd95ba6..32bf460aab31 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -74979,7 +76634,7 @@ index 8709bdd95ba6..32bf460aab31 100644
  
  Library("aligned_malloc_gn")
 diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index 43f0844548e4..1a8d9fd19077 100644
+index ea25143a15aa..da34908795f0 100644
 --- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75002,7 +76657,7 @@ index 43f0844548e4..1a8d9fd19077 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -75170,7 +76825,7 @@ index 43f0844548e4..1a8d9fd19077 100644
 -
  Library("mod_ops_gn")
 diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index 15ef767b07fc..4dcd35c76a6c 100644
+index 967e6e28ba29..60644d006ab2 100644
 --- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75193,7 +76848,7 @@ index 15ef767b07fc..4dcd35c76a6c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -75361,7 +77016,7 @@ index 15ef767b07fc..4dcd35c76a6c 100644
 -
  Library("moving_max_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index ceb2150c06ce..f9f2ab464a09 100644
+index 7c0cfcf806a7..2b89135329e6 100644
 --- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75384,7 +77039,7 @@ index ceb2150c06ce..f9f2ab464a09 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -75578,8 +77233,195 @@ index ceb2150c06ce..f9f2ab464a09 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("net_helpers_gn")
+diff --git third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
+index 9fb05f529e15..2c7aeb42782b 100644
+--- third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
++++ third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
+@@ -12,11 +12,21 @@ AllowCompilerWarnings()
+ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
+ DEFINES["RTC_ENABLE_VP9"] = True
++DEFINES["USE_GLIB"] = "1"
++DEFINES["USE_OZONE"] = "1"
++DEFINES["WEBRTC_BSD"] = True
++DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+ DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
+ DEFINES["WEBRTC_LIBRARY_IMPL"] = True
+ DEFINES["WEBRTC_MOZILLA_BUILD"] = True
+ DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
++DEFINES["WEBRTC_POSIX"] = True
+ DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
++DEFINES["_FILE_OFFSET_BITS"] = "64"
++DEFINES["_LARGEFILE64_SOURCE"] = True
++DEFINES["_LARGEFILE_SOURCE"] = True
++DEFINES["__STDC_CONSTANT_MACROS"] = True
++DEFINES["__STDC_FORMAT_MACROS"] = True
+ 
+ FINAL_LIBRARY = "xul"
+ 
+@@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+ if CONFIG["MOZ_DEBUG"] == "1":
+ 
+     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
+-
+-if CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["ANDROID"] = True
+-    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
+-    DEFINES["HAVE_SYS_UIO_H"] = True
+-    DEFINES["WEBRTC_ANDROID"] = True
+-    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["WEBRTC_MAC"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
+-    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_NSS_CERTS"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_UDEV"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_LINUX"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["USE_GLIB"] = "1"
+-    DEFINES["USE_OZONE"] = "1"
+-    DEFINES["USE_X11"] = "1"
+-    DEFINES["WEBRTC_BSD"] = True
+-    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
+-    DEFINES["WEBRTC_POSIX"] = True
+-    DEFINES["_FILE_OFFSET_BITS"] = "64"
+-    DEFINES["_LARGEFILE64_SOURCE"] = True
+-    DEFINES["_LARGEFILE_SOURCE"] = True
+-    DEFINES["__STDC_CONSTANT_MACROS"] = True
+-    DEFINES["__STDC_FORMAT_MACROS"] = True
+-
+-if CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
+-    DEFINES["NOMINMAX"] = True
+-    DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-    DEFINES["PSAPI_VERSION"] = "2"
+-    DEFINES["RTC_ENABLE_WIN_WGC"] = True
+-    DEFINES["UNICODE"] = True
+-    DEFINES["USE_AURA"] = "1"
+-    DEFINES["WEBRTC_WIN"] = True
+-    DEFINES["WIN32"] = True
+-    DEFINES["WIN32_LEAN_AND_MEAN"] = True
+-    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
+-    DEFINES["WINVER"] = "0x0A00"
+-    DEFINES["_ATL_NO_OPENGL"] = True
+-    DEFINES["_CRT_RAND_S"] = True
+-    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
+-    DEFINES["_HAS_EXCEPTIONS"] = "0"
+-    DEFINES["_HAS_NODISCARD"] = True
+-    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
+-    DEFINES["_SECURE_ATL"] = True
+-    DEFINES["_UNICODE"] = True
+-    DEFINES["_WIN32_WINNT"] = "0x0A00"
+-    DEFINES["_WINDOWS"] = True
+-    DEFINES["__STD_C"] = True
++    DEFINES["_DEBUG"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "aarch64":
+ 
+     DEFINES["WEBRTC_ARCH_ARM64"] = True
+     DEFINES["WEBRTC_HAS_NEON"] = True
+ 
+-if CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["WEBRTC_ARCH_ARM"] = True
+-    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
+-    DEFINES["WEBRTC_HAS_NEON"] = True
+-
+ if CONFIG["TARGET_CPU"] == "mips32":
+ 
+     DEFINES["MIPS32_LE"] = True
+     DEFINES["MIPS_FPU_LE"] = True
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+ 
+ if CONFIG["TARGET_CPU"] == "x86":
+ 
+@@ -149,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+ 
+     DEFINES["WEBRTC_ENABLE_AVX2"] = True
+ 
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
+-
+-    DEFINES["_DEBUG"] = True
+-
+-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
+-
+-    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
+-
+-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
+ 
+     DEFINES["USE_X11"] = "1"
+ 
+-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    OS_LIBS += [
+-        "unwind"
+-    ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+-
+-    DEFINES["_GNU_SOURCE"] = True
+-
+ Library("ecn_marking_gn")
 diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index fb580667ce33..e33a367c88f7 100644
+index 604cb9a5e8c8..63df6c684225 100644
 --- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75602,7 +77444,7 @@ index fb580667ce33..e33a367c88f7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -75786,7 +77628,7 @@ index fb580667ce33..e33a367c88f7 100644
  
  Library("sent_packet_gn")
 diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index 40a117b476ba..2728e4fc1e0e 100644
+index eacf18519786..848db7fed53a 100644
 --- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -75809,7 +77651,7 @@ index 40a117b476ba..2728e4fc1e0e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -75997,7 +77839,7 @@ index 40a117b476ba..2728e4fc1e0e 100644
  
  Library("network_constants_gn")
 diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index b14b2b563382..907f5af871eb 100644
+index 2ae8cf3c3837..c32e0473a011 100644
 --- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76020,7 +77862,7 @@ index b14b2b563382..907f5af871eb 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -76208,7 +78050,7 @@ index b14b2b563382..907f5af871eb 100644
  
  Library("network_route_gn")
 diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index e6b3d3c59a32..22553cd1b0bf 100644
+index da5eb5b49753..dd528ef3830e 100644
 --- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76231,7 +78073,7 @@ index e6b3d3c59a32..22553cd1b0bf 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -76427,7 +78269,7 @@ index e6b3d3c59a32..22553cd1b0bf 100644
  
  Library("null_socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index 10ad1f454ad8..0e0257215437 100644
+index 4de80444bef4..7d101ac9cbe4 100644
 --- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76450,7 +78292,7 @@ index 10ad1f454ad8..0e0257215437 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -76618,7 +78460,7 @@ index 10ad1f454ad8..0e0257215437 100644
 -
  Library("one_time_event_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 8045b2de62ce..83c2d573d1d9 100644
+index 8c259b6765c4..4632206d50e3 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76641,7 +78483,7 @@ index 8045b2de62ce..83c2d573d1d9 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -76836,7 +78678,7 @@ index 8045b2de62ce..83c2d573d1d9 100644
  
  Library("platform_thread_gn")
 diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 3738ea61fc1d..9059a39f8aac 100644
+index 09d6147ce17d..7ed2f4dad2ac 100644
 --- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -76859,7 +78701,7 @@ index 3738ea61fc1d..9059a39f8aac 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -77047,7 +78889,7 @@ index 3738ea61fc1d..9059a39f8aac 100644
  
  Library("platform_thread_types_gn")
 diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 4ec9f790604a..4abe79939615 100644
+index c2b0d4ce2f3a..e926b3f5ca8f 100644
 --- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77070,7 +78912,7 @@ index 4ec9f790604a..4abe79939615 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -77234,7 +79076,7 @@ index 4ec9f790604a..4abe79939615 100644
 -
  Library("protobuf_utils_gn")
 diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index ed66936a90a5..bdd70e6e3d8b 100644
+index 1fef37a2babc..74fad97cb21c 100644
 --- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77257,7 +79099,7 @@ index ed66936a90a5..bdd70e6e3d8b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -77445,7 +79287,7 @@ index ed66936a90a5..bdd70e6e3d8b 100644
  
  Library("race_checker_gn")
 diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 93b07582aa6a..c0bea1606f76 100644
+index 6c9b369317a5..1046794552e2 100644
 --- third_party/libwebrtc/rtc_base/random_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/random_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77468,7 +79310,7 @@ index 93b07582aa6a..c0bea1606f76 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -77656,7 +79498,7 @@ index 93b07582aa6a..c0bea1606f76 100644
  
  Library("random_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index 60acfb017625..3b3fba53974d 100644
+index 586fc513dc7e..64b9286d41ca 100644
 --- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77679,7 +79521,7 @@ index 60acfb017625..3b3fba53974d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -77878,7 +79720,7 @@ index 60acfb017625..3b3fba53974d 100644
  
  Library("rate_limiter_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index 84b47cf914e3..62e2c13f1f01 100644
+index 76d4f9d980ae..64ffc5e8413b 100644
 --- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -77901,7 +79743,7 @@ index 84b47cf914e3..62e2c13f1f01 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -78096,7 +79938,7 @@ index 84b47cf914e3..62e2c13f1f01 100644
  
  Library("rate_statistics_gn")
 diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index 880d7d6236aa..6396cbeff915 100644
+index c381e91cdc55..0a743006bcf0 100644
 --- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78119,7 +79961,7 @@ index 880d7d6236aa..6396cbeff915 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -78314,7 +80156,7 @@ index 880d7d6236aa..6396cbeff915 100644
  
  Library("rate_tracker_gn")
 diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 383d69e4583e..53c96cdbae3a 100644
+index 4059c66e7135..ab2a71dd87dc 100644
 --- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78337,7 +80179,7 @@ index 383d69e4583e..53c96cdbae3a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -78501,7 +80343,7 @@ index 383d69e4583e..53c96cdbae3a 100644
 -
  Library("refcount_gn")
 diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index 97fafd6dfbf6..ecb221864f89 100644
+index c8e14d5996e0..07964d2b4972 100644
 --- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78524,7 +80366,7 @@ index 97fafd6dfbf6..ecb221864f89 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -78692,7 +80534,7 @@ index 97fafd6dfbf6..ecb221864f89 100644
 -
  Library("rolling_accumulator_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index d120effc6944..48c882b1fbad 100644
+index a1b2840da3ea..6279462eabf7 100644
 --- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78715,7 +80557,7 @@ index d120effc6944..48c882b1fbad 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -78910,7 +80752,7 @@ index d120effc6944..48c882b1fbad 100644
  
  Library("rtc_event_gn")
 diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index ac5a402772b4..5c7773f371b8 100644
+index 6bcce7ecf591..0127c502b6f6 100644
 --- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -78933,7 +80775,7 @@ index ac5a402772b4..5c7773f371b8 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,178 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -79120,219 +80962,8 @@ index ac5a402772b4..5c7773f371b8 100644
 +    DEFINES["USE_X11"] = "1"
  
  Library("rtc_numerics_gn")
-diff --git third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-index a8de45e8df8c..a0e7ee73dc4b 100644
---- third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-+++ third_party/libwebrtc/rtc_base/rtc_task_queue_gn/moz.build
-@@ -12,11 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
-+DEFINES["USE_GLIB"] = "1"
-+DEFINES["USE_OZONE"] = "1"
-+DEFINES["WEBRTC_BSD"] = True
-+DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-+DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-+DEFINES["_FILE_OFFSET_BITS"] = "64"
-+DEFINES["_LARGEFILE64_SOURCE"] = True
-+DEFINES["_LARGEFILE_SOURCE"] = True
-+DEFINES["__STDC_CONSTANT_MACROS"] = True
-+DEFINES["__STDC_FORMAT_MACROS"] = True
- 
- FINAL_LIBRARY = "webrtc"
- 
-@@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
- if CONFIG["MOZ_DEBUG"] == "1":
- 
-     DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["ANDROID"] = True
--    DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
--    DEFINES["HAVE_SYS_UIO_H"] = True
--    DEFINES["WEBRTC_ANDROID"] = True
--    DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_GNU_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--    OS_LIBS += [
--        "log"
--    ]
--
--if CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["WEBRTC_MAC"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
--    DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_NSS_CERTS"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_UDEV"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_LINUX"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["USE_GLIB"] = "1"
--    DEFINES["USE_OZONE"] = "1"
--    DEFINES["USE_X11"] = "1"
--    DEFINES["WEBRTC_BSD"] = True
--    DEFINES["WEBRTC_ENABLE_LIBEVENT"] = True
--    DEFINES["WEBRTC_POSIX"] = True
--    DEFINES["_FILE_OFFSET_BITS"] = "64"
--    DEFINES["_LARGEFILE64_SOURCE"] = True
--    DEFINES["_LARGEFILE_SOURCE"] = True
--    DEFINES["__STDC_CONSTANT_MACROS"] = True
--    DEFINES["__STDC_FORMAT_MACROS"] = True
--
--if CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
--    DEFINES["NOMINMAX"] = True
--    DEFINES["NTDDI_VERSION"] = "0x0A000000"
--    DEFINES["PSAPI_VERSION"] = "2"
--    DEFINES["RTC_ENABLE_WIN_WGC"] = True
--    DEFINES["UNICODE"] = True
--    DEFINES["USE_AURA"] = "1"
--    DEFINES["WEBRTC_WIN"] = True
--    DEFINES["WIN32"] = True
--    DEFINES["WIN32_LEAN_AND_MEAN"] = True
--    DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
--    DEFINES["WINVER"] = "0x0A00"
--    DEFINES["_ATL_NO_OPENGL"] = True
--    DEFINES["_CRT_RAND_S"] = True
--    DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
--    DEFINES["_HAS_EXCEPTIONS"] = "0"
--    DEFINES["_HAS_NODISCARD"] = True
--    DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
--    DEFINES["_SECURE_ATL"] = True
--    DEFINES["_UNICODE"] = True
--    DEFINES["_WIN32_WINNT"] = "0x0A00"
--    DEFINES["_WINDOWS"] = True
--    DEFINES["__STD_C"] = True
-+    DEFINES["_DEBUG"] = True
- 
- if CONFIG["TARGET_CPU"] == "aarch64":
- 
-     DEFINES["WEBRTC_ARCH_ARM64"] = True
-     DEFINES["WEBRTC_HAS_NEON"] = True
- 
--if CONFIG["TARGET_CPU"] == "arm":
--
--    CXXFLAGS += [
--        "-mfpu=neon"
--    ]
--
--    DEFINES["WEBRTC_ARCH_ARM"] = True
--    DEFINES["WEBRTC_ARCH_ARM_V7"] = True
--    DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
- 
-     DEFINES["MIPS32_LE"] = True
-     DEFINES["MIPS_FPU_LE"] = True
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["TARGET_CPU"] == "mips64":
--
--    DEFINES["_GNU_SOURCE"] = True
- 
- if CONFIG["TARGET_CPU"] == "x86":
- 
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["TARGET_CPU"] == "x86_64":
--
--    DEFINES["WEBRTC_ENABLE_AVX2"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
--
--    DEFINES["_DEBUG"] = True
--
--if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
--
--    DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
--
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
--
--    DEFINES["USE_X11"] = "1"
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "arm":
--
--    OS_LIBS += [
--        "unwind"
--    ]
--
--if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
--
-     CXXFLAGS += [
-         "-msse2"
-     ]
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
--
--    DEFINES["_GNU_SOURCE"] = True
--
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--    CXXFLAGS += [
--        "-msse2"
--    ]
-+if CONFIG["TARGET_CPU"] == "x86_64":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["WEBRTC_ENABLE_AVX2"] = True
- 
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
- 
--    DEFINES["_GNU_SOURCE"] = True
-+    DEFINES["USE_X11"] = "1"
- 
- Library("rtc_task_queue_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 77dbd737c811..1e96f7ad161b 100644
+index 1e381892f367..8fc4c2183d80 100644
 --- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79355,7 +80986,7 @@ index 77dbd737c811..1e96f7ad161b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -79519,7 +81150,7 @@ index 77dbd737c811..1e96f7ad161b 100644
 -
  Library("safe_compare_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index f0d60f392270..481f97d18267 100644
+index f409a3834780..3ba803fa49d4 100644
 --- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79542,7 +81173,7 @@ index f0d60f392270..481f97d18267 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -79710,7 +81341,7 @@ index f0d60f392270..481f97d18267 100644
 -
  Library("safe_conversions_gn")
 diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index a975f0911fe9..444ff334be9f 100644
+index 31299792ebeb..a03b4cdd095d 100644
 --- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79733,7 +81364,7 @@ index a975f0911fe9..444ff334be9f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -79901,7 +81532,7 @@ index a975f0911fe9..444ff334be9f 100644
 -
  Library("safe_minmax_gn")
 diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-index 6cfed54db654..22bf6f11a0ed 100644
+index 0657de77c15b..fc147e94f56f 100644
 --- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -79924,7 +81555,7 @@ index 6cfed54db654..22bf6f11a0ed 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -80112,7 +81743,7 @@ index 6cfed54db654..22bf6f11a0ed 100644
  
  Library("sample_counter_gn")
 diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index 8bf1b02b4fa2..512ec69172c1 100644
+index dcdcffdd8ef4..fb6cf9adbb71 100644
 --- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80135,7 +81766,7 @@ index 8bf1b02b4fa2..512ec69172c1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -80299,7 +81930,7 @@ index 8bf1b02b4fa2..512ec69172c1 100644
 -
  Library("sanitizer_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-index 7d4c5ea206d3..15d61fd11419 100644
+index 2e5c00378acd..78d31c99625b 100644
 --- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80322,7 +81953,7 @@ index 7d4c5ea206d3..15d61fd11419 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -80518,7 +82149,7 @@ index 7d4c5ea206d3..15d61fd11419 100644
  
  Library("socket_address_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index c0df17e8819f..fc1bcda9d6bb 100644
+index 572b2f62b08c..23ceff9330b2 100644
 --- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80541,7 +82172,7 @@ index c0df17e8819f..fc1bcda9d6bb 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -80717,7 +82348,7 @@ index c0df17e8819f..fc1bcda9d6bb 100644
 -
  Library("socket_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index 00013760662b..a3866ef3ba39 100644
+index 4b08aeb0de91..d8dcd1ca715e 100644
 --- third_party/libwebrtc/rtc_base/socket_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80740,7 +82371,7 @@ index 00013760662b..a3866ef3ba39 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -80936,7 +82567,7 @@ index 00013760662b..a3866ef3ba39 100644
  
  Library("socket_gn")
 diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index e671f719bc98..9177418df790 100644
+index d4654af6fc1f..265a05693776 100644
 --- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -80959,7 +82590,7 @@ index e671f719bc98..9177418df790 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -81135,7 +82766,7 @@ index e671f719bc98..9177418df790 100644
 -
  Library("socket_server_gn")
 diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
-index 66200fa70cc9..72d951163eca 100644
+index 599001039a48..a2cf5b7c9ecd 100644
 --- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81158,7 +82789,7 @@ index 66200fa70cc9..72d951163eca 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -81322,7 +82953,7 @@ index 66200fa70cc9..72d951163eca 100644
 -
  Library("ssl_gn")
 diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 3b7954e86e15..9576a81b9996 100644
+index 5016b4fce059..44112c834b87 100644
 --- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81345,7 +82976,7 @@ index 3b7954e86e15..9576a81b9996 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,178 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -81533,7 +83164,7 @@ index 3b7954e86e15..9576a81b9996 100644
  
  Library("stringutils_gn")
 diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index b03cf379550c..36cf22a65ed7 100644
+index b84cec9997f3..f4fe48e03291 100644
 --- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81556,7 +83187,7 @@ index b03cf379550c..36cf22a65ed7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -81724,7 +83355,7 @@ index b03cf379550c..36cf22a65ed7 100644
 -
  Library("swap_queue_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index 197f9213a84a..c0b7597564dc 100644
+index c1704d262949..be17c0f04367 100644
 --- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81747,7 +83378,7 @@ index 197f9213a84a..c0b7597564dc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -81915,7 +83546,7 @@ index 197f9213a84a..c0b7597564dc 100644
 -
  Library("mutex_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index 28788b4b653e..4d146c5058d6 100644
+index e4f72d363530..f26d786ad38b 100644
 --- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -81938,7 +83569,7 @@ index 28788b4b653e..4d146c5058d6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -82126,7 +83757,7 @@ index 28788b4b653e..4d146c5058d6 100644
  
  Library("sequence_checker_internal_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index 6e5fe912f1d7..9649e4f55e8e 100644
+index 98232a67bd39..7a6b0bb40432 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82149,7 +83780,7 @@ index 6e5fe912f1d7..9649e4f55e8e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -82333,7 +83964,7 @@ index 6e5fe912f1d7..9649e4f55e8e 100644
  
  Library("yield_gn")
 diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index df7b6a62b9af..a11e7ba0278c 100644
+index 40dcd7ba2f70..678c14a8aa72 100644
 --- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82356,7 +83987,7 @@ index df7b6a62b9af..a11e7ba0278c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -82544,7 +84175,7 @@ index df7b6a62b9af..a11e7ba0278c 100644
  
  Library("yield_policy_gn")
 diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index c72b2b9951d5..88c849682045 100644
+index 1d1555984fb0..4f8961109262 100644
 --- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82567,7 +84198,7 @@ index c72b2b9951d5..88c849682045 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -82732,7 +84363,7 @@ index c72b2b9951d5..88c849682045 100644
  Library("arch_gn")
 diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 deleted file mode 100644
-index 4a2dbbea32c2..000000000000
+index 9ea729634114..000000000000
 --- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
 +++ /dev/null
 @@ -1,80 +0,0 @@
@@ -82765,7 +84396,7 @@ index 4a2dbbea32c2..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -82818,7 +84449,7 @@ index 4a2dbbea32c2..000000000000
 -Library("asm_defines_gn")
 diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 deleted file mode 100644
-index 429299b4807a..000000000000
+index 36bdf13d4b68..000000000000
 --- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
 +++ /dev/null
 @@ -1,67 +0,0 @@
@@ -82852,7 +84483,7 @@ index 429299b4807a..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -82890,7 +84521,7 @@ index 429299b4807a..000000000000
 -
 -Library("cocoa_threading_gn")
 diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index 4fdec8d73269..f1f0224d6a0f 100644
+index 807f4726e102..81fb6a624984 100644
 --- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -82913,7 +84544,7 @@ index 4fdec8d73269..f1f0224d6a0f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -83102,7 +84733,7 @@ index 4fdec8d73269..f1f0224d6a0f 100644
  Library("file_wrapper_gn")
 diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 deleted file mode 100644
-index 243694e1d552..000000000000
+index 21350fb07bfa..000000000000
 --- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
 +++ /dev/null
 @@ -1,67 +0,0 @@
@@ -83136,7 +84767,7 @@ index 243694e1d552..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -83174,7 +84805,7 @@ index 243694e1d552..000000000000
 -
 -Library("gcd_helpers_gn")
 diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 3406348246e9..6d4f5ece7c64 100644
+index 7a5b33257453..e12ece6bf6df 100644
 --- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83197,7 +84828,7 @@ index 3406348246e9..6d4f5ece7c64 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -83361,7 +84992,7 @@ index 3406348246e9..6d4f5ece7c64 100644
 -
  Library("ignore_warnings_gn")
 diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index 4236cd7c5d0a..67980e94049a 100644
+index 7df25c5644f1..64d47571debc 100644
 --- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83384,7 +85015,7 @@ index 4236cd7c5d0a..67980e94049a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -83548,7 +85179,7 @@ index 4236cd7c5d0a..67980e94049a 100644
 -
  Library("inline_gn")
 diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-index bcb6b0084898..8b0594e1642f 100644
+index 17a93fe6bf50..658616cb1183 100644
 --- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83571,7 +85202,7 @@ index bcb6b0084898..8b0594e1642f 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -83735,7 +85366,7 @@ index bcb6b0084898..8b0594e1642f 100644
 -
  Library("no_unique_address_gn")
 diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index 4eb3c21325c7..807b97ad0643 100644
+index e0c1fd16dc3e..47d3317cfa4a 100644
 --- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83758,7 +85389,7 @@ index 4eb3c21325c7..807b97ad0643 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -83922,7 +85553,7 @@ index 4eb3c21325c7..807b97ad0643 100644
 -
  Library("rtc_export_gn")
 diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index 25a3e4e088bc..8ba9c7a33e6b 100644
+index 11c7d7e1a9c3..49b5c9ab23a6 100644
 --- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -83945,7 +85576,7 @@ index 25a3e4e088bc..8ba9c7a33e6b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -84109,7 +85740,7 @@ index 25a3e4e088bc..8ba9c7a33e6b 100644
 -
  Library("unused_gn")
 diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index cc34279237df..5fc4802fd2f4 100644
+index 72142098bf1c..851abb2f75d7 100644
 --- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84132,7 +85763,7 @@ index cc34279237df..5fc4802fd2f4 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -84296,7 +85927,7 @@ index cc34279237df..5fc4802fd2f4 100644
 -
  Library("warn_current_thread_is_deadlocked_gn")
 diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index ffe3228fdc53..fc5427430c09 100644
+index b6057410da79..05fcf9b60a33 100644
 --- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84319,7 +85950,7 @@ index ffe3228fdc53..fc5427430c09 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -84518,7 +86149,7 @@ index ffe3228fdc53..fc5427430c09 100644
  
  Library("repeating_task_gn")
 diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-index 18384b6a382b..6a868ab4ba72 100644
+index cd7049d1e1ad..48679d72d348 100644
 --- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84541,7 +86172,7 @@ index 18384b6a382b..6a868ab4ba72 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -84729,7 +86360,7 @@ index 18384b6a382b..6a868ab4ba72 100644
  
  Library("base64_gn")
 diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index b5b20ed538d7..2005c1b47194 100644
+index b4ca57145cff..c1e70893bf9f 100644
 --- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84752,7 +86383,7 @@ index b5b20ed538d7..2005c1b47194 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -84936,7 +86567,7 @@ index b5b20ed538d7..2005c1b47194 100644
  
  Library("sigslot_gn")
 diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index 1ed74bfaad66..468c64eb06b7 100644
+index 53ae39a12405..28c418ee0db5 100644
 --- third_party/libwebrtc/rtc_base/threading_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -84959,9 +86590,9 @@ index 1ed74bfaad66..468c64eb06b7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -47,186 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,202 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84985,6 +86616,10 @@ index 1ed74bfaad66..468c64eb06b7 100644
 -        "log"
 -    ]
 -
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/rtc_base/physical_socket_server.cc"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Darwin":
 -
 -    DEFINES["WEBRTC_MAC"] = True
@@ -84994,6 +86629,10 @@ index 1ed74bfaad66..468c64eb06b7 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/rtc_base/physical_socket_server.cc"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "Linux":
 -
 -    DEFINES["USE_AURA"] = "1"
@@ -85010,6 +86649,10 @@ index 1ed74bfaad66..468c64eb06b7 100644
 -    DEFINES["__STDC_CONSTANT_MACROS"] = True
 -    DEFINES["__STDC_FORMAT_MACROS"] = True
 -
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/rtc_base/physical_socket_server.cc"
+-    ]
+-
 -if CONFIG["OS_TARGET"] == "OpenBSD":
 -
 -    DEFINES["USE_GLIB"] = "1"
@@ -85057,6 +86700,10 @@ index 1ed74bfaad66..468c64eb06b7 100644
 -        "secur32",
 -        "winmm"
 -    ]
+-
+-    UNIFIED_SOURCES += [
+-        "/third_party/libwebrtc/rtc_base/physical_socket_server.cc"
+-    ]
 +    DEFINES["_DEBUG"] = True
  
  if CONFIG["TARGET_CPU"] == "aarch64":
@@ -85155,7 +86802,7 @@ index 1ed74bfaad66..468c64eb06b7 100644
  
  Library("threading_gn")
 diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index c74be7306353..29f5854612cb 100644
+index 55044da704f0..b3d3a631906d 100644
 --- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
 @@ -12,12 +12,22 @@ AllowCompilerWarnings()
@@ -85179,7 +86826,7 @@ index c74be7306353..29f5854612cb 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -45,185 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -85374,7 +87021,7 @@ index c74be7306353..29f5854612cb 100644
  
  Library("timeutils_gn")
 diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index 9b5c10f949e9..4b0f96afeafd 100644
+index 6e5a6266c98d..f89c8dde62eb 100644
 --- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85397,7 +87044,7 @@ index 9b5c10f949e9..4b0f96afeafd 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -85561,7 +87208,7 @@ index 9b5c10f949e9..4b0f96afeafd 100644
 -
  Library("type_traits_gn")
 diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 8b55572cb5df..e32671858969 100644
+index 144e5ff789f9..e0450e78ecd4 100644
 --- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85584,7 +87231,7 @@ index 8b55572cb5df..e32671858969 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,107 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -85748,7 +87395,7 @@ index 8b55572cb5df..e32671858969 100644
 -
  Library("unique_id_generator_gn")
 diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index 259ef161a265..501410447cce 100644
+index 1a73da55be6d..fa188d4c8b2c 100644
 --- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85771,7 +87418,7 @@ index 259ef161a265..501410447cce 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,111 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -85939,7 +87586,7 @@ index 259ef161a265..501410447cce 100644
 -
  Library("unit_base_gn")
 diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index 42342eee8be2..6cb2d2ab092b 100644
+index 24bcc6accf79..c91a4d711206 100644
 --- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -85962,7 +87609,7 @@ index 42342eee8be2..6cb2d2ab092b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -86151,7 +87798,7 @@ index 42342eee8be2..6cb2d2ab092b 100644
  Library("weak_ptr_gn")
 diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 deleted file mode 100644
-index a33d30608038..000000000000
+index 89b4d408242e..000000000000
 --- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
 +++ /dev/null
 @@ -1,85 +0,0 @@
@@ -86199,7 +87846,7 @@ index a33d30608038..000000000000
 -DEFINES["_WINDOWS"] = True
 -DEFINES["__STD_C"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86242,7 +87889,7 @@ index a33d30608038..000000000000
 -Library("create_direct3d_device_gn")
 diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 deleted file mode 100644
-index 387109c968dc..000000000000
+index 0f2ade5af2ea..000000000000
 --- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
 +++ /dev/null
 @@ -1,85 +0,0 @@
@@ -86290,7 +87937,7 @@ index 387109c968dc..000000000000
 -DEFINES["_WINDOWS"] = True
 -DEFINES["__STD_C"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86333,7 +87980,7 @@ index 387109c968dc..000000000000
 -Library("get_activation_factory_gn")
 diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 deleted file mode 100644
-index c69cce6983f8..000000000000
+index d6968eb597c9..000000000000
 --- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
 +++ /dev/null
 @@ -1,85 +0,0 @@
@@ -86381,7 +88028,7 @@ index c69cce6983f8..000000000000
 -DEFINES["_WINDOWS"] = True
 -DEFINES["__STD_C"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86424,7 +88071,7 @@ index c69cce6983f8..000000000000
 -Library("hstring_gn")
 diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 deleted file mode 100644
-index 33b46947a497..000000000000
+index 014d6aaf9a74..000000000000
 --- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
 +++ /dev/null
 @@ -1,85 +0,0 @@
@@ -86472,7 +88119,7 @@ index 33b46947a497..000000000000
 -DEFINES["_WINDOWS"] = True
 -DEFINES["__STD_C"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86515,7 +88162,7 @@ index 33b46947a497..000000000000
 -Library("windows_version_gn")
 diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
 deleted file mode 100644
-index 607a23eb5e96..000000000000
+index 9c7c5cec86d1..000000000000
 --- third_party/libwebrtc/rtc_base/win32_gn/moz.build
 +++ /dev/null
 @@ -1,92 +0,0 @@
@@ -86564,7 +88211,7 @@ index 607a23eb5e96..000000000000
 -DEFINES["_WINDOWS"] = True
 -DEFINES["__STD_C"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86612,7 +88259,7 @@ index 607a23eb5e96..000000000000
 -
 -Library("win32_gn")
 diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index 0b8ed4f70c80..0eae58b028b7 100644
+index 3cb03f687969..4a1ec8b5bf42 100644
 --- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
 +++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -86635,7 +88282,7 @@ index 0b8ed4f70c80..0eae58b028b7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -86824,7 +88471,7 @@ index 0b8ed4f70c80..0eae58b028b7 100644
  Library("zero_memory_gn")
 diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
 deleted file mode 100644
-index 7b25d1f0596a..000000000000
+index baf20fbcbcb8..000000000000
 --- third_party/libwebrtc/sdk/base_objc_gn/moz.build
 +++ /dev/null
 @@ -1,79 +0,0 @@
@@ -86862,7 +88509,7 @@ index 7b25d1f0596a..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86909,7 +88556,7 @@ index 7b25d1f0596a..000000000000
 -Library("base_objc_gn")
 diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 deleted file mode 100644
-index a910dc1cb579..000000000000
+index b27bdaafb20a..000000000000
 --- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
 +++ /dev/null
 @@ -1,75 +0,0 @@
@@ -86947,7 +88594,7 @@ index a910dc1cb579..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -86990,7 +88637,7 @@ index a910dc1cb579..000000000000
 -Library("helpers_objc_gn")
 diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 deleted file mode 100644
-index 7bfe020e4d49..000000000000
+index bd4d77a39536..000000000000
 --- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
 +++ /dev/null
 @@ -1,70 +0,0 @@
@@ -87024,7 +88671,7 @@ index 7bfe020e4d49..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -87066,7 +88713,7 @@ index 7bfe020e4d49..000000000000
 -Library("videocapture_objc_gn")
 diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 deleted file mode 100644
-index 9e7f52704a52..000000000000
+index 25e08e62fadc..000000000000
 --- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
 +++ /dev/null
 @@ -1,73 +0,0 @@
@@ -87100,7 +88747,7 @@ index 9e7f52704a52..000000000000
 -DEFINES["__STDC_CONSTANT_MACROS"] = True
 -DEFINES["__STDC_FORMAT_MACROS"] = True
 -
--FINAL_LIBRARY = "webrtc"
+-FINAL_LIBRARY = "xul"
 -
 -
 -LOCAL_INCLUDES += [
@@ -87144,7 +88791,7 @@ index 9e7f52704a52..000000000000
 -
 -Library("videoframebuffer_objc_gn")
 diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
-index e4ee1a2ead8c..e58095f60b94 100644
+index cd0bc1b144b8..9f955dcf32b3 100644
 --- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87167,7 +88814,7 @@ index e4ee1a2ead8c..e58095f60b94 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -87355,7 +89002,7 @@ index e4ee1a2ead8c..e58095f60b94 100644
  
  Library("denormal_disabler_gn")
 diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index 2535fad4cc02..5b24ada78a23 100644
+index 30aa20ae3ede..c5bb79c454fc 100644
 --- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87378,7 +89025,7 @@ index 2535fad4cc02..5b24ada78a23 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -87573,7 +89220,7 @@ index 2535fad4cc02..5b24ada78a23 100644
  
  Library("field_trial_gn")
 diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index 484fc0d3caee..1da178fc929e 100644
+index 2347fbcbacf5..31a75cc714e1 100644
 --- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87596,7 +89243,7 @@ index 484fc0d3caee..1da178fc929e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,178 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -87784,7 +89431,7 @@ index 484fc0d3caee..1da178fc929e 100644
  
  Library("metrics_gn")
 diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index 3b2e26249ed4..df52edb77169 100644
+index 161fe336d913..ade9b1212194 100644
 --- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 +++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -87807,7 +89454,7 @@ index 3b2e26249ed4..df52edb77169 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -47,199 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88016,7 +89663,7 @@ index 3b2e26249ed4..df52edb77169 100644
  
  Library("system_wrappers_gn")
 diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index 5f400c69f937..e86bdab557d1 100644
+index 5a0d4a3984ef..020143107080 100644
 --- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 +++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -88039,7 +89686,7 @@ index 5f400c69f937..e86bdab557d1 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88219,7 +89866,7 @@ index 5f400c69f937..e86bdab557d1 100644
 -
  Library("rtp_test_utils_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
-index 95f5f7773064..a07cf094c60f 100644
+index 696c19c0a090..bdcf7cc0dc34 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/algorithm_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88232,7 +89879,7 @@ index 95f5f7773064..a07cf094c60f 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88354,7 +90001,7 @@ index 95f5f7773064..a07cf094c60f 100644
 -
  Library("algorithm_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
-index 3289a5ec7748..ea98e82e69b0 100644
+index 376a6873a7de..d8e126e98d22 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/algorithm/container_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88367,7 +90014,7 @@ index 3289a5ec7748..ea98e82e69b0 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88489,7 +90136,7 @@ index 3289a5ec7748..ea98e82e69b0 100644
 -
  Library("container_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
-index 3995b3210309..49c783cd4c81 100644
+index 1dbf8b303711..a5bb25ebbee5 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/atomic_hook_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88502,7 +90149,7 @@ index 3995b3210309..49c783cd4c81 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88624,7 +90271,7 @@ index 3995b3210309..49c783cd4c81 100644
 -
  Library("atomic_hook_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
-index a7dd82d8f3c1..ac7916a85e5d 100644
+index c74d13c51a7f..fa3789dd2bec 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/base_internal_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88637,7 +90284,7 @@ index a7dd82d8f3c1..ac7916a85e5d 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88759,7 +90406,7 @@ index a7dd82d8f3c1..ac7916a85e5d 100644
 -
  Library("base_internal_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
-index 0018526d3581..a1d553dad6db 100644
+index 5cd792ccd5d2..27118a5fb2d3 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/config_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88772,7 +90419,7 @@ index 0018526d3581..a1d553dad6db 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -88894,7 +90541,7 @@ index 0018526d3581..a1d553dad6db 100644
 -
  Library("config_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
-index 781c7ab8f05b..3e445069597d 100644
+index 26296e769d53..f6d55cb2edf7 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/core_headers_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -88907,7 +90554,7 @@ index 781c7ab8f05b..3e445069597d 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89029,7 +90676,7 @@ index 781c7ab8f05b..3e445069597d 100644
 -
  Library("core_headers_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
-index 04d6ac388069..e80e5c86aaea 100644
+index 284ba1262009..89638dbef9e0 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/log_severity_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89042,7 +90689,7 @@ index 04d6ac388069..e80e5c86aaea 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89182,7 +90829,7 @@ index 04d6ac388069..e80e5c86aaea 100644
  
  Library("log_severity_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
-index d7a0c48a78b8..e31c08d5328e 100644
+index f152e046ce64..990765b4dea1 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/nullability_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89195,7 +90842,7 @@ index d7a0c48a78b8..e31c08d5328e 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89317,7 +90964,7 @@ index d7a0c48a78b8..e31c08d5328e 100644
 -
  Library("nullability_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
-index b4d000282990..d3b730672fc6 100644
+index 67100a47728f..843518325fec 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/raw_logging_internal_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89330,7 +90977,7 @@ index b4d000282990..d3b730672fc6 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89470,7 +91117,7 @@ index b4d000282990..d3b730672fc6 100644
  
  Library("raw_logging_internal_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
-index 26e7ca140221..04e6ae930cb3 100644
+index 06b91ef80d22..e6011044ff71 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/base/throw_delegate_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89483,7 +91130,7 @@ index 26e7ca140221..04e6ae930cb3 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89623,7 +91270,7 @@ index 26e7ca140221..04e6ae930cb3 100644
  
  Library("throw_delegate_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
-index 2b964a65934e..367c6bd433a3 100644
+index 8ed66c3ce2c6..2f22adddfa94 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89636,7 +91283,7 @@ index 2b964a65934e..367c6bd433a3 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89758,7 +91405,7 @@ index 2b964a65934e..367c6bd433a3 100644
 -
  Library("cleanup_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
-index cc42f6b1cf95..3f4fc9ed0f88 100644
+index 0f3944e348c4..8fd358c0b828 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/cleanup/cleanup_internal_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89771,7 +91418,7 @@ index cc42f6b1cf95..3f4fc9ed0f88 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -89893,7 +91540,7 @@ index cc42f6b1cf95..3f4fc9ed0f88 100644
 -
  Library("cleanup_internal_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
-index be74f2073fb9..38403c4daf5f 100644
+index 758e27e19bdf..6a45401b4ad4 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/compressed_tuple_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -89906,7 +91553,7 @@ index be74f2073fb9..38403c4daf5f 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90028,7 +91675,7 @@ index be74f2073fb9..38403c4daf5f 100644
 -
  Library("compressed_tuple_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
-index 6007158942e5..f3c3c2ec8183 100644
+index 0aeeb25380b2..1ec3c2b3ff22 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90041,7 +91688,7 @@ index 6007158942e5..f3c3c2ec8183 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90163,7 +91810,7 @@ index 6007158942e5..f3c3c2ec8183 100644
 -
  Library("inlined_vector_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
-index 67fafc74cc9f..b5c250da1c55 100644
+index 3b6744eda733..7bbe29993c1b 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_internal_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90176,7 +91823,7 @@ index 67fafc74cc9f..b5c250da1c55 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90298,7 +91945,7 @@ index 67fafc74cc9f..b5c250da1c55 100644
 -
  Library("inlined_vector_internal_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
-index a7dc8399fa1a..8cc78181cb75 100644
+index 63e6206cdfb4..31b936c12c59 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/any_invocable_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90311,7 +91958,7 @@ index a7dc8399fa1a..8cc78181cb75 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90433,7 +92080,7 @@ index a7dc8399fa1a..8cc78181cb75 100644
 -
  Library("any_invocable_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
-index 7d7ddda3ab0d..5c92f038c84f 100644
+index c26f1ed6a481..fb0da281c4cc 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/functional/bind_front_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90446,7 +92093,7 @@ index 7d7ddda3ab0d..5c92f038c84f 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90568,7 +92215,7 @@ index 7d7ddda3ab0d..5c92f038c84f 100644
 -
  Library("bind_front_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
-index 011681082bcb..cf5df0d3048a 100644
+index 398b663a3d1e..72b51836d300 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/memory/memory_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90581,7 +92228,7 @@ index 011681082bcb..cf5df0d3048a 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90703,7 +92350,7 @@ index 011681082bcb..cf5df0d3048a 100644
 -
  Library("memory_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
-index be165cdd324a..d7c6a3f7be95 100644
+index 6d2e55152f52..914e219e6503 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/meta/type_traits_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90716,7 +92363,7 @@ index be165cdd324a..d7c6a3f7be95 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90838,7 +92485,7 @@ index be165cdd324a..d7c6a3f7be95 100644
 -
  Library("type_traits_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
-index f08ba233b08c..09fa161e8735 100644
+index 765dc92eb6d3..fa04a621dfa2 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/bits_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90851,7 +92498,7 @@ index f08ba233b08c..09fa161e8735 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -90973,7 +92620,7 @@ index f08ba233b08c..09fa161e8735 100644
 -
  Library("bits_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
-index 48c148b03927..947feb765e92 100644
+index 0d1a183abaf9..294e64ffcb5e 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/numeric/int128_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -90986,7 +92633,7 @@ index 48c148b03927..947feb765e92 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91126,7 +92773,7 @@ index 48c148b03927..947feb765e92 100644
  
  Library("int128_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
-index 2dd442a89eeb..7a2c3c58f1a3 100644
+index 4002fa626303..2908acf7ba9f 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/string_view_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91139,7 +92786,7 @@ index 2dd442a89eeb..7a2c3c58f1a3 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91279,7 +92926,7 @@ index 2dd442a89eeb..7a2c3c58f1a3 100644
  
  Library("string_view_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
-index 84461a1a2896..26ad6583df10 100644
+index 8105bb2f27d1..4cd3456a3ff3 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/strings/strings_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91292,7 +92939,7 @@ index 84461a1a2896..26ad6583df10 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -41,133 +46,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91432,7 +93079,7 @@ index 84461a1a2896..26ad6583df10 100644
  
  Library("strings_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
-index 71a47188d400..c963ce692f25 100644
+index 25164c3e5f91..4fe2271056dc 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_optional_access_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91445,7 +93092,7 @@ index 71a47188d400..c963ce692f25 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91585,7 +93232,7 @@ index 71a47188d400..c963ce692f25 100644
  
  Library("bad_optional_access_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
-index d46074339fc9..5d0ddb736b8b 100644
+index 83007237aa43..7feffa5b7fa7 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/bad_variant_access_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91598,7 +93245,7 @@ index d46074339fc9..5d0ddb736b8b 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -36,133 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91738,7 +93385,7 @@ index d46074339fc9..5d0ddb736b8b 100644
  
  Library("bad_variant_access_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
-index 7d3070b20045..f68149f85c45 100644
+index 890fa95dc850..9538221de171 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/optional_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91751,7 +93398,7 @@ index 7d3070b20045..f68149f85c45 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -91873,7 +93520,7 @@ index 7d3070b20045..f68149f85c45 100644
 -
  Library("optional_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
-index 37133145c258..293b2b62e2e5 100644
+index 438c3e8f7ca6..a8f20aad44d7 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -91886,7 +93533,7 @@ index 37133145c258..293b2b62e2e5 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -92008,7 +93655,7 @@ index 37133145c258..293b2b62e2e5 100644
 -
  Library("span_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
-index fd47ce4b3650..59ea6584a0f4 100644
+index b548c0214b55..4a1c6b4239bb 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92021,7 +93668,7 @@ index fd47ce4b3650..59ea6584a0f4 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -92143,7 +93790,7 @@ index fd47ce4b3650..59ea6584a0f4 100644
 -
  Library("variant_gn")
 diff --git third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
-index 8a8c4fd3406a..c06e16fa60f4 100644
+index c47e6649127c..05338e798930 100644
 --- third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
 +++ third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn/moz.build
 @@ -10,6 +10,11 @@ COMPILE_FLAGS["OS_INCLUDES"] = []
@@ -92156,7 +93803,7 @@ index 8a8c4fd3406a..c06e16fa60f4 100644
 +DEFINES["_LARGEFILE64_SOURCE"] = True
 +DEFINES["_LARGEFILE_SOURCE"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -32,117 +37,10 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -92278,7 +93925,7 @@ index 8a8c4fd3406a..c06e16fa60f4 100644
 -
  Library("utility_gn")
 diff --git third_party/libwebrtc/third_party/drm/drm_gn/moz.build third_party/libwebrtc/third_party/drm/drm_gn/moz.build
-index a397ac2643f2..ae35e8229645 100644
+index 971e9b6a89f8..24d5305eaf44 100644
 --- third_party/libwebrtc/third_party/drm/drm_gn/moz.build
 +++ third_party/libwebrtc/third_party/drm/drm_gn/moz.build
 @@ -12,21 +12,17 @@ AllowCompilerWarnings()
@@ -92327,7 +93974,7 @@ index a397ac2643f2..ae35e8229645 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
-index badbac28ea59..7e55d47e63a2 100644
+index 9273b95ead40..0919eb0f43e8 100644
 --- third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
 +++ third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
 @@ -12,21 +12,17 @@ AllowCompilerWarnings()
@@ -92376,7 +94023,7 @@ index badbac28ea59..7e55d47e63a2 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-index 000380105901..ef88818e351d 100644
+index 35f0925d3bde..c63ac3dc1601 100644
 --- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
 +++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
 @@ -12,21 +12,17 @@ AllowCompilerWarnings()
@@ -92425,7 +94072,7 @@ index 000380105901..ef88818e351d 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index ed639610edb8..bec84e2f5a4d 100644
+index a3038e0c4a61..55e100bde724 100644
 --- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
 +++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -92448,7 +94095,7 @@ index ed639610edb8..bec84e2f5a4d 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -41,107 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -92612,7 +94259,7 @@ index ed639610edb8..bec84e2f5a4d 100644
 -
  Library("yuv_gn")
 diff --git third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
-index f1aad5d0b448..e3c3b4dc2ce0 100644
+index 836a04a7c723..4adcdaca807c 100644
 --- third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
 +++ third_party/libwebrtc/third_party/pffft/pffft_gn/moz.build
 @@ -9,6 +9,14 @@
@@ -92627,7 +94274,7 @@ index f1aad5d0b448..e3c3b4dc2ce0 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
 +
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
  
 @@ -33,87 +41,15 @@ if not CONFIG["MOZ_DEBUG"]:
@@ -92784,7 +94431,7 @@ index f1aad5d0b448..e3c3b4dc2ce0 100644
  
  Library("pffft_gn")
 diff --git third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
-index 6209fa98cc55..bc0fbed530b4 100644
+index af5c5520ca80..a6d3fb5993d4 100644
 --- third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
 +++ third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
 @@ -12,22 +12,18 @@ AllowCompilerWarnings()
@@ -92834,7 +94481,7 @@ index 6209fa98cc55..bc0fbed530b4 100644
      DEFINES["USE_X11"] = "1"
  
 diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
-index 7122118c08c9..7c0c3d96945e 100644
+index b10b4c330ef8..3703f7ef3366 100644
 --- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 +++ third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
 @@ -9,6 +9,14 @@
@@ -92849,7 +94496,7 @@ index 7122118c08c9..7c0c3d96945e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
 +
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
  
 @@ -33,139 +41,16 @@ if not CONFIG["MOZ_DEBUG"]:
@@ -92996,7 +94643,7 @@ index 7122118c08c9..7c0c3d96945e 100644
  
  Library("rnn_vad_gn")
 diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index 18d29da55678..ee1b5000f55a 100644
+index 4bbb3e4e624c..62040f7084c2 100644
 --- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
 +++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -93019,7 +94666,7 @@ index 18d29da55678..ee1b5000f55a 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -52,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -93219,7 +94866,7 @@ index 18d29da55678..ee1b5000f55a 100644
  
  Library("video_adaptation_gn")
 diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index 4dbe7bf32c49..f417c976fc09 100644
+index 605a6b14f7f5..05a856fbe4af 100644
 --- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
 +++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -93242,7 +94889,7 @@ index 4dbe7bf32c49..f417c976fc09 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -93437,7 +95084,7 @@ index 4dbe7bf32c49..f417c976fc09 100644
  
  Library("encoder_config_gn")
 diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index c34883fb3730..bf53b31dbe77 100644
+index 3014de468204..57c6d4c2998b 100644
 --- third_party/libwebrtc/video/config/streams_config_gn/moz.build
 +++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -93460,7 +95107,7 @@ index c34883fb3730..bf53b31dbe77 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -44,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -93660,7 +95307,7 @@ index c34883fb3730..bf53b31dbe77 100644
  
  Library("streams_config_gn")
 diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index 0aff4a854c57..c30a81d15c5e 100644
+index c1ae808ab1bb..1c51f66173fe 100644
 --- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
 +++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -93683,7 +95330,7 @@ index 0aff4a854c57..c30a81d15c5e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -93882,7 +95529,7 @@ index 0aff4a854c57..c30a81d15c5e 100644
  
  Library("decode_synchronizer_gn")
 diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-index a860d550ad87..be8a118afa55 100644
+index 6e073f2e20c8..d9e054785471 100644
 --- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
 +++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -93905,7 +95552,7 @@ index a860d550ad87..be8a118afa55 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -94104,7 +95751,7 @@ index a860d550ad87..be8a118afa55 100644
  
  Library("frame_cadence_adapter_gn")
 diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-index d3fb5a47101a..748c6fbb6acf 100644
+index dfe1ecd08c0c..ddac47c4650d 100644
 --- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94127,7 +95774,7 @@ index d3fb5a47101a..748c6fbb6acf 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,122 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -94306,7 +95953,7 @@ index d3fb5a47101a..748c6fbb6acf 100644
 -
  Library("frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-index 9161f27d718e..bf76b80dce48 100644
+index f1b85291c770..d4b8b9b731ba 100644
 --- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
 +++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94329,7 +95976,7 @@ index 9161f27d718e..bf76b80dce48 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -94528,7 +96175,7 @@ index 9161f27d718e..bf76b80dce48 100644
  
  Library("frame_decode_timing_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index 309c0b159e13..080bbd8999f7 100644
+index 001433ce9ffe..c57fc823f293 100644
 --- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94551,7 +96198,7 @@ index 309c0b159e13..080bbd8999f7 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -94751,7 +96398,7 @@ index 309c0b159e13..080bbd8999f7 100644
  
  Library("frame_dumping_decoder_gn")
 diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-index 6719245825f8..18b7d57c46ae 100644
+index a3bf0c641a1d..262c5170e8bc 100644
 --- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
 +++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94774,7 +96421,7 @@ index 6719245825f8..18b7d57c46ae 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -94974,7 +96621,7 @@ index 6719245825f8..18b7d57c46ae 100644
  
  Library("frame_dumping_encoder_gn")
 diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-index 36d087a36ad9..bb86b6904a1e 100644
+index 42488b31f3f8..88aaeeb2fa86 100644
 --- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
 +++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -94997,7 +96644,7 @@ index 36d087a36ad9..bb86b6904a1e 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -95192,7 +96839,7 @@ index 36d087a36ad9..bb86b6904a1e 100644
  
  Library("incoming_video_stream_gn")
 diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-index b0b4923e3415..c959f629c28c 100644
+index 24bd462a0c8e..a4d64795d0c7 100644
 --- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
 +++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95215,7 +96862,7 @@ index b0b4923e3415..c959f629c28c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,185 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -95410,7 +97057,7 @@ index b0b4923e3415..c959f629c28c 100644
  
  Library("video_render_frames_gn")
 diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-index 302f8420c940..72717c771efc 100644
+index d1ee8ffccb72..d483272d93cf 100644
 --- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
 +++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95433,7 +97080,7 @@ index 302f8420c940..72717c771efc 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -95632,7 +97279,7 @@ index 302f8420c940..72717c771efc 100644
  
  Library("task_queue_frame_decode_scheduler_gn")
 diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-index e38fabc4cc62..0d30b9bd4787 100644
+index b0eb431cfba7..067e25f152bd 100644
 --- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
 +++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95655,7 +97302,7 @@ index e38fabc4cc62..0d30b9bd4787 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,174 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -95839,7 +97486,7 @@ index e38fabc4cc62..0d30b9bd4787 100644
  
  Library("unique_timestamp_counter_gn")
 diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index 5e3d75d621df..a7091e452af6 100644
+index 09826d37f927..a92734005e3c 100644
 --- third_party/libwebrtc/video/video_gn/moz.build
 +++ third_party/libwebrtc/video/video_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -95862,9 +97509,9 @@ index 5e3d75d621df..a7091e452af6 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
-@@ -63,190 +73,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -62,190 +72,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
  
      DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96062,7 +97709,7 @@ index 5e3d75d621df..a7091e452af6 100644
  
  Library("video_gn")
 diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-index f7e5be24c0e5..bd076121f04b 100644
+index d24bf03a5991..d5f4170c45d8 100644
 --- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
 +++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -96085,7 +97732,7 @@ index f7e5be24c0e5..bd076121f04b 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,189 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -96284,7 +97931,7 @@ index f7e5be24c0e5..bd076121f04b 100644
  
  Library("video_receive_stream_timeout_tracker_gn")
 diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index 7da76222b17f..d3d87dd6dc37 100644
+index b99c992d4953..b1f2505dadb4 100644
 --- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -96307,7 +97954,7 @@ index 7da76222b17f..d3d87dd6dc37 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -43,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -96507,7 +98154,7 @@ index 7da76222b17f..d3d87dd6dc37 100644
  
  Library("video_stream_buffer_controller_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index af4e29ee0a0e..ebcf5af12e54 100644
+index a51248556ab1..23e6fa0a8b70 100644
 --- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -96530,7 +98177,7 @@ index af4e29ee0a0e..ebcf5af12e54 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -48,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -96730,7 +98377,7 @@ index af4e29ee0a0e..ebcf5af12e54 100644
  
  Library("video_stream_encoder_impl_gn")
 diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-index beeb7f91175e..82e65469d09c 100644
+index 7eeb5d9f4203..18a6af8783cc 100644
 --- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
 +++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -96753,7 +98400,7 @@ index beeb7f91175e..82e65469d09c 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,118 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
@@ -96928,7 +98575,7 @@ index beeb7f91175e..82e65469d09c 100644
 -
  Library("video_stream_encoder_interface_gn")
 diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index b327aad03049..4b3dba6c6883 100644
+index 0a5908916a50..535ef83511d1 100644
 --- third_party/libwebrtc/webrtc_gn/moz.build
 +++ third_party/libwebrtc/webrtc_gn/moz.build
 @@ -12,11 +12,21 @@ AllowCompilerWarnings()
@@ -96951,7 +98598,7 @@ index b327aad03049..4b3dba6c6883 100644
 +DEFINES["__STDC_CONSTANT_MACROS"] = True
 +DEFINES["__STDC_FORMAT_MACROS"] = True
  
- FINAL_LIBRARY = "webrtc"
+ FINAL_LIBRARY = "xul"
  
 @@ -39,143 +49,23 @@ if not CONFIG["MOZ_DEBUG"]:
  if CONFIG["MOZ_DEBUG"] == "1":
diff --git a/www/firefox/files/patch-tools_profiler_core_patform.cpp b/www/firefox/files/patch-tools_profiler_core_patform.cpp
deleted file mode 100644
index 905e6d7bbe49..000000000000
--- a/www/firefox/files/patch-tools_profiler_core_patform.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 45a7951cb6a9b1735b9b6cec89db69b5933715c7
-Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-Date:   Mon Mar 28 21:54:35 2022 +0200
-
-    FreeBSD can use sched_getcpu() from 1400046/1300524 on
-
-diff --git tools/profiler/core/platform.cpp tools/profiler/core/platform.cpp
-index 92bcc1100687..2f17a88942a8 100644
---- tools/profiler/core/platform.cpp
-+++ tools/profiler/core/platform.cpp
-@@ -111,6 +111,20 @@
- #  include <cpuid.h>
- #endif
- 
-+#if defined(GP_OS_freebsd)
-+#include <sys/param.h>
-+// "after making CPU_SET macros compatible with glibc"
-+#  if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000)
-+#  include <sched.h>
-+#  else
-+#    if __x86_64__ || __i386__
-+// similar cpuid_count() trick as on Darwin, using LLVM
-+// but not for all CPUs
-+#      include <cpuid.h>
-+#    endif
-+#  endif
-+#endif
-+
- #if defined(GP_OS_windows)
- #  include <processthreadsapi.h>
- 
-@@ -6368,6 +6382,19 @@ void profiler_mark_thread_awake() {
-     cpuId = ebx >> 24;
-   }
- #  endif
-+#elif defined(GP_OS_freebsd) 
-+#  if __FreeBSD_version > 1400045 || (__FreeBSD_version > 1300523 && __FreeBSD_version < 1400000)
-+  cpuId = sched_getcpu();
-+#  elif defined(__amd64__)
-+  unsigned int eax, ebx, ecx, edx;
-+  __cpuid_count(1, 0, eax, ebx, ecx, edx);
-+  // Check if we have an APIC.
-+  if ((edx & (1 << 9))) {
-+    // APIC ID is bits 24-31 of EBX
-+    cpuId = ebx >> 24;
-+  }
-+#  endif
-+// the fallthrough is cpuID = 0
- #else
-   cpuId = sched_getcpu();
- #endif
diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile
index 3cfdb6f7b8cd..67963a09227c 100644
--- a/www/forgejo/Makefile
+++ b/www/forgejo/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.21.10-0
-PORTREVISION=	1
+DISTVERSION=	7.0.4
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	forgejo-src-${DISTVERSION}
diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo
index 35e0c2d393a7..e60439031aae 100644
--- a/www/forgejo/distinfo
+++ b/www/forgejo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712360403
-SHA256 (forgejo-src-1.21.10-0.tar.gz) = 0cc21835404e40355cf7125b479efebb1fecf2cc17d018d4d54521d75943caf5
-SIZE (forgejo-src-1.21.10-0.tar.gz) = 58820868
+TIMESTAMP = 1718527772
+SHA256 (forgejo-src-7.0.4.tar.gz) = 881e55d92a4145238a8e7a39dd5c64d547c7629361005ded0393f33ec9e6bba4
+SIZE (forgejo-src-7.0.4.tar.gz) = 54935871
diff --git a/www/galene/Makefile b/www/galene/Makefile
index fb85e81a40f9..86935af9f671 100644
--- a/www/galene/Makefile
+++ b/www/galene/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	galene
 DISTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www net-im
 
 MAINTAINER=	bapt@FreeBSD.org
diff --git a/www/gallery-dl/Makefile b/www/gallery-dl/Makefile
index 8cf65649f208..a08a607a11f6 100644
--- a/www/gallery-dl/Makefile
+++ b/www/gallery-dl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gallery-dl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.26.9
+DISTVERSION=	1.27.1
 CATEGORIES=	www
 
 # Implicit approval to commit trivial version updates.
diff --git a/www/gallery-dl/distinfo b/www/gallery-dl/distinfo
index f4015f3959a0..fb051207fedf 100644
--- a/www/gallery-dl/distinfo
+++ b/www/gallery-dl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711212089
-SHA256 (mikf-gallery-dl-v1.26.9_GH0.tar.gz) = 62508098e39131b1123341e17acfdcd4170a814e245bc23ce0e1b1759387e630
-SIZE (mikf-gallery-dl-v1.26.9_GH0.tar.gz) = 670467
+TIMESTAMP = 1719069104
+SHA256 (mikf-gallery-dl-v1.27.1_GH0.tar.gz) = ffb24c82e45f773040d836e9be3ebf4463842bac44ad979655286946b5ad926e
+SIZE (mikf-gallery-dl-v1.27.1_GH0.tar.gz) = 686087
diff --git a/www/ghostunnel/Makefile b/www/ghostunnel/Makefile
index 71007d6b9268..10dd9cbd8033 100644
--- a/www/ghostunnel/Makefile
+++ b/www/ghostunnel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ghostunnel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.3
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 5bf1df68f0c4..4ee93d7b7984 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.21.6
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ \
 		https://dl.gitea.io/gitea/${DISTVERSION}/
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index d4b91db168ea..03ce9a176363 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gitlab-pages
-PORTVERSION=	16.11.1
+PORTVERSION=	16.11.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 88dda09b0e8c..a0a26ee3eb8a 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713982677
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.1/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.1/go.mod) = 3328
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.1/gitlab-pages-v16.11.1.tar.bz2) = 65597af30b8178b0769934e78f4fa6caccb64eaedae7324133acf8161bdbfc04
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.1/gitlab-pages-v16.11.1.tar.bz2) = 212534
+TIMESTAMP = 1715233578
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.2/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.2/go.mod) = 3328
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.2/gitlab-pages-v16.11.2.tar.bz2) = b3e20a66f98fe1b18f455f24434078cb9cde069040ca3ad49a92acc9abae2553
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.2/gitlab-pages-v16.11.2.tar.bz2) = 212649
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 113f1dab6900..05e711f7afc4 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.11.1
+PORTVERSION=	16.11.2
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index c5664eafd7e9..68c3f2fa644c 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713982846
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/go.mod) = 2c1ff4ba288aa4bf72cc93438b6dda7660257f50eeb7823f9acc0dde5412c499
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/go.mod) = 7010
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/gitlab-foss-v16.11.1.tar.bz2) = 2488091d06c2f4a2643f7d72449c77bc35d7a1c607123ec1fddb467884ed867c
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.1/gitlab-foss-v16.11.1.tar.bz2) = 102638191
+TIMESTAMP = 1715233555
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/go.mod) = 2c1ff4ba288aa4bf72cc93438b6dda7660257f50eeb7823f9acc0dde5412c499
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/go.mod) = 7010
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/gitlab-foss-v16.11.2.tar.bz2) = df51a6799690bdaf09091009993afdccd9fbff07387431ec591217de30e57a72
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/gitlab-foss-v16.11.2.tar.bz2) = 102643047
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index a2297321bcb7..453271418f03 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-${FLAVOR:Uce}
-PORTVERSION=	16.11.1
+PORTVERSION=	16.11.2
 DISTVERSIONPREFIX=	v
 .if ${FLAVOR:U} == ee
 DISTVERSIONSUFFIX=	-ee
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index b66e7e93f631..3f141a251508 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1713983499
-SHA256 (gitlab-foss-v16.11.1.tar.bz2) = 2488091d06c2f4a2643f7d72449c77bc35d7a1c607123ec1fddb467884ed867c
-SIZE (gitlab-foss-v16.11.1.tar.bz2) = 102638191
-TIMESTAMP = 1713983576
-SHA256 (gitlab-v16.11.1-ee.tar.bz2) = 12b67b117cb5c7b189fc3ead7dcfa01fc67f7a94ed0b4b0abe40b1140fb4a72c
-SIZE (gitlab-v16.11.1-ee.tar.bz2) = 110307818
+TIMESTAMP = 1715233601
+SHA256 (gitlab-foss-v16.11.2.tar.bz2) = df51a6799690bdaf09091009993afdccd9fbff07387431ec591217de30e57a72
+SIZE (gitlab-foss-v16.11.2.tar.bz2) = 102643047
+TIMESTAMP = 1715233651
+SHA256 (gitlab-v16.11.2-ee.tar.bz2) = f0a5872ea2057fcaa204e78cf493b5cf259b8112471924ebb09d201701656035
+SIZE (gitlab-v16.11.2-ee.tar.bz2) = 110321273
diff --git a/www/go-www/Makefile b/www/go-www/Makefile
index 1d9690005ed4..fd07da98b920 100644
--- a/www/go-www/Makefile
+++ b/www/go-www/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	www
 PORTVERSION=	2.0.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 PKGNAMEPREFIX=	go-
 
diff --git a/www/gobuffalo/Makefile b/www/gobuffalo/Makefile
index abe8caf3d0c5..302ce86a5f29 100644
--- a/www/gobuffalo/Makefile
+++ b/www/gobuffalo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gobuffalo
 PORTVERSION=	0.16.27
 DISTVERSIONPREFIX=	v
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	dmgk@FreeBSD.org
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 6a4a7efd8047..002b5b428b1a 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hugo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.123.8
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	go
diff --git a/www/gotty/Makefile b/www/gotty/Makefile
index 26b8755c335e..3e4cbde5a357 100644
--- a/www/gotty/Makefile
+++ b/www/gotty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gotty
 PORTVERSION=	1.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	12
+PORTREVISION=	14
 CATEGORIES=	www net
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index 5a4d3578c094..552fcf3a0b13 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
 DISTVERSION=	10.4.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
index a2cfc74cdfbf..7be15caadb52 100644
--- a/www/grafana9/Makefile
+++ b/www/grafana9/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5.17
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
diff --git a/www/gurl/Makefile b/www/gurl/Makefile
index d96b50321db5..c0db232a1a5e 100644
--- a/www/gurl/Makefile
+++ b/www/gurl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gurl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.3
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	dch@FreeBSD.org
diff --git a/www/icapeg/Makefile b/www/icapeg/Makefile
index b073c875a3e7..11ed7593bf53 100644
--- a/www/icapeg/Makefile
+++ b/www/icapeg/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	icapeg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www
 
 MAINTAINER=	support@egirna.com
diff --git a/www/jira-cli/Makefile b/www/jira-cli/Makefile
index c8808debb055..7380a2157217 100644
--- a/www/jira-cli/Makefile
+++ b/www/jira-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	jira-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www
 DIST_SUBDIR=	jira-cli
 
diff --git a/www/kanboard/Makefile b/www/kanboard/Makefile
index f6fbc20513e3..c3507e549769 100644
--- a/www/kanboard/Makefile
+++ b/www/kanboard/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kanboard
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.35
+DISTVERSION=	1.2.37
 CATEGORIES=	www
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
diff --git a/www/kanboard/distinfo b/www/kanboard/distinfo
index e4280837c7a2..a31f7f95c5b2 100644
--- a/www/kanboard/distinfo
+++ b/www/kanboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710743070
-SHA256 (kanboard-kanboard-v1.2.35_GH0.tar.gz) = 3c6a4175fe31c50aea68e5a252d9e3f36e98fc0948f93583dfbfacf570171c64
-SIZE (kanboard-kanboard-v1.2.35_GH0.tar.gz) = 3389625
+TIMESTAMP = 1717744607
+SHA256 (kanboard-kanboard-v1.2.37_GH0.tar.gz) = dc65cf9ec02b9e869992c8480516a1ef0d6fc23e331db9c489a45d41f1c8ee49
+SIZE (kanboard-kanboard-v1.2.37_GH0.tar.gz) = 3395980
diff --git a/www/kineto/Makefile b/www/kineto/Makefile
index a4b7bdf5e15b..d0947e67bbae 100644
--- a/www/kineto/Makefile
+++ b/www/kineto/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kineto
 DISTVERSION=	g20211104
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	corey@electrickite.org
diff --git a/www/lux/Makefile b/www/lux/Makefile
index 166f97805be9..4c0f758246dc 100644
--- a/www/lux/Makefile
+++ b/www/lux/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lux
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.23.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/www/lzr/Makefile b/www/lzr/Makefile
index 21c3c3bbce5f..9bb551eba2e8 100644
--- a/www/lzr/Makefile
+++ b/www/lzr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lzr
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/mattermost-server/Makefile b/www/mattermost-server/Makefile
index 2a503aa1f23d..d412618485c4 100644
--- a/www/mattermost-server/Makefile
+++ b/www/mattermost-server/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	mattermost
-DISTVERSION=	8.1.11
-DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTVERSION=	9.5.6
 CATEGORIES=	www
-MASTER_SITES=	LOCAL/decke/${PORTNAME}-${DISTVERSIONFULL}/:gomod
+MASTER_SITES=	LOCAL/decke
 PKGNAMESUFFIX=	-server
-DISTFILES=	go.mod:gomod
 
 # implicit-approval+ for decke
 MAINTAINER=	bofh@FreeBSD.org
@@ -20,14 +17,14 @@ ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp
 
-USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	mattermost
+USES=		go:1.22,modules tar:xz
 USE_RC_SUBR=	mattermostd
 
-GO_MODULE=	github.com/mattermost/mattermost/server/v8
 GO_TARGET=	./cmd/mattermost ./scripts/config_generator
-GO_BUILDFLAGS=	-ldflags="-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${PORTVERSION}"
+GO_BUILDFLAGS=	-ldflags=" \
+		-X github.com/mattermost/mattermost/server/public/model.BuildNumber=${PORTVERSION} \
+		-X github.com/mattermost/mattermost/server/public/model.BuildHashEnterprise=none \
+		-X github.com/mattermost/mattermost/server/public/model.BuildEnterpriseReady=false"
 
 WRKSRC_SUBDIR=	server
 WWWDIR=		${PREFIX}/www/mattermost
@@ -38,9 +35,6 @@ MATTERMOSTD_GROUP=	mattermost
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
-post-extract:
-	@${RM} ${WRKSRC}/vendor/modules.txt
-
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
diff --git a/www/mattermost-server/distinfo b/www/mattermost-server/distinfo
index 904a531af8c8..dd0fc6d89954 100644
--- a/www/mattermost-server/distinfo
+++ b/www/mattermost-server/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1711285484
-SHA256 (go/www_mattermost-server/mattermost-mattermost-v8.1.11_GH0/go.mod) = f374df2f7ee6321214990b4de5d14fbd93c02a52e951de7fac0c2eb0b18fb247
-SIZE (go/www_mattermost-server/mattermost-mattermost-v8.1.11_GH0/go.mod) = 12109
-SHA256 (go/www_mattermost-server/mattermost-mattermost-v8.1.11_GH0/mattermost-mattermost-v8.1.11_GH0.tar.gz) = 17f329839085c11afd857bac763dc006523791f19753b1bd4db829dd7b36e56d
-SIZE (go/www_mattermost-server/mattermost-mattermost-v8.1.11_GH0/mattermost-mattermost-v8.1.11_GH0.tar.gz) = 148727055
+TIMESTAMP = 1717684145
+SHA256 (mattermost-9.5.6.tar.xz) = 91c29ccee6d93464fc5eac5ce514a0130a6e91610e68ae161ddda7f934f6fd80
+SIZE (mattermost-9.5.6.tar.xz) = 104870280
diff --git a/www/mattermost-server/pkg-plist b/www/mattermost-server/pkg-plist
index 5fe1d1d7bdf5..f083b7ba3098 100644
--- a/www/mattermost-server/pkg-plist
+++ b/www/mattermost-server/pkg-plist
@@ -2,25 +2,66 @@ bin/mattermostd
 %%ETCDIR%%/config.json.sample
 %%WWWDIR%%/fonts/OFL.txt
 %%WWWDIR%%/fonts/nunito-bold.ttf
+%%WWWDIR%%/i18n/am.json
+%%WWWDIR%%/i18n/be.json
 %%WWWDIR%%/i18n/bg.json
+%%WWWDIR%%/i18n/bn.json
+%%WWWDIR%%/i18n/br.json
+%%WWWDIR%%/i18n/ca.json
+%%WWWDIR%%/i18n/cs.json
+%%WWWDIR%%/i18n/da.json
 %%WWWDIR%%/i18n/de.json
+%%WWWDIR%%/i18n/el.json
 %%WWWDIR%%/i18n/en.json
 %%WWWDIR%%/i18n/en_AU.json
 %%WWWDIR%%/i18n/es.json
+%%WWWDIR%%/i18n/et.json
+%%WWWDIR%%/i18n/eu.json
 %%WWWDIR%%/i18n/fa.json
+%%WWWDIR%%/i18n/fi.json
+%%WWWDIR%%/i18n/fil.json
 %%WWWDIR%%/i18n/fr.json
+%%WWWDIR%%/i18n/fy.json
+%%WWWDIR%%/i18n/gl.json
+%%WWWDIR%%/i18n/gu.json
+%%WWWDIR%%/i18n/he.json
+%%WWWDIR%%/i18n/hi.json
+%%WWWDIR%%/i18n/hr.json
 %%WWWDIR%%/i18n/hu.json
+%%WWWDIR%%/i18n/id.json
+%%WWWDIR%%/i18n/is.json
 %%WWWDIR%%/i18n/it.json
 %%WWWDIR%%/i18n/ja.json
+%%WWWDIR%%/i18n/ka.json
+%%WWWDIR%%/i18n/kk.json
+%%WWWDIR%%/i18n/kk_Latn.json
+%%WWWDIR%%/i18n/km.json
 %%WWWDIR%%/i18n/ko.json
+%%WWWDIR%%/i18n/la.json
+%%WWWDIR%%/i18n/lo.json
+%%WWWDIR%%/i18n/lt.json
+%%WWWDIR%%/i18n/lv.json
+%%WWWDIR%%/i18n/mk.json
+%%WWWDIR%%/i18n/ml.json
+%%WWWDIR%%/i18n/mn.json
+%%WWWDIR%%/i18n/nb_NO.json
+%%WWWDIR%%/i18n/ne.json
 %%WWWDIR%%/i18n/nl.json
 %%WWWDIR%%/i18n/pl.json
+%%WWWDIR%%/i18n/pr.json
 %%WWWDIR%%/i18n/pt-BR.json
+%%WWWDIR%%/i18n/pt.json
 %%WWWDIR%%/i18n/ro.json
 %%WWWDIR%%/i18n/ru.json
+%%WWWDIR%%/i18n/si.json
+%%WWWDIR%%/i18n/sl.json
+%%WWWDIR%%/i18n/sq.json
+%%WWWDIR%%/i18n/sr.json
 %%WWWDIR%%/i18n/sv.json
+%%WWWDIR%%/i18n/th.json
 %%WWWDIR%%/i18n/tr.json
 %%WWWDIR%%/i18n/uk.json
+%%WWWDIR%%/i18n/vi.json
 %%WWWDIR%%/i18n/zh-CN.json
 %%WWWDIR%%/i18n/zh-TW.json
 %%WWWDIR%%/templates/cloud_14_day_arrears.html
@@ -28,6 +69,7 @@ bin/mattermostd
 %%WWWDIR%%/templates/cloud_45_day_arrears.html
 %%WWWDIR%%/templates/cloud_7_day_arrears.html
 %%WWWDIR%%/templates/cloud_90_day_arrears.html
+%%WWWDIR%%/templates/cloud_renewal_notification.html
 %%WWWDIR%%/templates/cloud_upgrade_confirmation.html
 %%WWWDIR%%/templates/cloud_welcome_email.html
 %%WWWDIR%%/templates/deactivate_body.html
@@ -39,6 +81,7 @@ bin/mattermostd
 %%WWWDIR%%/templates/globalrelay_compliance_export_message.html
 %%WWWDIR%%/templates/globalrelay_compliance_export_participant_row.html
 %%WWWDIR%%/templates/invite_body.html
+%%WWWDIR%%/templates/ip_filters_changed.html
 %%WWWDIR%%/templates/license_up_for_renewal.html
 %%WWWDIR%%/templates/messages_notification.html
 %%WWWDIR%%/templates/mfa_change_body.html
diff --git a/www/mattermost-webapp/Makefile b/www/mattermost-webapp/Makefile
index 16c6b08ef3eb..d04e2ce29384 100644
--- a/www/mattermost-webapp/Makefile
+++ b/www/mattermost-webapp/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	mattermost-webapp
-PORTVERSION=	8.1.11
+PORTVERSION=	9.5.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	https://releases.mattermost.com/${PORTVERSION}/
 DISTNAME=	mattermost-${PORTVERSION}-linux-amd64
 
-# implicit-approval+ for decke
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Webapp of Mattermost server
 WWW=		https://mattermost.org/
diff --git a/www/mattermost-webapp/distinfo b/www/mattermost-webapp/distinfo
index 2acacc2a6ad1..fd3db8975381 100644
--- a/www/mattermost-webapp/distinfo
+++ b/www/mattermost-webapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710326854
-SHA256 (mattermost-8.1.11-linux-amd64.tar.gz) = 01ae949f46161d831ed83b3fa7ebcc4bd077f0650f44d1f465094227dd6e603e
-SIZE (mattermost-8.1.11-linux-amd64.tar.gz) = 439123217
+TIMESTAMP = 1717683741
+SHA256 (mattermost-9.5.6-linux-amd64.tar.gz) = 665bceffb91d328a481c10dd169eb0490091f8da1b19d0c2e8f715775886d7a1
+SIZE (mattermost-9.5.6-linux-amd64.tar.gz) = 451555871
diff --git a/www/mattermost-webapp/pkg-plist b/www/mattermost-webapp/pkg-plist
index 343336f35dc6..efa9082995dd 100644
--- a/www/mattermost-webapp/pkg-plist
+++ b/www/mattermost-webapp/pkg-plist
@@ -1,42 +1,43 @@
 %%WWWDIR%%/client/1006.a82445890753b4cda610.js
 %%WWWDIR%%/client/1006.a82445890753b4cda610.js.map
-%%WWWDIR%%/client/1295.443ee9eb3a98afba6c80.js
-%%WWWDIR%%/client/1295.443ee9eb3a98afba6c80.js.map
-%%WWWDIR%%/client/1295.4663738ed2b0ad59d067.css
-%%WWWDIR%%/client/1295.4663738ed2b0ad59d067.css.map
+%%WWWDIR%%/client/1011.3697a3888d12721cc558.js
+%%WWWDIR%%/client/1011.3697a3888d12721cc558.js.map
+%%WWWDIR%%/client/1011.b1f74ced71fa30073208.css
+%%WWWDIR%%/client/1011.b1f74ced71fa30073208.css.map
+%%WWWDIR%%/client/1072.150c7307f540483e0d8b.js
+%%WWWDIR%%/client/1072.150c7307f540483e0d8b.js.map
+%%WWWDIR%%/client/1191.43e6892f50bec3fc61fc.js
+%%WWWDIR%%/client/1191.43e6892f50bec3fc61fc.js.LICENSE.txt
+%%WWWDIR%%/client/1191.43e6892f50bec3fc61fc.js.map
 %%WWWDIR%%/client/131.27d015a613d464e45cfd.js
 %%WWWDIR%%/client/131.27d015a613d464e45cfd.js.map
-%%WWWDIR%%/client/1393.2d889049b98aa657e508.js
-%%WWWDIR%%/client/1393.2d889049b98aa657e508.js.map
-%%WWWDIR%%/client/145.e00c004887ff14c77ba9.js
-%%WWWDIR%%/client/145.e00c004887ff14c77ba9.js.map
-%%WWWDIR%%/client/1467.34ede6b9184b090ae2e7.js
-%%WWWDIR%%/client/1467.34ede6b9184b090ae2e7.js.map
+%%WWWDIR%%/client/145.693f451cda1d3e15542a.js
+%%WWWDIR%%/client/145.693f451cda1d3e15542a.js.map
 %%WWWDIR%%/client/1542.c90979dfc4aadbe945ba.js
 %%WWWDIR%%/client/1542.c90979dfc4aadbe945ba.js.LICENSE.txt
 %%WWWDIR%%/client/1542.c90979dfc4aadbe945ba.js.map
 %%WWWDIR%%/client/1599.c7c1807216b6490de5aa.js
 %%WWWDIR%%/client/1599.c7c1807216b6490de5aa.js.map
+%%WWWDIR%%/client/1618.239b9912fb0a1e337f80.js
+%%WWWDIR%%/client/1618.239b9912fb0a1e337f80.js.map
 %%WWWDIR%%/client/1728.da8582ec621992f97025.js
 %%WWWDIR%%/client/1728.da8582ec621992f97025.js.map
 %%WWWDIR%%/client/1741.531ae5dec955fbb092cd.js
 %%WWWDIR%%/client/1741.531ae5dec955fbb092cd.js.map
-%%WWWDIR%%/client/1861.9fb4d14e6ddb7ccc2119.js
-%%WWWDIR%%/client/1861.9fb4d14e6ddb7ccc2119.js.map
 %%WWWDIR%%/client/1929.4193052cf92a19393983.js
 %%WWWDIR%%/client/1929.4193052cf92a19393983.js.map
 %%WWWDIR%%/client/201.0d4bc4fb8306ec35595c.js
 %%WWWDIR%%/client/201.0d4bc4fb8306ec35595c.js.map
-%%WWWDIR%%/client/2028.b5459e053877ad1a916d.js
-%%WWWDIR%%/client/2028.b5459e053877ad1a916d.js.map
-%%WWWDIR%%/client/209.6f4e1c4e53db70c63ffa.js
-%%WWWDIR%%/client/209.6f4e1c4e53db70c63ffa.js.map
-%%WWWDIR%%/client/2109.adbf6a20ab738d62c319.js
-%%WWWDIR%%/client/2109.adbf6a20ab738d62c319.js.map
-%%WWWDIR%%/client/2118.e59f41ec7122cc36df1c.js
-%%WWWDIR%%/client/2118.e59f41ec7122cc36df1c.js.map
-%%WWWDIR%%/client/2118.f8b28f6ca4b971c7a494.css
-%%WWWDIR%%/client/2118.f8b28f6ca4b971c7a494.css.map
+%%WWWDIR%%/client/2028.f513ca3163413ae6627e.js
+%%WWWDIR%%/client/2028.f513ca3163413ae6627e.js.map
+%%WWWDIR%%/client/209.e76e5510ceab7e286194.js
+%%WWWDIR%%/client/209.e76e5510ceab7e286194.js.map
+%%WWWDIR%%/client/2109.ccabb35de84e4671eecb.js
+%%WWWDIR%%/client/2109.ccabb35de84e4671eecb.js.map
+%%WWWDIR%%/client/2118.b0801b8c3c81bd54fb81.css
+%%WWWDIR%%/client/2118.b0801b8c3c81bd54fb81.css.map
+%%WWWDIR%%/client/2118.ce006e2b56da639a873e.js
+%%WWWDIR%%/client/2118.ce006e2b56da639a873e.js.map
 %%WWWDIR%%/client/2193.54f570a10f45d153ebf7.js
 %%WWWDIR%%/client/2193.54f570a10f45d153ebf7.js.map
 %%WWWDIR%%/client/2195.f438052250f30dbfb459.js
@@ -47,79 +48,76 @@
 %%WWWDIR%%/client/2264.08eaae74afc2b4d47777.js.map
 %%WWWDIR%%/client/2277.175fe154198888acaca1.js
 %%WWWDIR%%/client/2277.175fe154198888acaca1.js.map
-%%WWWDIR%%/client/2337.0c099202a718222b75ac.js
-%%WWWDIR%%/client/2337.0c099202a718222b75ac.js.LICENSE.txt
-%%WWWDIR%%/client/2337.0c099202a718222b75ac.js.map
-%%WWWDIR%%/client/2440.38a9bfb3a4a3b8c951c1.css
-%%WWWDIR%%/client/2440.38a9bfb3a4a3b8c951c1.css.map
-%%WWWDIR%%/client/2445.e35742b66fb16166ac40.js
-%%WWWDIR%%/client/2445.e35742b66fb16166ac40.js.map
-%%WWWDIR%%/client/2462.38f46cd7f5f9088e4ae9.js
-%%WWWDIR%%/client/2462.38f46cd7f5f9088e4ae9.js.LICENSE.txt
-%%WWWDIR%%/client/2462.38f46cd7f5f9088e4ae9.js.map
+%%WWWDIR%%/client/2317.923d23f4c082e22be1fb.js
+%%WWWDIR%%/client/2317.923d23f4c082e22be1fb.js.map
+%%WWWDIR%%/client/2317.a53bd586bb268ad8665e.css
+%%WWWDIR%%/client/2317.a53bd586bb268ad8665e.css.map
+%%WWWDIR%%/client/2440.f2ca37b5963eb47df25b.css
+%%WWWDIR%%/client/2440.f2ca37b5963eb47df25b.css.map
 %%WWWDIR%%/client/2509.2f0b8f15a33fe2ab4335.js
 %%WWWDIR%%/client/2509.2f0b8f15a33fe2ab4335.js.map
+%%WWWDIR%%/client/2514.41b4f83d1eb1943bb302.css
+%%WWWDIR%%/client/2514.41b4f83d1eb1943bb302.css.map
+%%WWWDIR%%/client/2514.6157291101610c9adbb5.js
+%%WWWDIR%%/client/2514.6157291101610c9adbb5.js.LICENSE.txt
+%%WWWDIR%%/client/2514.6157291101610c9adbb5.js.map
 %%WWWDIR%%/client/2534.9cd47e7cf931cba451f2.js
 %%WWWDIR%%/client/2534.9cd47e7cf931cba451f2.js.map
-%%WWWDIR%%/client/2544.6228cbd0b218d6da6c40.js
-%%WWWDIR%%/client/2544.6228cbd0b218d6da6c40.js.map
-%%WWWDIR%%/client/2544.9e39cde7e84ffe6dc526.css
-%%WWWDIR%%/client/2544.9e39cde7e84ffe6dc526.css.map
-%%WWWDIR%%/client/2565.660102a98dc89c001be2.js
-%%WWWDIR%%/client/2565.660102a98dc89c001be2.js.LICENSE.txt
-%%WWWDIR%%/client/2565.660102a98dc89c001be2.js.map
+%%WWWDIR%%/client/2565.5c6f9bd11886f9819fcb.js
+%%WWWDIR%%/client/2565.5c6f9bd11886f9819fcb.js.LICENSE.txt
+%%WWWDIR%%/client/2565.5c6f9bd11886f9819fcb.js.map
 %%WWWDIR%%/client/2648.b2c800aad003450a190e.js
 %%WWWDIR%%/client/2648.b2c800aad003450a190e.js.map
-%%WWWDIR%%/client/2698.0d91b02def32badbf45e.js
-%%WWWDIR%%/client/2698.0d91b02def32badbf45e.js.map
-%%WWWDIR%%/client/2701.dedd2d266c675c253811.js
-%%WWWDIR%%/client/2701.dedd2d266c675c253811.js.map
-%%WWWDIR%%/client/2824.9893892e55f343f8dea2.css
-%%WWWDIR%%/client/2824.9893892e55f343f8dea2.css.map
-%%WWWDIR%%/client/2824.fe027eaaa28ab2255af5.js
-%%WWWDIR%%/client/2824.fe027eaaa28ab2255af5.js.map
-%%WWWDIR%%/client/283.bd81b87f02c7ccba9609.js
-%%WWWDIR%%/client/283.bd81b87f02c7ccba9609.js.LICENSE.txt
-%%WWWDIR%%/client/283.bd81b87f02c7ccba9609.js.map
+%%WWWDIR%%/client/2698.8f6dcb10f659c6a5f520.js
+%%WWWDIR%%/client/2698.8f6dcb10f659c6a5f520.js.map
+%%WWWDIR%%/client/2701.a1afd4bd90d4a81c27cd.js
+%%WWWDIR%%/client/2701.a1afd4bd90d4a81c27cd.js.map
+%%WWWDIR%%/client/2826.a88496eacdc2f0dd40c5.js
+%%WWWDIR%%/client/2826.a88496eacdc2f0dd40c5.js.map
 %%WWWDIR%%/client/2830.dbc77abe83a4ed3b2f13.js
 %%WWWDIR%%/client/2830.dbc77abe83a4ed3b2f13.js.map
-%%WWWDIR%%/client/2903.6690015bb01f80dbea7e.js
-%%WWWDIR%%/client/2903.6690015bb01f80dbea7e.js.LICENSE.txt
-%%WWWDIR%%/client/2903.6690015bb01f80dbea7e.js.map
 %%WWWDIR%%/client/3.50a9a10e8f904c178fb5.js
 %%WWWDIR%%/client/3.50a9a10e8f904c178fb5.js.map
-%%WWWDIR%%/client/3117.7185a33399b59fe133c8.js
-%%WWWDIR%%/client/3117.7185a33399b59fe133c8.js.map
-%%WWWDIR%%/client/3117.b04846d55e8798763ee6.css
-%%WWWDIR%%/client/3117.b04846d55e8798763ee6.css.map
+%%WWWDIR%%/client/3001.2b71c3f7d4c60f46f16b.js
+%%WWWDIR%%/client/3001.2b71c3f7d4c60f46f16b.js.map
+%%WWWDIR%%/client/3001.ac2faa13aa08f0d0fe98.css
+%%WWWDIR%%/client/3001.ac2faa13aa08f0d0fe98.css.map
+%%WWWDIR%%/client/3117.95b220093cb5c5d82a8a.js
+%%WWWDIR%%/client/3117.95b220093cb5c5d82a8a.js.map
+%%WWWDIR%%/client/3117.c7750661ce94e8be41bf.css
+%%WWWDIR%%/client/3117.c7750661ce94e8be41bf.css.map
 %%WWWDIR%%/client/3126.848bc87347e4a2d29c99.js
 %%WWWDIR%%/client/3126.848bc87347e4a2d29c99.js.map
-%%WWWDIR%%/client/3389.c3fcdd2c53758c5a12d0.js
-%%WWWDIR%%/client/3389.c3fcdd2c53758c5a12d0.js.map
+%%WWWDIR%%/client/3272.9f7f5ecb6a905182ee70.js
+%%WWWDIR%%/client/3272.9f7f5ecb6a905182ee70.js.LICENSE.txt
+%%WWWDIR%%/client/3272.9f7f5ecb6a905182ee70.js.map
+%%WWWDIR%%/client/3294.89356d3bfc84cb9cf509.js
+%%WWWDIR%%/client/3294.89356d3bfc84cb9cf509.js.LICENSE.txt
+%%WWWDIR%%/client/3294.89356d3bfc84cb9cf509.js.map
+%%WWWDIR%%/client/3389.a634cca7a671d4dad982.js
+%%WWWDIR%%/client/3389.a634cca7a671d4dad982.js.map
+%%WWWDIR%%/client/3389.bd6e91718bcb0e460cda.css
+%%WWWDIR%%/client/3389.bd6e91718bcb0e460cda.css.map
 %%WWWDIR%%/client/3412.a531e664a5e846e2a22e.js
-%%WWWDIR%%/client/3458.aad70e5ab892a6521779.js
-%%WWWDIR%%/client/3458.aad70e5ab892a6521779.js.map
+%%WWWDIR%%/client/3458.7bce940180e8ed6135e1.js
+%%WWWDIR%%/client/3458.7bce940180e8ed6135e1.js.map
 %%WWWDIR%%/client/3487.b2a7aff7bf2b2e8a4d72.js
 %%WWWDIR%%/client/3487.b2a7aff7bf2b2e8a4d72.js.map
-%%WWWDIR%%/client/353.b23721161ee40d78d60b.css
-%%WWWDIR%%/client/353.b23721161ee40d78d60b.css.map
-%%WWWDIR%%/client/353.fc08a51e8bdc094275e7.js
-%%WWWDIR%%/client/353.fc08a51e8bdc094275e7.js.map
+%%WWWDIR%%/client/353.2e36507828e19f41dcf5.css
+%%WWWDIR%%/client/353.2e36507828e19f41dcf5.css.map
+%%WWWDIR%%/client/353.9404a5a3e40a2b46c255.js
+%%WWWDIR%%/client/353.9404a5a3e40a2b46c255.js.map
 %%WWWDIR%%/client/3539.4a5fd24ace7522fe4ef7.js
 %%WWWDIR%%/client/3539.4a5fd24ace7522fe4ef7.js.map
-%%WWWDIR%%/client/3615.b061098af92a41d3ee68.js
-%%WWWDIR%%/client/3615.b061098af92a41d3ee68.js.map
-%%WWWDIR%%/client/3618.08d4b16ac734569e551b.js
-%%WWWDIR%%/client/3618.08d4b16ac734569e551b.js.map
-%%WWWDIR%%/client/3639.6441bc756774b3362581.js
-%%WWWDIR%%/client/3639.6441bc756774b3362581.js.map
-%%WWWDIR%%/client/3639.ad8af65ecfa629c5b75e.css
-%%WWWDIR%%/client/3639.ad8af65ecfa629c5b75e.css.map
-%%WWWDIR%%/client/3676.c9fa075cea4e632489d5.js
-%%WWWDIR%%/client/3676.c9fa075cea4e632489d5.js.map
-%%WWWDIR%%/client/368.501020eb3a84dcb78e5e.js
-%%WWWDIR%%/client/368.501020eb3a84dcb78e5e.js.LICENSE.txt
-%%WWWDIR%%/client/368.501020eb3a84dcb78e5e.js.map
+%%WWWDIR%%/client/3577.7ae35657cb3e001e2052.js
+%%WWWDIR%%/client/3577.7ae35657cb3e001e2052.js.map
+%%WWWDIR%%/client/3639.48ec22b6135b04a6883e.css
+%%WWWDIR%%/client/3639.48ec22b6135b04a6883e.css.map
+%%WWWDIR%%/client/3639.a4b332dc659321fd5afa.js
+%%WWWDIR%%/client/3639.a4b332dc659321fd5afa.js.map
+%%WWWDIR%%/client/368.21e7eb9195a96904ed87.js
+%%WWWDIR%%/client/368.21e7eb9195a96904ed87.js.LICENSE.txt
+%%WWWDIR%%/client/368.21e7eb9195a96904ed87.js.map
 %%WWWDIR%%/client/3937.844b09f50594ca2613b4.js
 %%WWWDIR%%/client/3937.844b09f50594ca2613b4.js.map
 %%WWWDIR%%/client/4038.acec16d411c00eb00a85.js
@@ -128,134 +126,123 @@
 %%WWWDIR%%/client/4040.193a7d0fdd91f49aa851.js.map
 %%WWWDIR%%/client/4104.9744c21a1ff43afc6965.js
 %%WWWDIR%%/client/4104.9744c21a1ff43afc6965.js.map
-%%WWWDIR%%/client/4181.839b45e0558a4a5f4357.js
-%%WWWDIR%%/client/4181.839b45e0558a4a5f4357.js.map
-%%WWWDIR%%/client/4181.ad6cb5fd1cfcb7c323d4.css
-%%WWWDIR%%/client/4181.ad6cb5fd1cfcb7c323d4.css.map
-%%WWWDIR%%/client/42.5e7996ab7c3944b40267.js
-%%WWWDIR%%/client/42.5e7996ab7c3944b40267.js.LICENSE.txt
-%%WWWDIR%%/client/42.5e7996ab7c3944b40267.js.map
-%%WWWDIR%%/client/4217.17e9bb431f6e24daa9ca.js
-%%WWWDIR%%/client/4217.17e9bb431f6e24daa9ca.js.map
-%%WWWDIR%%/client/4231.f9372ddf5363e41aa9a0.js
-%%WWWDIR%%/client/4231.f9372ddf5363e41aa9a0.js.map
-%%WWWDIR%%/client/4404.89777b503a3ddf14ebee.js
-%%WWWDIR%%/client/4404.89777b503a3ddf14ebee.js.LICENSE.txt
-%%WWWDIR%%/client/4404.89777b503a3ddf14ebee.js.map
-%%WWWDIR%%/client/4557.325cd3b5c3fd16de59d4.js
-%%WWWDIR%%/client/4557.325cd3b5c3fd16de59d4.js.map
-%%WWWDIR%%/client/4617.edf7898712324c636e94.js
-%%WWWDIR%%/client/4617.edf7898712324c636e94.js.LICENSE.txt
-%%WWWDIR%%/client/4617.edf7898712324c636e94.js.map
-%%WWWDIR%%/client/4666.12d01864e7e43d525284.js
-%%WWWDIR%%/client/4666.12d01864e7e43d525284.js.map
-%%WWWDIR%%/client/4666.9e35a6c3f41e66e58e02.css
-%%WWWDIR%%/client/4666.9e35a6c3f41e66e58e02.css.map
+%%WWWDIR%%/client/4205.0391bb7f211b6b88f177.js
+%%WWWDIR%%/client/4205.0391bb7f211b6b88f177.js.map
+%%WWWDIR%%/client/4205.673ad6a051df400f0e6f.css
+%%WWWDIR%%/client/4205.673ad6a051df400f0e6f.css.map
+%%WWWDIR%%/client/4217.b02454b009c376f7a9a1.css
+%%WWWDIR%%/client/4217.b02454b009c376f7a9a1.css.map
+%%WWWDIR%%/client/4217.b40e582eaf881909d5c0.js
+%%WWWDIR%%/client/4217.b40e582eaf881909d5c0.js.map
+%%WWWDIR%%/client/4231.27b0c37fcf4ddc51a033.js
+%%WWWDIR%%/client/4231.27b0c37fcf4ddc51a033.js.map
+%%WWWDIR%%/client/4404.b87614c5f140f1ac7ba6.js
+%%WWWDIR%%/client/4404.b87614c5f140f1ac7ba6.js.LICENSE.txt
+%%WWWDIR%%/client/4404.b87614c5f140f1ac7ba6.js.map
+%%WWWDIR%%/client/4557.0e7fa704a3d33c07c4f8.js
+%%WWWDIR%%/client/4557.0e7fa704a3d33c07c4f8.js.map
+%%WWWDIR%%/client/4617.88e5428809e56688db84.js
+%%WWWDIR%%/client/4617.88e5428809e56688db84.js.LICENSE.txt
+%%WWWDIR%%/client/4617.88e5428809e56688db84.js.map
 %%WWWDIR%%/client/4825.b609e889593929ac6969.js
 %%WWWDIR%%/client/4825.b609e889593929ac6969.js.map
 %%WWWDIR%%/client/4841.253ec7bae8963b3060c1.js
 %%WWWDIR%%/client/4841.253ec7bae8963b3060c1.js.map
-%%WWWDIR%%/client/5006.0eb611dbdeb2e90c45e1.js
-%%WWWDIR%%/client/5006.0eb611dbdeb2e90c45e1.js.map
-%%WWWDIR%%/client/5006.5b7832d3e1167baf2385.css
-%%WWWDIR%%/client/5006.5b7832d3e1167baf2385.css.map
-%%WWWDIR%%/client/5095.15abe01bfc1f5a45c4f5.js
-%%WWWDIR%%/client/5095.15abe01bfc1f5a45c4f5.js.map
-%%WWWDIR%%/client/5215.7381e5810fd574a6a946.js
-%%WWWDIR%%/client/5215.7381e5810fd574a6a946.js.map
+%%WWWDIR%%/client/5010.9562ceddef72c8cac3fe.js
+%%WWWDIR%%/client/5010.9562ceddef72c8cac3fe.js.map
+%%WWWDIR%%/client/5095.dc185b1dfa8d4470099d.js
+%%WWWDIR%%/client/5095.dc185b1dfa8d4470099d.js.map
+%%WWWDIR%%/client/516.94567bc0b03a72922071.js
+%%WWWDIR%%/client/516.94567bc0b03a72922071.js.map
+%%WWWDIR%%/client/516.fe1aa5e514ec90cd2b87.css
+%%WWWDIR%%/client/516.fe1aa5e514ec90cd2b87.css.map
+%%WWWDIR%%/client/5215.48db9473baee83d3fed5.js
+%%WWWDIR%%/client/5215.48db9473baee83d3fed5.js.map
 %%WWWDIR%%/client/5397.51f992ceddd104d60013.js
 %%WWWDIR%%/client/5397.51f992ceddd104d60013.js.map
-%%WWWDIR%%/client/5431.4f5c673ca71ee53d77f6.js
-%%WWWDIR%%/client/5431.4f5c673ca71ee53d77f6.js.map
-%%WWWDIR%%/client/5453.5fe75e88659e8abc9b0d.css
-%%WWWDIR%%/client/5453.5fe75e88659e8abc9b0d.css.map
-%%WWWDIR%%/client/5453.adcfc8a4056cfe3d3c0e.js
-%%WWWDIR%%/client/5453.adcfc8a4056cfe3d3c0e.js.map
-%%WWWDIR%%/client/5456.b72ae06f637f90691468.js
-%%WWWDIR%%/client/5456.b72ae06f637f90691468.js.LICENSE.txt
-%%WWWDIR%%/client/5456.b72ae06f637f90691468.js.map
-%%WWWDIR%%/client/5620.e2040c29c61d86292907.js
-%%WWWDIR%%/client/5620.e2040c29c61d86292907.js.map
+%%WWWDIR%%/client/5413.bb820edc74086d97deee.js
+%%WWWDIR%%/client/5413.bb820edc74086d97deee.js.map
+%%WWWDIR%%/client/5431.65e34fec1095099b99b0.js
+%%WWWDIR%%/client/5431.65e34fec1095099b99b0.js.map
+%%WWWDIR%%/client/5453.550dc2e484c3e3327e2d.js
+%%WWWDIR%%/client/5453.550dc2e484c3e3327e2d.js.map
+%%WWWDIR%%/client/5453.5b926c472a6f7dffe95f.css
+%%WWWDIR%%/client/5453.5b926c472a6f7dffe95f.css.map
+%%WWWDIR%%/client/5456.ca0399a90e8f1ea6885d.js
+%%WWWDIR%%/client/5456.ca0399a90e8f1ea6885d.js.LICENSE.txt
+%%WWWDIR%%/client/5456.ca0399a90e8f1ea6885d.js.map
+%%WWWDIR%%/client/5581.05ed603aab310f909178.js
+%%WWWDIR%%/client/5581.05ed603aab310f909178.js.map
+%%WWWDIR%%/client/5620.0332d780b6bdcb1ab953.js
+%%WWWDIR%%/client/5620.0332d780b6bdcb1ab953.js.map
+%%WWWDIR%%/client/5631.f3a3fc7ee90bb709ab2d.js
+%%WWWDIR%%/client/5631.f3a3fc7ee90bb709ab2d.js.LICENSE.txt
+%%WWWDIR%%/client/5631.f3a3fc7ee90bb709ab2d.js.map
+%%WWWDIR%%/client/5716.500cc70027b6dc8026a8.js
+%%WWWDIR%%/client/5716.500cc70027b6dc8026a8.js.map
 %%WWWDIR%%/client/5749.00714fb1bbd4aa16095b.js
 %%WWWDIR%%/client/5749.00714fb1bbd4aa16095b.js.map
-%%WWWDIR%%/client/5803.0a37a7b89255cab6b437.js
-%%WWWDIR%%/client/5803.0a37a7b89255cab6b437.js.map
-%%WWWDIR%%/client/5847.2e0800fb2f8c542a8504.css
-%%WWWDIR%%/client/5847.2e0800fb2f8c542a8504.css.map
-%%WWWDIR%%/client/5847.f7262fc3bc8e58c873a8.js
-%%WWWDIR%%/client/5847.f7262fc3bc8e58c873a8.js.map
-%%WWWDIR%%/client/5904.b41af8d748e61010165f.js
-%%WWWDIR%%/client/5904.b41af8d748e61010165f.js.map
+%%WWWDIR%%/client/5803.42464ec368de384f719e.js
+%%WWWDIR%%/client/5803.42464ec368de384f719e.js.map
 %%WWWDIR%%/client/5912.742b2d37ae6c1e3b78e4.js
 %%WWWDIR%%/client/5912.742b2d37ae6c1e3b78e4.js.map
-%%WWWDIR%%/client/5960.13c43b09e5d97980d3b5.css
-%%WWWDIR%%/client/5960.13c43b09e5d97980d3b5.css.map
-%%WWWDIR%%/client/5960.a56e9d95006edabd0c30.js
-%%WWWDIR%%/client/5960.a56e9d95006edabd0c30.js.map
 %%WWWDIR%%/client/5973.361dc56f46e44ad8905b.js
 %%WWWDIR%%/client/5973.361dc56f46e44ad8905b.js.map
-%%WWWDIR%%/client/6005.784b932f04c4d952c2bb.js
-%%WWWDIR%%/client/6005.784b932f04c4d952c2bb.js.map
+%%WWWDIR%%/client/6005.1fe7461d1a3f03f7dcc0.js
+%%WWWDIR%%/client/6005.1fe7461d1a3f03f7dcc0.js.map
 %%WWWDIR%%/client/6012.a980859271e0c9b01f20.js
 %%WWWDIR%%/client/6012.a980859271e0c9b01f20.js.map
 %%WWWDIR%%/client/6016.81cc505f48c20cbda7eb.js
 %%WWWDIR%%/client/6016.81cc505f48c20cbda7eb.js.map
-%%WWWDIR%%/client/6106.3e7b689bfbe6fd123ef8.js
-%%WWWDIR%%/client/6106.3e7b689bfbe6fd123ef8.js.map
+%%WWWDIR%%/client/6106.c804a70a8db73b02329f.js
+%%WWWDIR%%/client/6106.c804a70a8db73b02329f.js.map
 %%WWWDIR%%/client/6106.ef104656b8bd072b2c15.css
 %%WWWDIR%%/client/6106.ef104656b8bd072b2c15.css.map
-%%WWWDIR%%/client/6114.05f51a5236dd57ec0691.css
-%%WWWDIR%%/client/6114.05f51a5236dd57ec0691.css.map
-%%WWWDIR%%/client/6114.5f12e1fcda7391c7ad21.js
-%%WWWDIR%%/client/6114.5f12e1fcda7391c7ad21.js.map
+%%WWWDIR%%/client/6114.15f967a07273e4f4b262.js
+%%WWWDIR%%/client/6114.15f967a07273e4f4b262.js.map
+%%WWWDIR%%/client/6114.7ad285f8d8a58332f6ad.css
+%%WWWDIR%%/client/6114.7ad285f8d8a58332f6ad.css.map
 %%WWWDIR%%/client/6145.53a44b9ff76c964ced3f.js
 %%WWWDIR%%/client/6145.53a44b9ff76c964ced3f.js.map
 %%WWWDIR%%/client/615.1c172a6fd034294e3a4b.js
 %%WWWDIR%%/client/615.1c172a6fd034294e3a4b.js.map
-%%WWWDIR%%/client/6228.4c6307cb7f056a387b4a.js
-%%WWWDIR%%/client/6228.4c6307cb7f056a387b4a.js.map
+%%WWWDIR%%/client/6228.138c61c54a03cb6b0239.js
+%%WWWDIR%%/client/6228.138c61c54a03cb6b0239.js.map
 %%WWWDIR%%/client/6323.973e387bd4d9fc46f764.js
 %%WWWDIR%%/client/6323.973e387bd4d9fc46f764.js.map
 %%WWWDIR%%/client/6339.f6949d38611b5c11ef37.js
 %%WWWDIR%%/client/6339.f6949d38611b5c11ef37.js.map
 %%WWWDIR%%/client/6487.3a9ac675e79a51a666ae.js
 %%WWWDIR%%/client/6487.3a9ac675e79a51a666ae.js.map
-%%WWWDIR%%/client/6640.2badf0e09b393fe70fc3.js
-%%WWWDIR%%/client/6640.2badf0e09b393fe70fc3.js.map
+%%WWWDIR%%/client/6640.bc2ba4f3b3017547c8f6.js
+%%WWWDIR%%/client/6640.bc2ba4f3b3017547c8f6.js.map
 %%WWWDIR%%/client/6644.c0a6de97a7bf084a3f4d.js
 %%WWWDIR%%/client/6644.c0a6de97a7bf084a3f4d.js.map
 %%WWWDIR%%/client/6645.f299a1ef0e7956d27df0.css
 %%WWWDIR%%/client/6645.f299a1ef0e7956d27df0.css.map
-%%WWWDIR%%/client/6666.8ac3926abad3cb565d20.js
-%%WWWDIR%%/client/6666.8ac3926abad3cb565d20.js.LICENSE.txt
-%%WWWDIR%%/client/6666.8ac3926abad3cb565d20.js.map
-%%WWWDIR%%/client/6760.dd030aca80841e50a500.js
-%%WWWDIR%%/client/6760.dd030aca80841e50a500.js.map
-%%WWWDIR%%/client/6778.79187f316fb89d710ae0.js
-%%WWWDIR%%/client/6778.79187f316fb89d710ae0.js.map
+%%WWWDIR%%/client/6778.99c8dc14c9da163c609b.js
+%%WWWDIR%%/client/6778.99c8dc14c9da163c609b.js.map
 %%WWWDIR%%/client/6796.243e9d8ba29f680107ba.js
 %%WWWDIR%%/client/6796.243e9d8ba29f680107ba.js.map
 %%WWWDIR%%/client/680.4da078dab52828997dac.js
 %%WWWDIR%%/client/680.4da078dab52828997dac.js.map
 %%WWWDIR%%/client/6891.1b1c37acadfa9bc7bffb.js
 %%WWWDIR%%/client/6891.1b1c37acadfa9bc7bffb.js.map
-%%WWWDIR%%/client/6903.647a1390eb5f127eb52b.js
-%%WWWDIR%%/client/6903.647a1390eb5f127eb52b.js.map
-%%WWWDIR%%/client/7055.46cd540a5eabf823c9fc.js
-%%WWWDIR%%/client/7055.46cd540a5eabf823c9fc.js.map
-%%WWWDIR%%/client/7055.8515bd6692df2f594e52.css
-%%WWWDIR%%/client/7055.8515bd6692df2f594e52.css.map
-%%WWWDIR%%/client/7107.08702a1ce20384545e09.css
-%%WWWDIR%%/client/7107.08702a1ce20384545e09.css.map
-%%WWWDIR%%/client/7107.1a19b79613707d8ec371.js
-%%WWWDIR%%/client/7107.1a19b79613707d8ec371.js.map
-%%WWWDIR%%/client/7119.be83b74094ac6efebaec.css
-%%WWWDIR%%/client/7119.be83b74094ac6efebaec.css.map
+%%WWWDIR%%/client/7055.191d2202b344b8126d98.js
+%%WWWDIR%%/client/7055.191d2202b344b8126d98.js.map
+%%WWWDIR%%/client/7055.23d1d4a70f5b26fe6e36.css
+%%WWWDIR%%/client/7055.23d1d4a70f5b26fe6e36.css.map
+%%WWWDIR%%/client/7107.546d3f7103c576bf17d6.js
+%%WWWDIR%%/client/7107.546d3f7103c576bf17d6.js.map
+%%WWWDIR%%/client/7107.9dee87d1c4f156016e4e.css
+%%WWWDIR%%/client/7107.9dee87d1c4f156016e4e.css.map
+%%WWWDIR%%/client/7119.2e43b30c3a228a8f763e.css
+%%WWWDIR%%/client/7119.2e43b30c3a228a8f763e.css.map
 %%WWWDIR%%/client/7207.24e02b07ac1c46fab178.js
 %%WWWDIR%%/client/7207.24e02b07ac1c46fab178.js.map
-%%WWWDIR%%/client/7274.babf8f880f7bde664305.js
-%%WWWDIR%%/client/7274.babf8f880f7bde664305.js.LICENSE.txt
-%%WWWDIR%%/client/7274.babf8f880f7bde664305.js.map
+%%WWWDIR%%/client/7274.ada8accfd73d61857b45.js
+%%WWWDIR%%/client/7274.ada8accfd73d61857b45.js.LICENSE.txt
+%%WWWDIR%%/client/7274.ada8accfd73d61857b45.js.map
 %%WWWDIR%%/client/7307.5f0817a9a98465dc3d15.js
 %%WWWDIR%%/client/7307.5f0817a9a98465dc3d15.js.map
 %%WWWDIR%%/client/7313.87c900eb71eed795ba50.js
@@ -263,62 +250,61 @@
 %%WWWDIR%%/client/7378.0b94e714d0e252a84cc0.js
 %%WWWDIR%%/client/7378.0b94e714d0e252a84cc0.js.LICENSE.txt
 %%WWWDIR%%/client/7378.0b94e714d0e252a84cc0.js.map
+%%WWWDIR%%/client/7430.89ee9940d1b94015d891.js
+%%WWWDIR%%/client/7430.89ee9940d1b94015d891.js.map
+%%WWWDIR%%/client/7430.bb4505cc48c2049a1b7b.css
+%%WWWDIR%%/client/7430.bb4505cc48c2049a1b7b.css.map
 %%WWWDIR%%/client/7509.9f4eb8df4b95f9c62be4.js
 %%WWWDIR%%/client/7509.9f4eb8df4b95f9c62be4.js.map
-%%WWWDIR%%/client/7566.5a9deeacc9b268265305.js
-%%WWWDIR%%/client/7566.5a9deeacc9b268265305.js.LICENSE.txt
-%%WWWDIR%%/client/7566.5a9deeacc9b268265305.js.map
 %%WWWDIR%%/client/7586.dbda09a33338ee29e554.js
 %%WWWDIR%%/client/7586.dbda09a33338ee29e554.js.map
+%%WWWDIR%%/client/7685.538ff07feb805739d12f.js
+%%WWWDIR%%/client/7685.538ff07feb805739d12f.js.map
 %%WWWDIR%%/client/7703.d9ed98e201401c2beb22.js
 %%WWWDIR%%/client/7703.d9ed98e201401c2beb22.js.map
+%%WWWDIR%%/client/7710.1db03372130a7ca6925f.js
+%%WWWDIR%%/client/7710.1db03372130a7ca6925f.js.map
 %%WWWDIR%%/client/7761.01d225bcc0b5e6c41f7b.js
 %%WWWDIR%%/client/7761.01d225bcc0b5e6c41f7b.js.map
-%%WWWDIR%%/client/7803.801afef902be3ae0f8ef.js
-%%WWWDIR%%/client/7803.801afef902be3ae0f8ef.js.LICENSE.txt
-%%WWWDIR%%/client/7803.801afef902be3ae0f8ef.js.map
-%%WWWDIR%%/client/7858.82bdb5aa2110101b80d4.css
-%%WWWDIR%%/client/7858.82bdb5aa2110101b80d4.css.map
-%%WWWDIR%%/client/7858.8417b70d7712cc9520bc.js
-%%WWWDIR%%/client/7858.8417b70d7712cc9520bc.js.LICENSE.txt
-%%WWWDIR%%/client/7858.8417b70d7712cc9520bc.js.map
+%%WWWDIR%%/client/7803.0f2f7375240d3eb97354.js
+%%WWWDIR%%/client/7803.0f2f7375240d3eb97354.js.LICENSE.txt
+%%WWWDIR%%/client/7803.0f2f7375240d3eb97354.js.map
 %%WWWDIR%%/client/7882.4836784ab734854bade8.js
 %%WWWDIR%%/client/7882.4836784ab734854bade8.js.map
-%%WWWDIR%%/client/7882.51cde44ffab358545404.css
-%%WWWDIR%%/client/7882.51cde44ffab358545404.css.map
+%%WWWDIR%%/client/7882.f07e931e4775585fcfa8.css
+%%WWWDIR%%/client/7882.f07e931e4775585fcfa8.css.map
 %%WWWDIR%%/client/7896.2130c6e57d3e690b84ec.js
 %%WWWDIR%%/client/7896.2130c6e57d3e690b84ec.js.map
+%%WWWDIR%%/client/7909.e1ecc45d2750c7778100.js
+%%WWWDIR%%/client/7909.e1ecc45d2750c7778100.js.map
+%%WWWDIR%%/client/7985.3e74c3ab6ebc0a0713d6.js
+%%WWWDIR%%/client/7985.3e74c3ab6ebc0a0713d6.js.map
+%%WWWDIR%%/client/8039.de8937287e12968506e8.js
+%%WWWDIR%%/client/8039.de8937287e12968506e8.js.LICENSE.txt
+%%WWWDIR%%/client/8039.de8937287e12968506e8.js.map
 %%WWWDIR%%/client/8045.12155cf972f9136b00ac.js
 %%WWWDIR%%/client/8045.12155cf972f9136b00ac.js.map
 %%WWWDIR%%/client/8109.c48436210fe343fc3625.js
 %%WWWDIR%%/client/8109.c48436210fe343fc3625.js.map
 %%WWWDIR%%/client/8112.5b4fdb639e8ab26cda59.js
 %%WWWDIR%%/client/8112.5b4fdb639e8ab26cda59.js.map
-%%WWWDIR%%/client/8143.f36a638b699431c92dd8.js
-%%WWWDIR%%/client/8143.f36a638b699431c92dd8.js.LICENSE.txt
-%%WWWDIR%%/client/8143.f36a638b699431c92dd8.js.map
 %%WWWDIR%%/client/8196.ab3030070696873d8405.js
 %%WWWDIR%%/client/8196.ab3030070696873d8405.js.map
 %%WWWDIR%%/client/8221.3c6fcff225a73d120a8a.js
 %%WWWDIR%%/client/8221.3c6fcff225a73d120a8a.js.map
-%%WWWDIR%%/client/8286.2897429f1595cf185f33.js
-%%WWWDIR%%/client/8286.2897429f1595cf185f33.js.map
-%%WWWDIR%%/client/8286.c2860370172209ddcc0a.css
-%%WWWDIR%%/client/8286.c2860370172209ddcc0a.css.map
+%%WWWDIR%%/client/8286.0fd2781d8c50433e031f.js
+%%WWWDIR%%/client/8286.0fd2781d8c50433e031f.js.map
+%%WWWDIR%%/client/8286.89882cc4b83ac335a4aa.css
+%%WWWDIR%%/client/8286.89882cc4b83ac335a4aa.css.map
 %%WWWDIR%%/client/8297.7e11cfb4c56ce60546b7.js
 %%WWWDIR%%/client/8297.7e11cfb4c56ce60546b7.js.map
-%%WWWDIR%%/client/8470.61010c1e0c289b7bf725.js
-%%WWWDIR%%/client/8470.61010c1e0c289b7bf725.js.map
+%%WWWDIR%%/client/8304.11b203998b518862e4c7.js
+%%WWWDIR%%/client/8304.11b203998b518862e4c7.js.LICENSE.txt
+%%WWWDIR%%/client/8304.11b203998b518862e4c7.js.map
 %%WWWDIR%%/client/8473.37b6fbe2a0c19ab2c853.js
 %%WWWDIR%%/client/8473.37b6fbe2a0c19ab2c853.js.map
 %%WWWDIR%%/client/8522.f1c9563c3303ec103299.js
 %%WWWDIR%%/client/8522.f1c9563c3303ec103299.js.map
-%%WWWDIR%%/client/8688.3d336ebd5b8d33359a87.js
-%%WWWDIR%%/client/8688.3d336ebd5b8d33359a87.js.map
-%%WWWDIR%%/client/8718.037afe8c3d6764feec38.css
-%%WWWDIR%%/client/8718.037afe8c3d6764feec38.css.map
-%%WWWDIR%%/client/8718.757b284d90edcff61adf.js
-%%WWWDIR%%/client/8718.757b284d90edcff61adf.js.map
 %%WWWDIR%%/client/8725.9971cc726db52a178b00.js
 %%WWWDIR%%/client/8725.9971cc726db52a178b00.js.map
 %%WWWDIR%%/client/8734.a1d4a5f5820fbc02d123.js
@@ -333,21 +319,27 @@
 %%WWWDIR%%/client/9231.f2d46eb836c80d18f014.js.map
 %%WWWDIR%%/client/9269.7bef6e6584c581f5c96d.js
 %%WWWDIR%%/client/9269.7bef6e6584c581f5c96d.js.map
+%%WWWDIR%%/client/927.63303a970be9da2caea9.css
+%%WWWDIR%%/client/927.63303a970be9da2caea9.css.map
+%%WWWDIR%%/client/927.d6208f1b60c77ce28104.js
+%%WWWDIR%%/client/927.d6208f1b60c77ce28104.js.map
 %%WWWDIR%%/client/9281.ecb21f8529b255fa0986.js
 %%WWWDIR%%/client/9281.ecb21f8529b255fa0986.js.map
-%%WWWDIR%%/client/9287.62f1389de8597859c538.js
-%%WWWDIR%%/client/9287.62f1389de8597859c538.js.map
-%%WWWDIR%%/client/9287.7cb2a6cfbd8bb9793198.css
-%%WWWDIR%%/client/9287.7cb2a6cfbd8bb9793198.css.map
+%%WWWDIR%%/client/9287.1ae4b609ddf03369f13b.css
+%%WWWDIR%%/client/9287.1ae4b609ddf03369f13b.css.map
+%%WWWDIR%%/client/9287.3a5fa59b5d84af37c772.js
+%%WWWDIR%%/client/9287.3a5fa59b5d84af37c772.js.map
 %%WWWDIR%%/client/9410.84b6dce705b5fbbfcf00.js
 %%WWWDIR%%/client/9410.84b6dce705b5fbbfcf00.js.map
 %%WWWDIR%%/client/942.f4b26f7f5900cdb7c9f9.js
 %%WWWDIR%%/client/942.f4b26f7f5900cdb7c9f9.js.map
 %%WWWDIR%%/client/9604.5d838f221b541a3dc704.js
 %%WWWDIR%%/client/9604.5d838f221b541a3dc704.js.map
+%%WWWDIR%%/client/9614.90a3cfb406f55673777c.js
+%%WWWDIR%%/client/9614.90a3cfb406f55673777c.js.map
 %%WWWDIR%%/client/9707.bd952b6fd79bcf4217f4.js
-%%WWWDIR%%/client/9744.92bf2482fecd296070af.js
-%%WWWDIR%%/client/9744.92bf2482fecd296070af.js.map
+%%WWWDIR%%/client/9744.030b456564d00fd0ce15.js
+%%WWWDIR%%/client/9744.030b456564d00fd0ce15.js.map
 %%WWWDIR%%/client/9849.a59701c695b1ddfc6fd6.js
 %%WWWDIR%%/client/9849.a59701c695b1ddfc6fd6.js.map
 %%WWWDIR%%/client/9859.b3147b2a56bc7b39c837.js
@@ -3828,7 +3820,6 @@
 %%WWWDIR%%/client/emoji/emoji-custom.png
 %%WWWDIR%%/client/emoji/%%MATTERMOSTD_USER%%.png
 %%WWWDIR%%/client/files/00301d72e07c55d59df5.svg
-%%WWWDIR%%/client/files/0098d1355858d44623fc.png
 %%WWWDIR%%/client/files/0108e89c9003e8c14ea3.woff
 %%WWWDIR%%/client/files/015736ac96a0f4b445b5.woff2
 %%WWWDIR%%/client/files/02271ec5cb9f5b4588ac.woff
@@ -3845,7 +3836,6 @@
 %%WWWDIR%%/client/files/18f795b7373cd6fac757.gif
 %%WWWDIR%%/client/files/1c5c889a1530329dd883.jpg
 %%WWWDIR%%/client/files/1e59d2330b4c6deb84b3.ttf
-%%WWWDIR%%/client/files/20785e8b14e143de1e18.png
 %%WWWDIR%%/client/files/20b39a15c40e4db238f1.png
 %%WWWDIR%%/client/files/20f389c4120be058d80a.woff2
 %%WWWDIR%%/client/files/20fd1704ea223900efa9.woff2
@@ -3857,10 +3847,8 @@
 %%WWWDIR%%/client/files/2a8c0b1b24fe26f9bfcf.svg
 %%WWWDIR%%/client/files/2c18b373ff146fd8108b.png
 %%WWWDIR%%/client/files/2c5822f8df09cab9d59c.png
-%%WWWDIR%%/client/files/2d4b76f5842974320ed1.eot
 %%WWWDIR%%/client/files/2f6dbcfa410b96ca2a35.woff2
 %%WWWDIR%%/client/files/2f7bc363fc5424ebda59.ttf
-%%WWWDIR%%/client/files/3284065c3340b6658cfa.jpg
 %%WWWDIR%%/client/files/3399e2ee5698233ffe44.png
 %%WWWDIR%%/client/files/34c82b247a366d047105.png
 %%WWWDIR%%/client/files/354501bac435c3264834.woff
@@ -3868,7 +3856,6 @@
 %%WWWDIR%%/client/files/372ee7bbea28f5a75e2a.svg
 %%WWWDIR%%/client/files/377564d283f9bc35cce9.png
 %%WWWDIR%%/client/files/39890742bc957b368704.woff2
-%%WWWDIR%%/client/files/3a942d4e6c0dfced4569.svg
 %%WWWDIR%%/client/files/3a99e70aee4076660d38.woff
 %%WWWDIR%%/client/files/3b8734f0d193b817f2b3.svg
 %%WWWDIR%%/client/files/3bd5f5c5dd54ccb0c7c2.woff2
@@ -3880,7 +3867,6 @@
 %%WWWDIR%%/client/files/4651fd92bdc643485b9e.jpg
 %%WWWDIR%%/client/files/4692b9ec53fd5972caa2.ttf
 %%WWWDIR%%/client/files/46dadbd80fa9043a992a.woff
-%%WWWDIR%%/client/files/47828bbc15464edb98e9.png
 %%WWWDIR%%/client/files/48c8ed225ff4a2f7a4c1.svg
 %%WWWDIR%%/client/files/4ad7c7e8bb8d10a34bb7.ttf
 %%WWWDIR%%/client/files/4c6b94fd1d07f8beff7c.woff
@@ -3900,6 +3886,7 @@
 %%WWWDIR%%/client/files/5b49f4993ae22d7975b4.ttf
 %%WWWDIR%%/client/files/5be1347c682810f199c7.eot
 %%WWWDIR%%/client/files/5f87fb0335aa3115cc71.svg
+%%WWWDIR%%/client/files/6579929148618fdc0eaf.svg
 %%WWWDIR%%/client/files/6a2055863ca6d151ebb4.png
 %%WWWDIR%%/client/files/6a4927c0ce25f392d35e.woff
 %%WWWDIR%%/client/files/6bf17d5beba5f18915c7.woff
@@ -3910,13 +3897,11 @@
 %%WWWDIR%%/client/files/6eec866c69313624be60.woff2
 %%WWWDIR%%/client/files/6f1462a75cab16ee77c8.woff2
 %%WWWDIR%%/client/files/6fdf0ac577be0ba82a4c.woff
-%%WWWDIR%%/client/files/711d6ebe91314060556c.png
 %%WWWDIR%%/client/files/71850e51ea04421286aa.png
 %%WWWDIR%%/client/files/71ff9ed7909b8a4a57f7.woff
 %%WWWDIR%%/client/files/72b8660cf48de3073575.woff
 %%WWWDIR%%/client/files/73ea273a72f4aca30ca5.woff2
 %%WWWDIR%%/client/files/7489a2fbfb9bfe704420.ttf
-%%WWWDIR%%/client/files/7526d4b6d87095105f45.ttf
 %%WWWDIR%%/client/files/7654b55b2f3442e91404.css
 %%WWWDIR%%/client/files/7947224e8a9914fa332b.woff
 %%WWWDIR%%/client/files/7a26b407c4ec2bbbaecd.png
@@ -3931,7 +3916,6 @@
 %%WWWDIR%%/client/files/82c53ca565ed83a033df.png
 %%WWWDIR%%/client/files/82de93c3795437425044.svg
 %%WWWDIR%%/client/files/853be92419a6c3766b9a.ttf
-%%WWWDIR%%/client/files/85dce17e8e940492f690.svg
 %%WWWDIR%%/client/files/85f92b639485f3804bb1.png
 %%WWWDIR%%/client/files/86cf650fecf6c2bd8407.woff
 %%WWWDIR%%/client/files/8a5f936332e8028c7278.ttf
@@ -3942,9 +3926,9 @@
 %%WWWDIR%%/client/files/8b841a4d47a221fdb5ca.png
 %%WWWDIR%%/client/files/8d593cfaa96238d5e2f8.woff
 %%WWWDIR%%/client/files/8d6b6822586eea3d3b20.ttf
+%%WWWDIR%%/client/files/8f3d1a4142c906ee1525.svg
 %%WWWDIR%%/client/files/8f702b9068ad5f14443a.png
 %%WWWDIR%%/client/files/90de726ce0a2fe9958d3.png
-%%WWWDIR%%/client/files/910b16c5b489b359e175.woff
 %%WWWDIR%%/client/files/91a3a29ed2f93ba44792.png
 %%WWWDIR%%/client/files/925aafc8b6d54b579a4e.svg
 %%WWWDIR%%/client/files/931d67ea207ab37ee693.woff2
@@ -3953,7 +3937,6 @@
 %%WWWDIR%%/client/files/95591a929f0d32aa282a.woff2
 %%WWWDIR%%/client/files/96759856b4e70f3a8338.woff
 %%WWWDIR%%/client/files/96bef01ba855a3b50904.woff
-%%WWWDIR%%/client/files/9777b4d58f156d2c1388.woff2
 %%WWWDIR%%/client/files/9777bf12a1f691f71268.png
 %%WWWDIR%%/client/files/99ec979441ce5d5c1e4d.mp3
 %%WWWDIR%%/client/files/9b0519e1f5fbf82b0548.png
@@ -3961,10 +3944,14 @@
 %%WWWDIR%%/client/files/9ea8998d9c0389f02c43.png
 %%WWWDIR%%/client/files/9eba1d77abcf2aa6e94e.ttf
 %%WWWDIR%%/client/files/a1abf90dfd72792a577a.woff2
+%%WWWDIR%%/client/files/a24b7eb0471f64ebf576.woff
 %%WWWDIR%%/client/files/a37832275fd33b01dc27.jpg
+%%WWWDIR%%/client/files/a39df65f30bbf5ec1bcf.woff2
 %%WWWDIR%%/client/files/a3bb00b98342a6b88a72.gif
 %%WWWDIR%%/client/files/a628e83945502338cace.mp3
+%%WWWDIR%%/client/files/a8b2077e566cb6bf7f11.eot
 %%WWWDIR%%/client/files/ab8aa80cba445eb0fb75.png
+%%WWWDIR%%/client/files/acd3c17c4859bf16e105.ttf
 %%WWWDIR%%/client/files/ad02dc088755e3884a5b.png
 %%WWWDIR%%/client/files/ae5bb38e37a452ff91c8.mp3
 %%WWWDIR%%/client/files/aeffd8025cba3647f1a6.woff
@@ -3981,16 +3968,17 @@
 %%WWWDIR%%/client/files/bf2d440b3a42ea78a998.ttf
 %%WWWDIR%%/client/files/bf7df14bc351bc131de2.svg
 %%WWWDIR%%/client/files/c01e2180eeaf3ec6fc96.png
-%%WWWDIR%%/client/files/c1a25e53f866b24a6c36.png
 %%WWWDIR%%/client/files/c295e7f71970f03c0549.woff2
 %%WWWDIR%%/client/files/c5c02d763c89380dcb4e.ttf
 %%WWWDIR%%/client/files/c7106e4ab743a4136ded.woff2
 %%WWWDIR%%/client/files/c768bfe69b3d4a980e7b.svg
 %%WWWDIR%%/client/files/c7abbdc345c701433289.svg
 %%WWWDIR%%/client/files/c81d1b2a4b75d3eded60.woff2
+%%WWWDIR%%/client/files/ccf665b8d863ca98e36d.jpg
 %%WWWDIR%%/client/files/cd5e231e0cc53b2cb2c0.woff2
 %%WWWDIR%%/client/files/cd8cb8b2332ebb5e7a6d.png
 %%WWWDIR%%/client/files/d02184525b86d72d3825.mp3
+%%WWWDIR%%/client/files/d2bf744fa2303f13660a.svg
 %%WWWDIR%%/client/files/d562e886c52f12660a41.woff
 %%WWWDIR%%/client/files/d5daf742611b86ea2649.woff2
 %%WWWDIR%%/client/files/d6484fce1ef428d5bd94.woff2
@@ -4008,7 +3996,6 @@
 %%WWWDIR%%/client/files/eb9c9ed586eda5e79e42.png
 %%WWWDIR%%/client/files/ed305b5434865e06ffde.ttf
 %%WWWDIR%%/client/files/f0ed40c1c7c4d880a63e.svg
-%%WWWDIR%%/client/files/f2b29bd9b1060d4e066b.png
 %%WWWDIR%%/client/files/f356182e1dc28ee0d654.woff2
 %%WWWDIR%%/client/files/f650f111a3b890d116f1.woff2
 %%WWWDIR%%/client/files/f691f37e57f04c152e23.woff
@@ -4023,26 +4010,28 @@
 %%WWWDIR%%/client/files/fc9ba5249878cd8f8d88.ttf
 %%WWWDIR%%/client/files/fd947498bc16392e76c2.woff
 %%WWWDIR%%/client/files/fe2176f79edaa716e621.woff2
-%%WWWDIR%%/client/i18n/bg.ff5849b28c011978967e.json
-%%WWWDIR%%/client/i18n/de.8667fb104e4897c79ba7.json
-%%WWWDIR%%/client/i18n/en_AU.358ad982d61af5ea84cb.json
-%%WWWDIR%%/client/i18n/es.076c18ccfd76f26b42bd.json
-%%WWWDIR%%/client/i18n/fa.a3a106464a159f63a247.json
-%%WWWDIR%%/client/i18n/fr.d524dc5c2c2f5a0f35be.json
-%%WWWDIR%%/client/i18n/hu.46e93339b7dbc41a957d.json
-%%WWWDIR%%/client/i18n/it.8939b4d7167d021ac5e2.json
-%%WWWDIR%%/client/i18n/ja.de19a2c6f0edf2198100.json
-%%WWWDIR%%/client/i18n/ko.290af13f75e745637e5e.json
-%%WWWDIR%%/client/i18n/nl.2a39bfcd3e8b52942363.json
-%%WWWDIR%%/client/i18n/pl.781eeadf4474887f249c.json
-%%WWWDIR%%/client/i18n/pt-BR.14390eb3a1637e1ee782.json
-%%WWWDIR%%/client/i18n/ro.5f4e4e8ead9bf079e8a3.json
-%%WWWDIR%%/client/i18n/ru.2adfb04a6bcb31ef64ce.json
-%%WWWDIR%%/client/i18n/sv.34f9fb56a24634eccda6.json
-%%WWWDIR%%/client/i18n/tr.544b47361996965e4b54.json
-%%WWWDIR%%/client/i18n/uk.ae1262e3a655d57b306a.json
-%%WWWDIR%%/client/i18n/zh-CN.5a185e20a9a6eda53a08.json
-%%WWWDIR%%/client/i18n/zh-TW.00e96559ba9cef1d213a.json
+%%WWWDIR%%/client/files/ff54773341517ad8040e.svg
+%%WWWDIR%%/client/i18n/bg.880c82092f0194cf3ac2.json
+%%WWWDIR%%/client/i18n/de.222382299aed199aef04.json
+%%WWWDIR%%/client/i18n/en_AU.c8e07b32a67e96dc01df.json
+%%WWWDIR%%/client/i18n/es.616f0a203236dbc62f1c.json
+%%WWWDIR%%/client/i18n/fa.83844e77ec7ddc94812d.json
+%%WWWDIR%%/client/i18n/fr.75be81dfe3a847ddd54a.json
+%%WWWDIR%%/client/i18n/hu.15f6f11876272c92873d.json
+%%WWWDIR%%/client/i18n/it.af68bee80a2d7e6ef203.json
+%%WWWDIR%%/client/i18n/ja.01af69de2d9c48cbc61f.json
+%%WWWDIR%%/client/i18n/ko.65ea228d04fc837d7275.json
+%%WWWDIR%%/client/i18n/nl.86d9023f6f06ff97b41f.json
+%%WWWDIR%%/client/i18n/pl.7a79d8c7c03d8ee8ef5a.json
+%%WWWDIR%%/client/i18n/pt-BR.67695b7aa7977f07256e.json
+%%WWWDIR%%/client/i18n/ro.010178bc006a1a2dc447.json
+%%WWWDIR%%/client/i18n/ru.dd4b26a78332df723817.json
+%%WWWDIR%%/client/i18n/sv.6c5c6d942ee87df1385c.json
+%%WWWDIR%%/client/i18n/tr.173b7ae534defdc2ed1a.json
+%%WWWDIR%%/client/i18n/uk.f153053d2811aab53c67.json
+%%WWWDIR%%/client/i18n/vi.8fa515754ddb1c9ccf83.json
+%%WWWDIR%%/client/i18n/zh-CN.fc9548e8486ee2cb8bf6.json
+%%WWWDIR%%/client/i18n/zh-TW.a3aa38ccaa3dc2444680.json
 %%WWWDIR%%/client/icon_120x120.png
 %%WWWDIR%%/client/icon_144x144.png
 %%WWWDIR%%/client/icon_152x152.png
@@ -4054,12 +4043,8 @@
 %%WWWDIR%%/client/icon_72x72.png
 %%WWWDIR%%/client/icon_76x76.png
 %%WWWDIR%%/client/icon_96x96.png
-%%WWWDIR%%/client/images/add_payment_method.png
-%%WWWDIR%%/client/images/add_subscription.png
 %%WWWDIR%%/client/images/admin-onboarding-background.jpg
 %%WWWDIR%%/client/images/appIcons.png
-%%WWWDIR%%/client/images/blue-lower.svg
-%%WWWDIR%%/client/images/blue.svg
 %%WWWDIR%%/client/images/browser-icons/chrome.svg
 %%WWWDIR%%/client/images/browser-icons/edge.svg
 %%WWWDIR%%/client/images/browser-icons/firefox.svg
@@ -4076,13 +4061,10 @@
 %%WWWDIR%%/client/images/cards/mastercard.png
 %%WWWDIR%%/client/images/cards/visa.jpg
 %%WWWDIR%%/client/images/channel_icon.png
-%%WWWDIR%%/client/images/circles.png
 %%WWWDIR%%/client/images/cloud-laptop-error.png
 %%WWWDIR%%/client/images/cloud-laptop-warning.png
 %%WWWDIR%%/client/images/cloud-laptop.png
 %%WWWDIR%%/client/images/cloud-upgrade-person-hand-to-face.png
-%%WWWDIR%%/client/images/computer-with-alert.svg
-%%WWWDIR%%/client/images/credit-card-empty-state.png
 %%WWWDIR%%/client/images/favicon/android-chrome-192x192.png
 %%WWWDIR%%/client/images/favicon/apple-touch-icon-120x120.png
 %%WWWDIR%%/client/images/favicon/apple-touch-icon-144x144.png
@@ -4116,11 +4098,11 @@
 %%WWWDIR%%/client/images/logo_email_blue.png
 %%WWWDIR%%/client/images/logo_email_dark.png
 %%WWWDIR%%/client/images/logo_email_gray.png
-%%WWWDIR%%/client/images/payment-method-illustration.png
-%%WWWDIR%%/client/images/warning.png
+%%WWWDIR%%/client/images/payment_processing.png
+%%WWWDIR%%/client/images/purchase_alert.png
 %%WWWDIR%%/client/images/welcome_illustration_new.png
-%%WWWDIR%%/client/main.731e7ee5ce200846617c.js
-%%WWWDIR%%/client/main.731e7ee5ce200846617c.js.map
+%%WWWDIR%%/client/main.ae03cee26fe3faf6ad60.js
+%%WWWDIR%%/client/main.ae03cee26fe3faf6ad60.js.map
 %%WWWDIR%%/client/manifest.json
 %%WWWDIR%%/client/remote_entry.js
 %%WWWDIR%%/client/remote_entry.js.map
diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile
index f0b79bb20860..fd65d442d4a0 100644
--- a/www/miniflux/Makefile
+++ b/www/miniflux/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	miniflux
 DISTVERSION=	2.1.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	krion@FreeBSD.org
diff --git a/www/minio/Makefile b/www/minio/Makefile
index 4a94d887d43c..9c21bbb4ebaa 100644
--- a/www/minio/Makefile
+++ b/www/minio/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	minio
 PORTVERSION=	${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g}
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	www
 DIST_SUBDIR=	minio
 
diff --git a/www/mirrorselect/Makefile b/www/mirrorselect/Makefile
index ccb998c258c2..f20cf25d1f5a 100644
--- a/www/mirrorselect/Makefile
+++ b/www/mirrorselect/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	mirrorselect
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www ports-mgmt
 
 MAINTAINER=	aly@aaronly.me
diff --git a/www/morty/Makefile b/www/morty/Makefile
index a19172e559f3..01286684e44c 100644
--- a/www/morty/Makefile
+++ b/www/morty/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	morty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0-12
 DISTVERSIONSUFFIX=	-gfe94d9a
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www net
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/nginx-prometheus-exporter/Makefile b/www/nginx-prometheus-exporter/Makefile
index 091e303c7a14..c21f59b74381 100644
--- a/www/nginx-prometheus-exporter/Makefile
+++ b/www/nginx-prometheus-exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nginx-prometheus-exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	arcade@b1t.name
diff --git a/www/nginx-vts-exporter/Makefile b/www/nginx-vts-exporter/Makefile
index 0716584809ec..26a58d0031a4 100644
--- a/www/nginx-vts-exporter/Makefile
+++ b/www/nginx-vts-exporter/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=			nginx-vts-exporter
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.10.7
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=			www
 
 MAINTAINER=			joneum@FreeBSD.org
diff --git a/www/oauth2-proxy/Makefile b/www/oauth2-proxy/Makefile
index 29d9e5edb8ed..83c33b01d091 100644
--- a/www/oauth2-proxy/Makefile
+++ b/www/oauth2-proxy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	oauth2-proxy
 PORTVERSION=	7.5.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	www
 
 MAINTAINER=	freebsd@rheinwolf.de
diff --git a/www/oneshot/Makefile b/www/oneshot/Makefile
index b1046d9d2f1e..ae94a0a3c16f 100644
--- a/www/oneshot/Makefile
+++ b/www/oneshot/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	oneshot
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	www
 
 MAINTAINER=	lcook@FreeBSD.org
diff --git a/www/owncast/Makefile b/www/owncast/Makefile
index 30eed7a153e0..2a4dc82a7837 100644
--- a/www/owncast/Makefile
+++ b/www/owncast/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	owncast
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/www/php81-tidy/Makefile b/www/php81-tidy/Makefile
index e5d423609516..9b3aed822ddb 100644
--- a/www/php81-tidy/Makefile
+++ b/www/php81-tidy/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php81
diff --git a/www/phpfpmtop/Makefile b/www/phpfpmtop/Makefile
index 6236fcbea5fb..6ad47ce4a433 100644
--- a/www/phpfpmtop/Makefile
+++ b/www/phpfpmtop/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	phpfpmtop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www devel
 
 MAINTAINER=	mops@punkt.de
diff --git a/www/phpvirtualbox-legacy/Makefile b/www/phpvirtualbox-legacy/Makefile
index be0c78bb5205..efaccedd0017 100644
--- a/www/phpvirtualbox-legacy/Makefile
+++ b/www/phpvirtualbox-legacy/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	phpvirtualbox
 DISTVERSION=	5.2-1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 PKGNAMESUFFIX=	-legacy
 
@@ -22,7 +22,8 @@ DOS2UNIX_REGEX=	.*\.(php|txt|js|css|html)
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 ETCDIR=		${WWWDIR}
 
-EXTRA_PATCHES+=	${.CURDIR}/../phpvirtualbox/files/patch-php8
+EXTRA_PATCHES+=	${.CURDIR}/../phpvirtualbox/files/patch-php8 \
+		${.CURDIR}/../phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
 
 post-patch:
 	@${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf
diff --git a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html
deleted file mode 100644
index 75142aed7747..000000000000
--- a/www/phpvirtualbox-legacy/files/patch-panes_mediumEncryptionPasswords.html
+++ /dev/null
@@ -1,41 +0,0 @@
---- panes/mediumEncryptionPasswords.html.orig	2017-07-27 16:54:58 UTC
-+++ panes/mediumEncryptionPasswords.html
-@@ -15,6 +15,7 @@
-                 <th class='translate' style='width:1%; text-align:center'>Status</th>
-                 <th class='translate' style='width:30%; text-align:center'>ID</th>
-                 <th class='translate'>Password</th>
-+                <th class='translate'>Clear on suspend</th>
-             </tr>
-         </thead>
-         <tbody id='vboxMediumEncryptionPasswordList'>
-@@ -37,9 +38,12 @@ function vboxMediumEncryptionPasswordAdd
-         .append($('<td />')
-                 .append(
-                         valid ? '*****' : 
--                        $('<input />').attr({'type':'password','style':'width:95%'}).addClass('vboxText')
-+                        $('<input />').attr({'type':'password','style':'width:90%'}).addClass('vboxText')
-                         )
-         )
-+        .append($('<td />')
-+                .append($('<input />').attr({'type':'checkbox', 'checked':'checked'}))
-+        )
-         .appendTo($('#vboxMediumEncryptionPasswordList'))
- }
- 
-@@ -55,7 +59,8 @@ function vboxMediumEncryptionPasswordsGe
-             continue;
-         encryptionPWs.push({
-             'id': $(rowlist[i]).data('vboxEncryptionId'),
--            'password': $(rowlist[i]).find('input').first().val()
-+            'password': $(rowlist[i]).find('input[type="password"]').first().val(),
-+            'clearOnSuspend': $(rowlist[i]).find('input[type="checkbox"]').first().is(':checked') ? '1' : '0'
-         });
-         
-     }
-@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
-     });
-     return valid;
- }
--</script>
-\ No newline at end of file
-+</script>
diff --git a/www/phpvirtualbox/Makefile b/www/phpvirtualbox/Makefile
index 7569c308c855..1b7443882cd5 100644
--- a/www/phpvirtualbox/Makefile
+++ b/www/phpvirtualbox/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	phpvirtualbox
 DISTVERSION=	6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 
 MAINTAINER=	vbox@FreeBSD.org
diff --git a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
index 75142aed7747..3e8a7c62dfb7 100644
--- a/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
+++ b/www/phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
@@ -32,10 +32,3 @@
          });
          
      }
-@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
-     });
-     return valid;
- }
--</script>
-\ No newline at end of file
-+</script>
diff --git a/www/phpvirtualbox/files/patch-php8 b/www/phpvirtualbox/files/patch-php8
index 12783b19f800..52fe5a6a5b12 100644
--- a/www/phpvirtualbox/files/patch-php8
+++ b/www/phpvirtualbox/files/patch-php8
@@ -1,7 +1,6 @@
-diff -ur endpoints/api.php.orig endpoints/api.php
---- endpoints/api.php.orig
+--- endpoints/api.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/api.php
-@@ -334,6 +334,9 @@
+@@ -334,6 +334,9 @@ try {
  
  	// Just append to $vbox->errors and let it get
  	// taken care of below
@@ -11,7 +10,7 @@ diff -ur endpoints/api.php.orig endpoints/api.php
  	if(!$vbox || !$vbox->errors) {
  		$vbox->errors = array();
  	}
-@@ -342,7 +345,7 @@
+@@ -342,7 +345,7 @@ try {
  
  
  // Add any messages
@@ -20,7 +19,7 @@ diff -ur endpoints/api.php.orig endpoints/api.php
  	foreach($vbox->messages as $m)
  		$response['messages'][] = 'vboxconnector('.$request['fn'] .'): ' . $m;
  }
-@@ -360,7 +363,7 @@
+@@ -360,7 +363,7 @@ if($vbox && $vbox->errors) {
  		if($e->getCode() == vboxconnector::PHPVB_ERRNO_CONNECT && isset($vbox->settings))
  			$d .= "\n\nLocation:" . $vbox->settings->location;
  
@@ -29,10 +28,9 @@ diff -ur endpoints/api.php.orig endpoints/api.php
  
  		$response['errors'][] = array(
  			'error'=> ($e->getCode() & vboxconnector::PHPVB_ERRNO_HTML ? $e->getMessage() : htmlentities($e->getMessage())),
-diff -ur endpoints/jqueryFileTree.php.orig endpoints/jqueryFileTree.php
---- endpoints/jqueryFileTree.php.orig
+--- endpoints/jqueryFileTree.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/jqueryFileTree.php
-@@ -223,6 +223,8 @@
+@@ -223,6 +223,8 @@ function getdir($dir, $dirsOnly=false, $recurse=array(
   */
  function getdir($dir, $dirsOnly=false, $recurse=array()) {
  
@@ -41,7 +39,7 @@ diff -ur endpoints/jqueryFileTree.php.orig endpoints/jqueryFileTree.php
  	if(!$dir) $dir = DSEP;
  
  	$entries = getDirEntries($dir, $dirsOnly);
-@@ -251,9 +253,9 @@
+@@ -251,9 +253,9 @@ function getdir($dir, $dirsOnly=false, $recurse=array(
          	// Push file on to stack
          	} else {
  
@@ -53,10 +51,22 @@ diff -ur endpoints/jqueryFileTree.php.orig endpoints/jqueryFileTree.php
  
                  array_push($dirents, file_entry($path));
          	}
-diff -ur endpoints/lib/language.php.orig endpoints/lib/language.php
---- endpoints/lib/language.php.orig
+--- endpoints/lib/config.php.orig	2024-06-07 15:46:20 UTC
++++ endpoints/lib/config.php
+@@ -141,6 +141,10 @@ class phpVBoxConfigClass {
+ 	 */
+ 	var $eventListenerTimeout = 20;
+ 
++	var $enableHDFlushConfig = false;
++
++	var $authMaster = false;
++
+ 	/**
+ 	 * Read user configuration, apply defaults, and do some sanity checking
+ 	 * @see vboxconnector
+--- endpoints/lib/language.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/lib/language.php
-@@ -73,6 +73,8 @@
+@@ -73,6 +73,8 @@ class __vbox_language {
  		$xmlObj = simplexml_load_string(@file_get_contents(VBOX_BASE_LANG_DIR.'/'.$lang.'.xml'));
  		$arrXml = $this->objectsIntoArray($xmlObj);
  
@@ -65,10 +75,9 @@ diff -ur endpoints/lib/language.php.orig endpoints/lib/language.php
  		$lang = array();
  		if(!@$arrXml['context'][0]) $arrXml['context'] = array($arrXml['context']);
  		foreach($arrXml['context'] as $c) {
-diff -ur endpoints/lib/vboxServiceWrappers.php.orig endpoints/lib/vboxServiceWrappers.php
---- endpoints/lib/vboxServiceWrappers.php.orig
+--- endpoints/lib/vboxServiceWrappers.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/lib/vboxServiceWrappers.php
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ abstract class VBox_Collection implements ArrayAccess,
      }
  
      /** ArrayAccess Functions **/
@@ -77,7 +86,7 @@ diff -ur endpoints/lib/vboxServiceWrappers.php.orig endpoints/lib/vboxServiceWra
      {
          if ($value instanceof $this->_interfaceName)
          {
-@@ -127,49 +127,50 @@
+@@ -127,49 +127,50 @@ abstract class VBox_Collection implements ArrayAccess,
          }
      }
  
@@ -136,10 +145,42 @@ diff -ur endpoints/lib/vboxServiceWrappers.php.orig endpoints/lib/vboxServiceWra
      {
          return count($this->_objects);
      }
-diff -ur endpoints/screen.php.orig endpoints/screen.php
---- endpoints/screen.php.orig
+--- endpoints/lib/vboxconnector.php.orig	2024-06-07 15:46:20 UTC
++++ endpoints/lib/vboxconnector.php
+@@ -112,6 +112,8 @@ class vboxconnector {
+ 	 */
+ 	var $dsep = null;
+ 
++	var $client = null;
++
+ 	/**
+ 	 * Obtain configuration settings and set object vars
+ 	 * @param boolean $useAuthMaster use the authentication master obtained from configuration class
+@@ -387,7 +389,8 @@ class vboxconnector {
+ 
+ 			// The amount of time we will wait for events is determined by
+ 			// the amount of listeners - at least half a second
+-			$listenerWait = max(100,intval(500/count($this->persistentRequest['vboxEventListeners'])));
++			$listenerCount = count($this->persistentRequest['vboxEventListeners']);
++			$listenerWait = max(100,intval(500/($listenerCount > 0 ? $listenerCount : 1)));
+ 		}
+ 
+ 		// Get events from each configured event listener
+@@ -5660,11 +5663,6 @@ class vboxconnector {
+ 			}
+ 		} catch (Exception $null) {}
+ 		$m->releaseRemote();
+-
+-		// Attempt to UTF-8 encode string or json_encode may choke
+-		// and return an empty string
+-		if(function_exists('utf8_encode'))
+-			return utf8_encode($log);
+ 
+ 		return $log;
+ 	}
+--- endpoints/screen.php.orig	2024-06-07 15:46:20 UTC
 +++ endpoints/screen.php
-@@ -87,13 +87,13 @@
+@@ -87,13 +87,13 @@ try {
  
  		// Let the browser cache images for 3 seconds
  		$ctime = 0;
@@ -158,8 +199,8 @@ diff -ur endpoints/screen.php.orig endpoints/screen.php
 +		} else if(strpos($_ENV['HTTP_IF_MODIFIED_SINCE'] ?? '','GMT')) {
  			$ctime = strtotime($_ENV['HTTP_IF_MODIFIED_SINCE']);
  		}
- 
-@@ -164,13 +164,13 @@
+ 		
+@@ -164,13 +164,13 @@ try {
  
  		// Let the browser cache saved state images
  		$ctime = 0;
@@ -178,11 +219,10 @@ diff -ur endpoints/screen.php.orig endpoints/screen.php
 +		} else if(strpos($_ENV['HTTP_IF_MODIFIED_SINCE'] ?? '','GMT')) {
  			$ctime = strtotime($_ENV['HTTP_IF_MODIFIED_SINCE']);
  		}
- 
-diff -ur panes/settingsDisplay.html.orig panes/settingsDisplay.html
---- panes/settingsDisplay.html.orig
+ 		
+--- panes/settingsDisplay.html.orig	2024-06-07 15:46:20 UTC
 +++ panes/settingsDisplay.html
-@@ -77,9 +77,9 @@
+@@ -77,9 +77,9 @@ -->
  		<th><span class='translate'>Authentication Method:</span></th>
  		<td>
               <select name='vboxSettingsDisplayVRDEAuth' id='vboxSettingsDisplayVRDEAuthID' style='width: 100%'>
@@ -195,10 +235,9 @@ diff -ur panes/settingsDisplay.html.orig panes/settingsDisplay.html
               </select>
            </td>
  	</tr>
-diff -ur panes/settingsNetwork.html.orig panes/settingsNetwork.html
---- panes/settingsNetwork.html.orig
+--- panes/settingsNetwork.html.orig	2024-06-07 15:46:20 UTC
 +++ panes/settingsNetwork.html
-@@ -320,7 +320,7 @@
+@@ -320,7 +320,7 @@ function vboxSettingsUpdateNetworkOptions(sel) {
  	}
  
  	// Special case for Internal, Generic, and VDE network selects
@@ -207,37 +246,3 @@ diff -ur panes/settingsNetwork.html.orig panes/settingsNetwork.html
  		$(nsel).jec();
  	}
  	
---- endpoints/lib/config.php.orig
-+++ endpoints/lib/config.php
-@@ -141,6 +141,10 @@
- 	 */
- 	var $eventListenerTimeout = 20;
- 
-+	var $enableHDFlushConfig = false;
-+
-+	var $authMaster = false;
-+
- 	/**
- 	 * Read user configuration, apply defaults, and do some sanity checking
- 	 * @see vboxconnector
---- endpoints/lib/vboxconnector.php.orig
-+++ endpoints/lib/vboxconnector.php
-@@ -112,6 +112,8 @@
- 	 */
- 	var $dsep = null;
- 
-+	var $client = null;
-+
- 	/**
- 	 * Obtain configuration settings and set object vars
- 	 * @param boolean $useAuthMaster use the authentication master obtained from configuration class
-@@ -389,7 +389,8 @@
- 
- 			// The amount of time we will wait for events is determined by
- 			// the amount of listeners - at least half a second
--			$listenerWait = max(100,intval(500/count($this->persistentRequest['vboxEventListeners'])));
-+			$listenerCount = count($this->persistentRequest['vboxEventListeners']);
-+			$listenerWait = max(100,intval(500/($listenerCount > 0 ? $listenerCount : 1)));
- 		}
- 
- 		// Get events from each configured event listener
diff --git a/www/pomerium/Makefile b/www/pomerium/Makefile
index 6be718741fa5..6f29d862f965 100644
--- a/www/pomerium/Makefile
+++ b/www/pomerium/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pomerium
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.4
-PORTREVISION=	3
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	www
 
diff --git a/www/py-qt6-webengine/Makefile b/www/py-qt6-webengine/Makefile
index ba2317eff1da..8a6e942bdb93 100644
--- a/www/py-qt6-webengine/Makefile
+++ b/www/py-qt6-webengine/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for the Qt6 toolkit, QtWebEngine module
 WWW=		https://riverbankcomputing.com/software/pyqt
 
 USES=		gl python pyqt:6 qt:6
-USE_GL=		gl
+USE_GL=		opengl
 USE_PYQT=	sip:build pyqt6
 USE_PYTHON=	concurrent flavors
 USE_QT=		base declarative positioning webchannel webengine
diff --git a/www/py-qt6-webengine/distinfo b/www/py-qt6-webengine/distinfo
index a47e084a2044..4e4a1ee59e1d 100644
--- a/www/py-qt6-webengine/distinfo
+++ b/www/py-qt6-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698900348
-SHA256 (PyQt6_WebEngine-6.6.0.tar.gz) = d50b984c3f85e409e692b156132721522d4e8cf9b6c25e0cf927eea2dfb39487
-SIZE (PyQt6_WebEngine-6.6.0.tar.gz) = 31817
+TIMESTAMP = 1714272046
+SHA256 (PyQt6_WebEngine-6.7.0.tar.gz) = 68edc7adb6d9e275f5de956881e79cca0d71fad439abeaa10d823bff5ac55001
+SIZE (PyQt6_WebEngine-6.7.0.tar.gz) = 32593
diff --git a/www/py-qt6-webengine/pkg-plist b/www/py-qt6-webengine/pkg-plist
index c223a7b9147b..d569bcec7b29 100644
--- a/www/py-qt6-webengine/pkg-plist
+++ b/www/py-qt6-webengine/pkg-plist
@@ -7,6 +7,7 @@
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecontextmenurequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginecookiestore.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedesktopmediarequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginedownloadrequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginefindtextresult.sip
@@ -30,6 +31,7 @@
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlrequestjob.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlscheme.sip
 %%PYQT_SIPDIR%%/QtWebEngineCore/qwebengineurlschemehandler.sip
+%%PYQT_SIPDIR%%/QtWebEngineCore/qwebenginewebauthuxrequest.sip
 %%PYQT_SIPDIR%%/QtWebEngineQuick/QtWebEngineQuick.toml
 %%PYQT_SIPDIR%%/QtWebEngineQuick/QtWebEngineQuickmod.sip
 %%PYQT_SIPDIR%%/QtWebEngineQuick/qquickwebengineprofile.sip
diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
index 18b00a66b9ba..0a6c9e5cf5f7 100644
--- a/www/py-requests/Makefile
+++ b/www/py-requests/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	requests
-PORTVERSION=	2.31.0
+PORTVERSION=	2.32.2
 CATEGORIES=	www python
-MASTER_SITES=	PYPI
+MASTER_SITES=	PYPI \
+		https://github.com/psf/requests/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -12,6 +13,8 @@ WWW=		https://docs.python-requests.org/en/latest/ \
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2<4:textproc/py-charset-normalizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.5<4:dns/py-idna@${PY_FLAVOR} \
@@ -24,7 +27,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}trustme>=0:security/py-trustme@${PY_FLAVOR}
 
 USES=		cpe python
-USE_PYTHON=	autoplist concurrent distutils pytest
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
diff --git a/www/py-requests/distinfo b/www/py-requests/distinfo
index 50b077b9bc1e..869348cb597e 100644
--- a/www/py-requests/distinfo
+++ b/www/py-requests/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685162254
-SHA256 (requests-2.31.0.tar.gz) = 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
-SIZE (requests-2.31.0.tar.gz) = 110794
+TIMESTAMP = 1716448732
+SHA256 (requests-2.32.2.tar.gz) = dd951ff5ecf3e3b3aa26b40703ba77495dab41da839ae72ef3c8e5d8e2433289
+SIZE (requests-2.32.2.tar.gz) = 130327
diff --git a/www/pydio-cells/Makefile b/www/pydio-cells/Makefile
index 8e743fe59677..b1b290e90e37 100644
--- a/www/pydio-cells/Makefile
+++ b/www/pydio-cells/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cells
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 PKGNAMEPREFIX=	pydio-
 
diff --git a/www/qt5-webchannel/distinfo b/www/qt5-webchannel/distinfo
index c63115acb4b4..2ffc8dc6c0bc 100644
--- a/www/qt5-webchannel/distinfo
+++ b/www/qt5-webchannel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771162
-SHA256 (KDE/Qt/5.15.13/kde-qtwebchannel-5.15.13p3.tar.xz) = 5e23ef005b3afc2010edd1ede739eaae760be2bc49b0ee4e8777133521806a97
-SIZE (KDE/Qt/5.15.13/kde-qtwebchannel-5.15.13p3.tar.xz) = 188476
+TIMESTAMP = 1716930665
+SHA256 (KDE/Qt/5.15.14/kde-qtwebchannel-5.15.14p3.tar.xz) = 59040baab1d6f4db82dfe0e8803ce3e658a9bc4f1ca9a5e31bfdb0319bce9c1e
+SIZE (KDE/Qt/5.15.14/kde-qtwebchannel-5.15.14p3.tar.xz) = 188652
diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo
index 43b30ce42d06..7daa322c1228 100644
--- a/www/qt5-webengine/distinfo
+++ b/www/qt5-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711846408
-SHA256 (KDE/Qt/5.15.16/kde-qtwebengine-5.15.16p9.tar.xz) = 99313b8f20786e6624536a0f209c7f8dde3555fe0c8688355463b32b0a54232a
-SIZE (KDE/Qt/5.15.16/kde-qtwebengine-5.15.16p9.tar.xz) = 317545680
+TIMESTAMP = 1716922011
+SHA256 (KDE/Qt/5.15.17/kde-qtwebengine-5.15.17p2.tar.xz) = f5471ecd69c7e0b90906068113948ba49e06e23b52ac7e99b88cea85db09db2f
+SIZE (KDE/Qt/5.15.17/kde-qtwebengine-5.15.17p2.tar.xz) = 317614764
diff --git a/www/qt5-webengine/files/patch-security-rollup b/www/qt5-webengine/files/patch-security-rollup
new file mode 100644
index 000000000000..b27b8cec77c9
--- /dev/null
+++ b/www/qt5-webengine/files/patch-security-rollup
@@ -0,0 +1,891 @@
+Add security patches to this file.
+
+Addresses the following security issues:
+
+- Security bug 329674887
+- CVE-2024-3157
+- CVE-2024-3516
+- CVE-2024-3839
+- CVE-2024-3837
+- Security bug 40940917
+- CVE-2024-4058
+- Security bug 327698060
+- CVE-2024-4558
+- CVE-2024-3914
+- Security bug 329699609
+
+From a3580d0a0fc78016093fd96d72f1449589642292 Mon Sep 17 00:00:00 2001
+From: Marco Paniconi <marpan@google.com>
+Date: Wed, 13 Mar 2024 10:58:17 -0700
+Subject: [PATCH] [Backport] Security bug 329674887 (1/2)
+
+Cherry-pick of patch orignally reviewed on
+https://chromium-review.googlesource.com/c/webm/libvpx/+/5370376:
+Fix to buffer alloc for vp9_bitstream_worker_data
+
+The code was using the bitstream_worker_data when it
+wasn't allocated for big enough size. This is because
+the existing condition was to only re-alloc the
+bitstream_worker_data when current dest_size was larger
+than the current frame_size. But under resolution change
+where frame_size is increased, beyond the current dest_size,
+we need to allow re-alloc to the new size.
+
+The existing condition to re-alloc when dest_size is
+larger than frame_size (which is not required) is kept
+for now.
+
+Also increase the dest_size to account for image format.
+
+Added tests, for both ROW_MT=0 and 1, that reproduce
+the failures in the bugs below.
+
+Note: this issue only affects the REALTIME encoding path.
+
+Bug: b/329088759, b/329674887, b/329179808
+
+Change-Id: Icd65dbc5317120304d803f648d4bd9405710db6f
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/554667
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../source/libvpx/vp9/encoder/vp9_bitstream.c      | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c b/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
+index 3eff4ce830d1..22db39714922 100644
+--- src/3rdparty/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
++++ src/3rdparty/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
+@@ -963,6 +963,14 @@ void vp9_bitstream_encode_tiles_buffer_dealloc(VP9_COMP *const cpi) {
+   }
+ }
+ 
++static int encode_tiles_buffer_alloc_size(VP9_COMP *const cpi) {
++  VP9_COMMON *const cm = &cpi->common;
++  const int image_bps =
++      (8 + 2 * (8 >> (cm->subsampling_x + cm->subsampling_y))) *
++      (1 + (cm->bit_depth > 8));
++  return cpi->oxcf.width * cpi->oxcf.height * image_bps / 8;
++}
++
+ static int encode_tiles_buffer_alloc(VP9_COMP *const cpi) {
+   int i;
+   const size_t worker_data_size =
+@@ -972,7 +980,7 @@ static int encode_tiles_buffer_alloc(VP9_COMP *const cpi) {
+   if (!cpi->vp9_bitstream_worker_data) return 1;
+   for (i = 1; i < cpi->num_workers; ++i) {
+     cpi->vp9_bitstream_worker_data[i].dest_size =
+-        cpi->oxcf.width * cpi->oxcf.height;
++        encode_tiles_buffer_alloc_size(cpi);
+     cpi->vp9_bitstream_worker_data[i].dest =
+         vpx_malloc(cpi->vp9_bitstream_worker_data[i].dest_size);
+     if (!cpi->vp9_bitstream_worker_data[i].dest) return 1;
+@@ -989,8 +997,8 @@ static size_t encode_tiles_mt(VP9_COMP *cpi, uint8_t *data_ptr) {
+   int tile_col = 0;
+ 
+   if (!cpi->vp9_bitstream_worker_data ||
+-      cpi->vp9_bitstream_worker_data[1].dest_size >
+-          (cpi->oxcf.width * cpi->oxcf.height)) {
++      cpi->vp9_bitstream_worker_data[1].dest_size !=
++          encode_tiles_buffer_alloc_size(cpi)) {
+     vp9_bitstream_encode_tiles_buffer_dealloc(cpi);
+     if (encode_tiles_buffer_alloc(cpi)) return 0;
+   }
+From 7c81b9390d837ffbaccb1846db64960b4a79626f Mon Sep 17 00:00:00 2001
+From: Marco Paniconi <marpan@google.com>
+Date: Sat, 16 Mar 2024 10:39:28 -0700
+Subject: [PATCH] [Backport] Security bug 329674887 (2/2)
+
+Cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/webm/libvpx/+/5375794:
+vp9: fix to integer overflow test
+
+failure for the 16k test: issue introduced
+in: c29e637283
+
+Bug: b/329088759, b/329674887, b/329179808
+
+Change-Id: I88e8a36b7f13223997c3006c84aec9cfa48c0bcf
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/554668
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c          | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c b/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
+index 22db3971492..645ba6ebb3a 100644
+--- src/3rdparty/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
++++ src/3rdparty/chromium/third_party/libvpx/source/libvpx/vp9/encoder/vp9_bitstream.c
+@@ -968,7 +968,9 @@ static int encode_tiles_buffer_alloc_size(VP9_COMP *const cpi) {
+   const int image_bps =
+       (8 + 2 * (8 >> (cm->subsampling_x + cm->subsampling_y))) *
+       (1 + (cm->bit_depth > 8));
+-  return cpi->oxcf.width * cpi->oxcf.height * image_bps / 8;
++  const int64_t size =
++      (int64_t)cpi->oxcf.width * cpi->oxcf.height * image_bps / 8;
++  return (int)size;
+ }
+ 
+ static int encode_tiles_buffer_alloc(VP9_COMP *const cpi) {
+From 11ecd608320b14500f912e827b5b0eab285b8142 Mon Sep 17 00:00:00 2001
+From: kylechar <kylechar@chromium.org>
+Date: Tue, 9 Apr 2024 17:14:26 +0000
+Subject: [PATCH] [Backport] CVE-2024-3157: Out of bounds write in Compositing
+
+Cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5420432:
+Validate buffer length
+
+The BitmapInSharedMemory mojo traits were only validating row length and
+not total buffer length.
+
+(cherry picked from commit 1a19ff70bd54847d818566bd7a1e7c384c419746)
+
+(cherry picked from commit f15315f1cb7897e208947a40d538aac693283d7f)
+
+Bug: 331237485
+Change-Id: Ia2318899c44e9e7ac72fc7183954e6ce2c702179
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5396796
+Commit-Queue: Kyle Charbonneau <kylechar@chromium.org>
+Cr-Original-Original-Commit-Position: refs/heads/main@{#1278417}
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5420432
+Commit-Queue: danakj <danakj@chromium.org>
+Cr-Original-Commit-Position: refs/branch-heads/6312@{#786}
+Cr-Original-Branched-From: 6711dcdae48edaf98cbc6964f90fac85b7d9986e-refs/heads/main@{#1262506}
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5433678
+Reviewed-by: danakj <danakj@chromium.org>
+Reviewed-by: Kyle Charbonneau <kylechar@chromium.org>
+Cr-Commit-Position: refs/branch-heads/6099@{#2003}
+Cr-Branched-From: e6ee4500f7d6549a9ac1354f8d056da49ef406be-refs/heads/main@{#1217362}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/554669
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../cpp/compositing/bitmap_in_shared_memory_mojom_traits.cc   | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/chromium/services/viz/public/cpp/compositing/bitmap_in_shared_memory_mojom_traits.cc b/chromium/services/viz/public/cpp/compositing/bitmap_in_shared_memory_mojom_traits.cc
+index f602fa100477..c6d84002b3e4 100644
+--- src/3rdparty/chromium/services/viz/public/cpp/compositing/bitmap_in_shared_memory_mojom_traits.cc
++++ src/3rdparty/chromium/services/viz/public/cpp/compositing/bitmap_in_shared_memory_mojom_traits.cc
+@@ -69,6 +69,10 @@ bool StructTraits<viz::mojom::BitmapInSharedMemoryDataView, SkBitmap>::Read(
+   if (!mapping_ptr->IsValid())
+     return false;
+ 
++  if (mapping_ptr->size() < image_info.computeByteSize(data.row_bytes())) {
++    return false;
++  }
++
+   if (!sk_bitmap->installPixels(image_info, mapping_ptr->memory(),
+                                 data.row_bytes(), &DeleteSharedMemoryMapping,
+                                 mapping_ptr.get())) {
+From 060d3aa868d6f4403a9416fe34b48ffbfcfe19cb Mon Sep 17 00:00:00 2001
+From: Shahbaz Youssefi <syoussefi@chromium.org>
+Date: Mon, 25 Mar 2024 14:46:56 -0400
+Subject: [PATCH] [Backport] CVE-2024-3516: Heap buffer overflow in ANGLE
+
+Cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/angle/angle/+/5391986:
+Translator: Disallow samplers in structs in interface blocks
+
+As disallowed by the spec:
+
+> Types and declarators are the same as for other uniform variable
+> declarations outside blocks, with these exceptions:
+>
+> * opaque types are not allowed
+
+Bug: chromium:328859176
+Change-Id: Ib94977860102329e520e635c3757827c93ca2163
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5391986
+Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org>
+Reviewed-by: Geoff Lang <geofflang@chromium.org>
+Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/554670
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../src/compiler/translator/ParseContext.cpp  | 33 ++++++++++++-------
+ 1 file changed, 21 insertions(+), 12 deletions(-)
+
+diff --git a/chromium/third_party/angle/src/compiler/translator/ParseContext.cpp b/chromium/third_party/angle/src/compiler/translator/ParseContext.cpp
+index 84a0c8fd9e0d..3e8a4a71ff67 100644
+--- src/3rdparty/chromium/third_party/angle/src/compiler/translator/ParseContext.cpp
++++ src/3rdparty/chromium/third_party/angle/src/compiler/translator/ParseContext.cpp
+@@ -34,27 +34,39 @@ namespace
+ 
+ const int kWebGLMaxStructNesting = 4;
+ 
+-bool ContainsSampler(const TStructure *structType);
++struct IsSamplerFunc
++{
++    bool operator()(TBasicType type) { return IsSampler(type); }
++};
++struct IsOpaqueFunc
++{
++    bool operator()(TBasicType type) { return IsOpaqueType(type); }
++};
++
++template <typename OpaqueFunc>
++bool ContainsOpaque(const TStructure *structType);
+ 
+-bool ContainsSampler(const TType &type)
++template <typename OpaqueFunc>
++bool ContainsOpaque(const TType &type)
+ {
+-    if (IsSampler(type.getBasicType()))
++    if (OpaqueFunc{}(type.getBasicType()))
+     {
+         return true;
+     }
+     if (type.getBasicType() == EbtStruct)
+     {
+-        return ContainsSampler(type.getStruct());
++        return ContainsOpaque<OpaqueFunc>(type.getStruct());
+     }
+ 
+     return false;
+ }
+ 
+-bool ContainsSampler(const TStructure *structType)
++template <typename OpaqueFunc>
++bool ContainsOpaque(const TStructure *structType)
+ {
+     for (const auto &field : structType->fields())
+     {
+-        if (ContainsSampler(*field->type()))
++        if (ContainsOpaque<OpaqueFunc>(*field->type()))
+             return true;
+     }
+     return false;
+@@ -915,7 +927,7 @@ bool TParseContext::checkIsNotOpaqueType(const TSourceLoc &line,
+ {
+     if (pType.type == EbtStruct)
+     {
+-        if (ContainsSampler(pType.userDef))
++        if (ContainsOpaque<IsSamplerFunc>(pType.userDef))
+         {
+             std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
+             reasonStream << reason << " (structure contains a sampler)";
+@@ -3900,12 +3912,9 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
+     {
+         TField *field    = (*fieldList)[memberIndex];
+         TType *fieldType = field->type();
+-        if (IsOpaqueType(fieldType->getBasicType()))
++        if (ContainsOpaque<IsOpaqueFunc>(*fieldType))
+         {
+-            std::string reason("unsupported type - ");
+-            reason += fieldType->getBasicString();
+-            reason += " types are not allowed in interface blocks";
+-            error(field->line(), reason.c_str(), fieldType->getBasicString());
++            error(field->line(), "Opaque types are not allowed in interface blocks", blockName);
+         }
+ 
+         const TQualifier qualifier = fieldType->getQualifier();
+From 2c61d151bd3fab48c7e03a4cbfca22fa09c9022c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
+Date: Thu, 14 Mar 2024 12:48:18 +0000
+Subject: [PATCH] [Backport] CVE-2024-3839: Out of bounds read in Fonts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5361874:
+Disable STAT sanitization/checks through OTS
+
+Due to issues in upstream, OTS STAT sanitization does not provide an
+added security benefit. Pass-through the STAT table.
+
+Bug: chromium:41491859
+Change-Id: I19dcd87376af553afe242452396b951a74691f3c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5361874
+Commit-Queue: Dominik Röttsches <drott@chromium.org>
+Reviewed-by: Koji Ishii <kojii@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1272710}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560661
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ .../blink/renderer/platform/fonts/web_font_decoder.cc           | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chromium/third_party/blink/renderer/platform/fonts/web_font_decoder.cc b/chromium/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
+index e72f801016a3..dfae30c22c22 100644
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/web_font_decoder.cc
+@@ -97,6 +97,7 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+   const uint32_t kCpalTag = OTS_TAG('C', 'P', 'A', 'L');
+   const uint32_t kCff2Tag = OTS_TAG('C', 'F', 'F', '2');
+   const uint32_t kSbixTag = OTS_TAG('s', 'b', 'i', 'x');
++  const uint32_t kStatTag = OTS_TAG('S', 'T', 'A', 'T');
+ #if HB_VERSION_ATLEAST(1, 0, 0)
+   const uint32_t kGdefTag = OTS_TAG('G', 'D', 'E', 'F');
+   const uint32_t kGposTag = OTS_TAG('G', 'P', 'O', 'S');
+@@ -123,6 +124,7 @@ ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag) {
+     case kCpalTag:
+     case kCff2Tag:
+     case kSbixTag:
++    case kStatTag:
+ #if HB_VERSION_ATLEAST(1, 0, 0)
+     // Let HarfBuzz handle how to deal with broken tables.
+     case kAvarTag:
+From 0594d0383b46e78d33fde62258ffb49b53d3c429 Mon Sep 17 00:00:00 2001
+From: Liza Burakova <liza@chromium.org>
+Date: Wed, 21 Feb 2024 19:02:15 +0000
+Subject: [PATCH] [Backport] CVE-2024-3837: Use after free in QUIC
+
+Manual cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5268864:
+Check if session is going away in Handle::RequestStream.
+
+This CL adds an extra check in the QuicChromiumClientSession
+handle's RequestSession to make sure the session is not
+marked as going away before creating a new StreamRequest.
+
+Bug: 41491379
+Change-Id: I687dfc23131871cdba345d3cf78dbbbd2e619ce9
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5268864
+Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
+Commit-Queue: Liza Burakova <liza@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1263483}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560662
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ chromium/net/quic/quic_chromium_client_session.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/chromium/net/quic/quic_chromium_client_session.cc b/chromium/net/quic/quic_chromium_client_session.cc
+index 6e08826bbb0d..4bca38bd10db 100644
+--- src/3rdparty/chromium/net/quic/quic_chromium_client_session.cc
++++ src/3rdparty/chromium/net/quic/quic_chromium_client_session.cc
+@@ -500,7 +500,8 @@ int QuicChromiumClientSession::Handle::RequestStream(
+     const NetworkTrafficAnnotationTag& traffic_annotation) {
+   DCHECK(!stream_request_);
+ 
+-  if (!session_)
++  // TODO(crbug.com/41491379): Add a regression test.
++  if (!session_ || session_->going_away_)
+     return ERR_CONNECTION_CLOSED;
+ 
+   requires_confirmation |= session_->gquic_zero_rtt_disabled();
+From 28c3af39d3bdaea88865f901d19862bf7d44199d Mon Sep 17 00:00:00 2001
+From: Pete Williamson <petewil@chromium.org>
+Date: Tue, 27 Feb 2024 00:19:05 +0000
+Subject: [PATCH] [Backport] Security bug 40940917
+
+Cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5293726:
+Fix misalligned address in hunspell::NodeReader::ReaderForLookupAt
+
+With the Hunspell spell checking library, we are using a custom wrapper
+to read the dictionaries from files.  In that custom wrapper, we were
+reading by using reinterpret_cast to interpret an offset into a pointer,
+and then reading the bytes at that pointer for the child_offset.
+
+The spell checking code appears to have been working properly in the
+field.  However, the current code caused fuzzing test failures, and
+those failures are blocking other tests, so we need to fix this to
+unblock other tests.
+
+It turns out that we were casting a value to a pointer that did not
+have proper alignment (for instance, a pointer to a 32 bit int needs
+to be 4 byte allinged, but this pointer was not). While it has often
+worked in older compilers, it turns out this is undefined behavior.
+
+Instead of relying on undefined behavior, the right thing to do is to
+use std::memcpy to copy the bytes from the misalligned address into
+their final destination (either an int32 or an int16 in this case).
+
+Bug: 40940917
+Change-Id: I8aeba9ee8000b51e98863813235d8dceb1c41ceb
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5293726
+Commit-Queue: Peter Williamson <petewil@chromium.org>
+Reviewed-by: Trevor Perrier <perrier@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1265552}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560663
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ .../hunspell/google/bdict_reader.cc           | 27 ++++++++++++++-----
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/chromium/third_party/hunspell/google/bdict_reader.cc b/chromium/third_party/hunspell/google/bdict_reader.cc
+index 70416a7c9048..70e4d4977ad5 100644
+--- src/3rdparty/chromium/third_party/hunspell/google/bdict_reader.cc
++++ src/3rdparty/chromium/third_party/hunspell/google/bdict_reader.cc
+@@ -5,6 +5,8 @@
+ #include "third_party/hunspell/google/bdict_reader.h"
+ 
+ #include <stdint.h>
++#include <cstdint>
++#include <cstring>
+ 
+ #include "base/check.h"
+ 
+@@ -413,19 +415,32 @@ NodeReader::FindResult NodeReader::ReaderForLookupAt(
+   if (index >= static_cast<size_t>(lookup_num_chars()) || !is_valid_)
+     return FIND_DONE;
+ 
+-  size_t child_offset;
++  size_t child_offset = 0;
+   if (is_lookup_32()) {
+     // Table contains 32-bit absolute offsets.
+-    child_offset =
+-        reinterpret_cast<const unsigned int*>(table_begin)[index];
++
++    // We need to use memcpy here instead of just casting the offset into a
++    // pointer to an int because the cast can cause undefined behavior if
++    // the pointer is not alligned, and in this case it is not.
++    int byte_offset = index * sizeof(uint32_t);
++    std::memcpy(&child_offset,
++                reinterpret_cast<const void*>(table_begin + byte_offset),
++                sizeof(uint32_t));
+     if (!child_offset)
+       return FIND_NOTHING;  // This entry in the table is empty.
+   } else {
+     // Table contains 16-bit offsets relative to the current node.
+-    child_offset =
+-        reinterpret_cast<const unsigned short*>(table_begin)[index];
+-    if (!child_offset)
++
++    // We need to use memcpy here instead of just casting the offset into a
++    // pointer to an int because the cast can cause undefined behavior if
++    // the pointer is not alligned, and in this case it is not.
++    int byte_offset = index * sizeof(uint16_t);
++    std::memcpy(&child_offset,
++                reinterpret_cast<const void*>(table_begin + byte_offset),
++                sizeof(uint16_t));
++    if (!child_offset) {
+       return FIND_NOTHING;  // This entry in the table is empty.
++    }
+     child_offset += node_offset_;
+   }
+ 
+From b4d43a76e4c334084400402c09620ef24870704e Mon Sep 17 00:00:00 2001
+From: Shahbaz Youssefi <syoussefi@chromium.org>
+Date: Mon, 8 Apr 2024 10:14:45 -0400
+Subject: [PATCH] [Backport] CVE-2024-4058: Type Confusion in ANGLE
+
+Partial manual cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/angle/angle/+/5466390:
+SPIR-V: Fix const constructors with single scalar
+
+These constructors may be generated because of
+RemoveArrayLengthTraverser.
+
+Bug: chromium:332546345
+Change-Id: I2b2bf3728ef5bae148abc2a8518f8f3f42850025
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5462388
+(cherry picked from commit 0b776d32f69a932acb61963d9daad9e13f610944)
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5466390
+Commit-Queue: Zakhar Voit <voit@google.com>
+Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
+Reviewed-by: Geoff Lang <geofflang@chromium.org>
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560664
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ .../third_party/angle/src/compiler/translator/Compiler.cpp   | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/chromium/third_party/angle/src/compiler/translator/Compiler.cpp b/chromium/third_party/angle/src/compiler/translator/Compiler.cpp
+index 27975887086a..435d3b41b3a3 100644
+--- src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp
++++ src/3rdparty/chromium/third_party/angle/src/compiler/translator/Compiler.cpp
+@@ -757,6 +757,11 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
+     {
+         return false;
+     }
++    // Fold the expressions again, because |RemoveArrayLengthMethod| can introduce new constants.
++    if (!FoldExpressions(this, root, &mDiagnostics))
++    {
++        return false;
++    }
+ 
+     if (!RemoveUnreferencedVariables(this, root, &mSymbolTable))
+     {
+From dceba69334080559303f92fc4a6c6d01e7dcd00c Mon Sep 17 00:00:00 2001
+From: Brendon Tiszka <tiszka@chromium.org>
+Date: Sun, 3 Mar 2024 21:30:59 +0100
+Subject: [PATCH] [Backport] Security bug 327698060
+
+Manual cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5337387:
+PaintOpReader: Harden PaintImage deserialization
+
+Add missing validity check after `Read`
+
+Bug: 327698060
+Change-Id: I0aa5120296009998af3235a01304a1f597a82a33
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5337387
+Commit-Queue: Khushal Sagar <khushalsagar@chromium.org>
+Reviewed-by: Khushal Sagar <khushalsagar@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1267636}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560665
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/cc/paint/paint_op_reader.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/chromium/cc/paint/paint_op_reader.cc b/chromium/cc/paint/paint_op_reader.cc
+index 0979f6630175..b6a9d8ca3641 100644
+--- src/3rdparty/chromium/cc/paint/paint_op_reader.cc
++++ src/3rdparty/chromium/cc/paint/paint_op_reader.cc
+@@ -309,6 +309,10 @@ void PaintOpReader::Read(PaintImage* image) {
+       case PaintOp::SerializedImageType::kImageData: {
+         SkColorType color_type;
+         Read(&color_type);
++        if (!valid_) {
++          return;
++        }
++
+         uint32_t width;
+         Read(&width);
+         uint32_t height;
+From 2b188075ed5f01cc9c09b5273b5e6177d7252a0e Mon Sep 17 00:00:00 2001
+From: Geoff Lang <geofflang@chromium.org>
+Date: Mon, 29 Apr 2024 15:27:36 -0400
+Subject: [PATCH] [Backport] CVE-2024-4558: Use after free in ANGLE
+
+Manual cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/angle/angle/+/5498735:
+GL: Sync unpack state for glCompressedTexSubImage3D
+
+Unpack state is supposed to be ignored for compressed tex image calls
+but some drivers use it anyways and read incorrect data.
+
+Texture3DTestES3.PixelUnpackStateTexSubImage covers this case.
+
+Bug: chromium:337766133
+Change-Id: Ic11a056113b1850bd5b4d6840527164a12849a22
+Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5498735
+Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
+
+Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
+Change-Id: I0736ceb1e3165f571358ae06a0287b3f5a98d425
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/560666
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+---
+ .../third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp     | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp
+index 035d4520b13b..0cfd21621bb3 100644
+--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp
++++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.cpp
+@@ -579,6 +579,7 @@ angle::Result TextureGL::setCompressedSubImage(const gl::Context *context,
+         nativegl::GetCompressedSubTexImageFormat(functions, features, format);
+ 
+     stateManager->bindTexture(getType(), mTextureID);
++    ANGLE_TRY(stateManager->setPixelUnpackState(context, unpack));
+     if (nativegl::UseTexImage2D(getType()))
+     {
+         ASSERT(area.z == 0 && area.depth == 1);
+From d553c9366aedad5701852427f8e1910381c4ff8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marja=20H=C3=B6ltt=C3=A4?= <marja@google.com>
+Date: Tue, 26 Mar 2024 13:53:21 +0000
+Subject: [PATCH] [Backport] CVE-2024-3914: Use after free in V8 (1/2)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Manual backport of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5387887:
+[M120-LTS] Fix DOMArrayBuffer::IsDetached()
+
+M120 merge issues:
+  third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc:
+    - Conflicting types for variable worlds
+    - Conflicting AllWorldsInIsolate() call (M120 doesn't use the last argument)
+
+A DOMArrayBuffer was maintaining its own "is_detached_" state, and
+would consider itself non-detached even if the corresponding
+JSArrayBuffer (or, all of them, in case there are several) was
+detached.
+
+Piping in the v8::Isolate would be a too big change for this fix, so this is using v8::Isolate::GetCurrent() for now.
+
+Bug: 330759272
+Change-Id: I1e98ebd2066d2e59658db12f1bb419b6ebc1d706
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5387887
+Commit-Queue: Marja Hölttä <marja@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1278283}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/562706
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../core/typed_arrays/dom_array_buffer.cc     | 50 +++++++++++++++++++
+ .../core/typed_arrays/dom_array_buffer.h      | 13 +++++
+ .../core/typed_arrays/dom_array_buffer_base.h |  2 +-
+ 3 files changed, 64 insertions(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc b/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
+index c456d15f2f50..38dcd3a35737 100644
+--- src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
++++ src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
+@@ -18,6 +18,15 @@ static void AccumulateArrayBuffersForAllWorlds(
+     v8::Isolate* isolate,
+     DOMArrayBuffer* object,
+     Vector<v8::Local<v8::ArrayBuffer>, 4>& buffers) {
++  if (!object->has_non_main_world_wrappers() && IsMainThread()) {
++    const DOMWrapperWorld& world = DOMWrapperWorld::MainWorld();
++    v8::Local<v8::Object> wrapper = world.DomDataStore().Get(object, isolate);
++    if (!wrapper.IsEmpty()) {
++      buffers.push_back(v8::Local<v8::ArrayBuffer>::Cast(wrapper));
++    }
++    return;
++  }
++
+   Vector<scoped_refptr<DOMWrapperWorld>> worlds;
+   DOMWrapperWorld::AllWorldsInCurrentThread(worlds);
+   for (const auto& world : worlds) {
+@@ -155,6 +164,47 @@ DOMArrayBuffer* DOMArrayBuffer::Create(
+   return Create(std::move(contents));
+ }
+ 
++bool DOMArrayBuffer::IsDetached() const {
++  if (contents_.BackingStore() == nullptr) {
++    return is_detached_;
++  }
++  if (is_detached_) {
++    return true;
++  }
++
++  v8::Isolate* isolate = v8::Isolate::GetCurrent();
++  v8::HandleScope handle_scope(isolate);
++  Vector<v8::Local<v8::ArrayBuffer>, 4> buffer_handles;
++  AccumulateArrayBuffersForAllWorlds(isolate, const_cast<DOMArrayBuffer*>(this),  buffer_handles);
++
++  // There may be several v8::ArrayBuffers corresponding to the DOMArrayBuffer,
++  // but at most one of them may be non-detached.
++  int nondetached_count = 0;
++  int detached_count = 0;
++
++  for (const auto& buffer_handle : buffer_handles) {
++    if (buffer_handle->WasDetached()) {
++      ++detached_count;
++    } else {
++      ++nondetached_count;
++    }
++  }
++  CHECK_LE(nondetached_count, 1);
++
++  return nondetached_count == 0 && detached_count > 0;
++}
++
++v8::Local<v8::Object> DOMArrayBuffer::AssociateWithWrapper(
++    v8::Isolate* isolate,
++    const WrapperTypeInfo* wrapper_type_info,
++    v8::Local<v8::Object> wrapper) {
++  if (!DOMWrapperWorld::Current(isolate).IsMainWorld()) {
++    has_non_main_world_wrappers_ = true;
++  }
++  return ScriptWrappable::AssociateWithWrapper(isolate, wrapper_type_info,
++                                               wrapper);
++}
++
+ DOMArrayBuffer* DOMArrayBuffer::Slice(size_t begin, size_t end) const {
+   begin = std::min(begin, ByteLengthAsSizeT());
+   end = std::min(end, ByteLengthAsSizeT());
+diff --git a/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h b/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h
+index e9a85d38d4d4..b1820dfa8408 100644
+--- src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h
++++ src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h
+@@ -79,8 +79,21 @@ class CORE_EXPORT DOMArrayBuffer final : public DOMArrayBufferBase {
+   v8::Local<v8::Value> Wrap(v8::Isolate*,
+                             v8::Local<v8::Object> creation_context) override;
+ 
++  bool IsDetached() const override;
++
++  v8::Local<v8::Object> AssociateWithWrapper(
++      v8::Isolate* isolate,
++      const WrapperTypeInfo* wrapper_type_info,
++      v8::Local<v8::Object> wrapper) override;
++
++  bool has_non_main_world_wrappers() const {
++    return has_non_main_world_wrappers_;
++  }
++
+  private:
+   bool TransferDetachable(v8::Isolate*, ArrayBufferContents& result);
++
++  bool has_non_main_world_wrappers_ = false;
+ };
+ 
+ }  // namespace blink
+diff --git a/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h b/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h
+index e99cce60dd7f..3ae9a4360e85 100644
+--- src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h
++++ src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer_base.h
+@@ -33,7 +33,7 @@ class CORE_EXPORT DOMArrayBufferBase : public ScriptWrappable {
+     return base::checked_cast<unsigned>(contents_.DataLength());
+   }
+ 
+-  bool IsDetached() const { return is_detached_; }
++  virtual bool IsDetached() const { return is_detached_; }
+ 
+   void Detach() { is_detached_ = true; }
+ 
+From efda8125f55049957e196995dffafb6dc171eadf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marja=20H=C3=B6ltt=C3=A4?= <marja@google.com>
+Date: Thu, 4 Apr 2024 09:43:42 +0200
+Subject: [PATCH] [Backport] CVE-2024-3914: Use after free in V8 (2/2)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Manual cherry-pick of patch originally reviewed on
+https://chromium-review.googlesource.com/c/chromium/src/+/5419329:
+[M120-LTS] Comment out a CHECK that a DOMAB has maximally one non-detached JSAB
+
+Based on crash reports, this assumption is not true and has to be
+investigated.
+
+Removing this newly introduced CHECK to be able to merge fixes in this
+area - we still violate this invariant but the fixes are a step into
+the right direction.
+
+Fix in question:
+https://chromium-review.googlesource.com/5387887
+which also introduced this CHECK.
+
+Bug: 330759272
+Change-Id: I4ba52fee7ed8f45e352efd347e87df03d896ac3d
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5419329
+Commit-Queue: Marja Hölttä <marja@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1282379}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/562707
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../blink/renderer/core/typed_arrays/dom_array_buffer.cc    | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc b/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
+index 38dcd3a3573..69e332272dd 100644
+--- src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
++++ src/3rdparty/chromium/third_party/blink/renderer/core/typed_arrays/dom_array_buffer.cc
+@@ -189,7 +189,11 @@ bool DOMArrayBuffer::IsDetached() const {
+       ++nondetached_count;
+     }
+   }
+-  CHECK_LE(nondetached_count, 1);
++  // This CHECK fires even though it should not. TODO(330759272): Investigate
++  // under which conditions we end up with multiple non-detached JSABs for the
++  // same DOMAB and potentially restore this check.
++
++  // CHECK_LE(nondetached_count, 1);
+ 
+   return nondetached_count == 0 && detached_count > 0;
+ }
+From 91b3c705d739f6b6c58da6133e8e818e06dfcaa3 Mon Sep 17 00:00:00 2001
+From: Victor Gomes <victorgomes@chromium.org>
+Date: Thu, 21 Mar 2024 09:59:19 +0100
+Subject: [PATCH] [Backport] Security bug 329699609
+
+Manual backport of patch originally reviewed on
+https://chromium-review.googlesource.com/c/v8/v8/+/5378286:
+Deal with large strings in NoSideEffectsErrorToString
+
+If name is too big, StringBuilder will fail to even add
+"<a very large string>" suffix.
+
+In this case, we truncate name first.
+
+Bug: 329699609
+Change-Id: I6e4440c07eae84371f44b54f88127e2c70af0db5
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5378286
+Commit-Queue: Victor Gomes <victorgomes@chromium.org>
+Reviewed-by: Patrick Thier <pthier@chromium.org>
+Auto-Submit: Victor Gomes <victorgomes@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#92932}
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/562708
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ chromium/v8/src/objects/objects.cc | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/chromium/v8/src/objects/objects.cc b/chromium/v8/src/objects/objects.cc
+index 7b38609e347..7820c7e8e58 100644
+--- src/3rdparty/chromium/v8/src/objects/objects.cc
++++ src/3rdparty/chromium/v8/src/objects/objects.cc
+@@ -425,14 +425,27 @@ Handle<String> NoSideEffectsErrorToString(Isolate* isolate,
+   if (name_str->length() == 0) return msg_str;
+   if (msg_str->length() == 0) return name_str;
+ 
+-  IncrementalStringBuilder builder(isolate);
+-  builder.AppendString(name_str);
+-  builder.AppendCString(": ");
++  constexpr const char error_suffix[] = "<a very large string>";
++  constexpr int error_suffix_size = sizeof(error_suffix);
++  int suffix_size = std::min(error_suffix_size, msg_str->length());
+ 
+-  if (builder.Length() + msg_str->length() <= String::kMaxLength) {
+-    builder.AppendString(msg_str);
++  IncrementalStringBuilder builder(isolate);
++  if (name_str->length() + suffix_size + 2 /* ": " */ > String::kMaxLength) {
++    constexpr const char connector[] = "... : ";
++    int connector_size = sizeof(connector);
++    Handle<String> truncated_name = isolate->factory()->NewProperSubString(
++        name_str, 0, name_str->length() - error_suffix_size - connector_size);
++    builder.AppendString(truncated_name);
++    builder.AppendCString(connector);
++    builder.AppendCString(error_suffix);
+   } else {
+-    builder.AppendCString("<a very large string>");
++    builder.AppendString(name_str);
++    builder.AppendCString(": ");
++    if (builder.Length() + msg_str->length() <= String::kMaxLength) {
++      builder.AppendString(msg_str);
++    } else {
++      builder.AppendCString(error_suffix);
++    }
+   }
+ 
+   return builder.Finish().ToHandleChecked();
+From d3cb500c1d4b0508f3f21bb568c095984c614fcf Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <jhale@FreeBSD.org>
+Date: Thu, 20 Jun 2024 23:42:33 -0400
+Subject: [PATCH] [Backport] Fixup CVE-2024-3914: Use after free in V8 (1/2)
+
+Manual backport of requisite method WasDetached() in V8.
+---
+ chromium/v8/include/v8.h   | 8 ++++++++
+ chromium/v8/src/api/api.cc | 4 ++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/chromium/v8/include/v8.h b/chromium/v8/include/v8.h
+index 32687d90b5f..8a1b437bb06 100644
+--- src/3rdparty/chromium/v8/include/v8.h
++++ src/3rdparty/chromium/v8/include/v8.h
+@@ -5299,6 +5299,11 @@ class V8_EXPORT ArrayBuffer : public Object {
+    */
+   bool IsDetachable() const;
+ 
++  /**
++   * Returns true if this ArrayBuffer has been detached.
++   */
++  bool WasDetached() const;
++
+   /**
+    * Detaches this ArrayBuffer and all its views (typed arrays).
+    * Detaching sets the byte length of the buffer and all typed arrays to zero,
+@@ -5349,6 +5354,9 @@ class V8_EXPORT ArrayBuffer : public Object {
+    * should not attempt to manage lifetime of the storage through other means.
+    *
+    * This function replaces both Externalize() and GetContents().
++   *
++   * The returned shared pointer will not be empty, even if the ArrayBuffer has
++   * been detached. Use |WasDetached| to tell if it has been detached instead.
+    */
+   std::shared_ptr<BackingStore> GetBackingStore();
+ 
+diff --git a/chromium/v8/src/api/api.cc b/chromium/v8/src/api/api.cc
+index b6f9d12769e..05d31a7cedf 100644
+--- src/3rdparty/chromium/v8/src/api/api.cc
++++ src/3rdparty/chromium/v8/src/api/api.cc
+@@ -7386,6 +7386,10 @@ bool v8::ArrayBuffer::IsDetachable() const {
+   return Utils::OpenHandle(this)->is_detachable();
+ }
+ 
++bool v8::ArrayBuffer::WasDetached() const {
++  return Utils::OpenHandle(this)->was_detached();
++}
++
+ namespace {
+ // The backing store deleter just deletes the indirection, which downrefs
+ // the shared pointer. It will get collected normally.
diff --git a/www/qt5-webglplugin/distinfo b/www/qt5-webglplugin/distinfo
index 7b47917a2f61..ea3c6c341b0b 100644
--- a/www/qt5-webglplugin/distinfo
+++ b/www/qt5-webglplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771163
-SHA256 (KDE/Qt/5.15.13/kde-qtwebglplugin-5.15.13p0.tar.xz) = e32e5eace4cb521fe175b137ff7cdef7e9fe5375a180923c24617740dbf89e8b
-SIZE (KDE/Qt/5.15.13/kde-qtwebglplugin-5.15.13p0.tar.xz) = 53664
+TIMESTAMP = 1716930666
+SHA256 (KDE/Qt/5.15.14/kde-qtwebglplugin-5.15.14p0.tar.xz) = 7841f23d11bb65a846b616c9ef9d750abaf84b13e76ad304c3b5977d9077fd8f
+SIZE (KDE/Qt/5.15.14/kde-qtwebglplugin-5.15.14p0.tar.xz) = 53656
diff --git a/www/qt5-websockets-qml/distinfo b/www/qt5-websockets-qml/distinfo
index af1a0d120818..109223bf1205 100644
--- a/www/qt5-websockets-qml/distinfo
+++ b/www/qt5-websockets-qml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771164
-SHA256 (KDE/Qt/5.15.13/kde-qtwebsockets-5.15.13p2.tar.xz) = 9bbb2a1b028831875bf657e4afefd549ac4d4b8fdf36b843848454c1bb7493b9
-SIZE (KDE/Qt/5.15.13/kde-qtwebsockets-5.15.13p2.tar.xz) = 237296
+TIMESTAMP = 1716930666
+SHA256 (KDE/Qt/5.15.14/kde-qtwebsockets-5.15.14p2.tar.xz) = 6019c1c321bc680cdd1932fb82d6b1178e72f919008ab423c3fbf900192b2f4f
+SIZE (KDE/Qt/5.15.14/kde-qtwebsockets-5.15.14p2.tar.xz) = 237208
diff --git a/www/qt5-websockets/distinfo b/www/qt5-websockets/distinfo
index 4c17249a280f..d7e5e98b2537 100644
--- a/www/qt5-websockets/distinfo
+++ b/www/qt5-websockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771166
-SHA256 (KDE/Qt/5.15.13/kde-qtwebsockets-5.15.13p2.tar.xz) = 9bbb2a1b028831875bf657e4afefd549ac4d4b8fdf36b843848454c1bb7493b9
-SIZE (KDE/Qt/5.15.13/kde-qtwebsockets-5.15.13p2.tar.xz) = 237296
+TIMESTAMP = 1716930667
+SHA256 (KDE/Qt/5.15.14/kde-qtwebsockets-5.15.14p2.tar.xz) = 6019c1c321bc680cdd1932fb82d6b1178e72f919008ab423c3fbf900192b2f4f
+SIZE (KDE/Qt/5.15.14/kde-qtwebsockets-5.15.14p2.tar.xz) = 237208
diff --git a/www/qt5-webview/distinfo b/www/qt5-webview/distinfo
index 54ab4499f0fe..a59b765d5050 100644
--- a/www/qt5-webview/distinfo
+++ b/www/qt5-webview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771167
-SHA256 (KDE/Qt/5.15.13/kde-qtwebview-5.15.13p0.tar.xz) = b7ca9d2f392ec7ff8aeab4323f12fc9f459d0221a2ca8edbf4df93fb3bbd452d
-SIZE (KDE/Qt/5.15.13/kde-qtwebview-5.15.13p0.tar.xz) = 112548
+TIMESTAMP = 1716930668
+SHA256 (KDE/Qt/5.15.14/kde-qtwebview-5.15.14p0.tar.xz) = f9a29b363e0053bb411d991ad5722942822a760eb23dbc6987f740250c0fdf1f
+SIZE (KDE/Qt/5.15.14/kde-qtwebview-5.15.14p0.tar.xz) = 112816
diff --git a/www/qt6-httpserver/distinfo b/www/qt6-httpserver/distinfo
index f14fe9dc69fc..2ba48048db99 100644
--- a/www/qt6-httpserver/distinfo
+++ b/www/qt6-httpserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663494
-SHA256 (KDE/Qt/6.6.3/qthttpserver-everywhere-src-6.6.3.tar.xz) = 41ac78d745d00eef1c3866dda5119d3649a64fa08d44d72d89b83aeecde87835
-SIZE (KDE/Qt/6.6.3/qthttpserver-everywhere-src-6.6.3.tar.xz) = 162228
+TIMESTAMP = 1718779145
+SHA256 (KDE/Qt/6.7.2/qthttpserver-everywhere-src-6.7.2.tar.xz) = 0353b9b4f98a83fec8f15046d4ff9d6ef7c874dcbb3664092fe2508f40778b86
+SIZE (KDE/Qt/6.7.2/qthttpserver-everywhere-src-6.7.2.tar.xz) = 163640
diff --git a/www/qt6-webchannel/distinfo b/www/qt6-webchannel/distinfo
index f0fb96133280..273e146dcbb5 100644
--- a/www/qt6-webchannel/distinfo
+++ b/www/qt6-webchannel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711663498
-SHA256 (KDE/Qt/6.6.3/qtwebchannel-everywhere-src-6.6.3.tar.xz) = 7c7b2ae5d1b496f76a7ece3ac5728a8d209af4ac7853207dbc01a4982f718c33
-SIZE (KDE/Qt/6.6.3/qtwebchannel-everywhere-src-6.6.3.tar.xz) = 206396
+TIMESTAMP = 1718779146
+SHA256 (KDE/Qt/6.7.2/qtwebchannel-everywhere-src-6.7.2.tar.xz) = ac5d96607b10e7de546eaf93bb9f65c0fd631ef9b91ef8a794e26fd57db4501c
+SIZE (KDE/Qt/6.7.2/qtwebchannel-everywhere-src-6.7.2.tar.xz) = 206584
diff --git a/www/qt6-webengine/Makefile b/www/qt6-webengine/Makefile
index e78bd490a6a5..b6f2d157f127 100644
--- a/www/qt6-webengine/Makefile
+++ b/www/qt6-webengine/Makefile
@@ -101,10 +101,11 @@ DO_MAKE_BUILD=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} -j1 $
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .if !defined(BUILD_QTPDF)
-OPTIONS_DEFINE=		CUPS
-OPTIONS_DEFAULT=	ALSA CUPS
+OPTIONS_DEFINE=		CUPS DRIVER
+OPTIONS_DEFAULT=	ALSA CUPS DRIVER
 OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
+OPTIONS_SUB=		yes
 
 AUDIO_DESC=		Audio backend
 
@@ -122,6 +123,10 @@ CUPS_LIB_DEPENDS=	libcups.so:print/cups \
 CUPS_CMAKE_ON=		-DQT_FEATURE_webengine_printing_and_pdf:BOOL=ON
 CUPS_CMAKE_OFF=		-DQT_FEATURE_webengine_printing_and_pdf:BOOL=OFF
 
+DRIVER_DESC=		Install WebEngineDriver
+DRIVER_CMAKE_ON=	-DQT_FEATURE_webenginedriver:BOOL=ON
+DRIVER_CMAKE_OFF=	-DQT_FEATURE_webenginedriver:BOOL=OFF
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DQT_FEATURE_webengine_system_pulseaudio:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DQT_FEATURE_webengine_system_pulseaudio:BOOL=OFF
@@ -165,4 +170,15 @@ pre-configure:
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		${SYS_LIBS} || ${FALSE}
 
+.if !defined(BUILD_QTPDF)
+post-install:
+# Fix for deskutils/calibre, perhaps others, where this empty directory
+# is created during build causing a fs-violation.
+	${MKDIR} ${STAGEDIR}${QT_DATADIR}/resources/locales
+
+post-install-DRIVER-on:
+	${STRIP_CMD} ${STAGEDIR}${QT_TOOLDIR}/webenginedriver
+
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/www/qt6-webengine/distinfo b/www/qt6-webengine/distinfo
index f963466e7f5c..b305cc7a5af0 100644
--- a/www/qt6-webengine/distinfo
+++ b/www/qt6-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664649
-SHA256 (KDE/Qt/6.6.3/qtwebengine-everywhere-src-6.6.3.tar.xz) = 7c2bdc83b21b82a179a7bf098df47ebf66ba7693d67ebda55a4a28d9eadad804
-SIZE (KDE/Qt/6.6.3/qtwebengine-everywhere-src-6.6.3.tar.xz) = 421076320
+TIMESTAMP = 1718779149
+SHA256 (KDE/Qt/6.7.2/qtwebengine-everywhere-src-6.7.2.tar.xz) = c7755875594d8be382b07bf3634d44fd77012805794d8b588891709a6405ffd1
+SIZE (KDE/Qt/6.7.2/qtwebengine-everywhere-src-6.7.2.tar.xz) = 550888844
diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake
index 7dcc0eee40f7..e4c938996ef3 100644
--- a/www/qt6-webengine/files/patch-cmake_Functions.cmake
+++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake
@@ -1,4 +1,4 @@
---- cmake/Functions.cmake.orig	2024-02-10 00:23:21 UTC
+--- cmake/Functions.cmake.orig	2024-02-10 00:27:53 UTC
 +++ cmake/Functions.cmake
 @@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt
      set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp")
@@ -9,7 +9,7 @@
           get_gn_arch(cpu ${TEST_architecture_arch})
           if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug")
               target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt")
-@@ -673,6 +673,8 @@ function(get_gn_os result)
+@@ -675,6 +675,8 @@ function(get_gn_os result)
          set(${result} "mac" PARENT_SCOPE)
      elseif(IOS)
          set(${result} "ios" PARENT_SCOPE)
@@ -18,7 +18,7 @@
      else()
          message(DEBUG "Unrecognized OS")
      endif()
-@@ -865,7 +867,7 @@ macro(append_build_type_setup)
+@@ -878,7 +880,7 @@ macro(append_build_type_setup)
  
      extend_gn_list(gnArgArg
          ARGS enable_precompiled_headers
@@ -27,7 +27,7 @@
      )
      extend_gn_list(gnArgArg
          ARGS dcheck_always_on
-@@ -917,7 +919,7 @@ macro(append_compiler_linker_sdk_setup)
+@@ -932,7 +934,7 @@ macro(append_compiler_linker_sdk_setup)
                  use_libcxx=true
              )
          endif()
@@ -36,7 +36,7 @@
              extend_gn_list(gnArgArg ARGS use_libcxx
                  CONDITION QT_FEATURE_stdlib_libcpp
              )
-@@ -955,7 +957,7 @@ macro(append_compiler_linker_sdk_setup)
+@@ -970,7 +972,7 @@ macro(append_compiler_linker_sdk_setup)
          )
      endif()
      get_gn_arch(cpu ${TEST_architecture_arch})
@@ -45,7 +45,7 @@
  
          extend_gn_list_cflag(gnArgArg
              ARG arm_tune
-@@ -1040,7 +1042,7 @@ macro(append_toolchain_setup)
+@@ -1060,7 +1062,7 @@ macro(append_toolchain_setup)
                  host_cpu="${cpu}"
              )
          endif()
@@ -54,16 +54,7 @@
          get_gn_arch(cpu ${TEST_architecture_arch})
          list(APPEND gnArgArg
              custom_toolchain="${buildDir}/target_toolchain:target"
-@@ -1073,7 +1075,7 @@ macro(append_pkg_config_setup)
- 
- 
- macro(append_pkg_config_setup)
--    if(LINUX)
-+    if(LINUX OR FREEBSD)
-         list(APPEND gnArgArg
-             pkg_config="${PKG_CONFIG_EXECUTABLE}"
-             host_pkg_config="${PKG_CONFIG_HOST_EXECUTABLE}"
-@@ -1166,6 +1168,20 @@ function(add_gn_build_artifacts_to_target)
+@@ -1198,6 +1200,20 @@ function(add_gn_build_artifacts_to_target)
              set_target_properties(${arg_CMAKE_TARGET} PROPERTIES
                  LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP}
              )
@@ -84,7 +75,7 @@
              if(QT_IS_MACOS_UNIVERSAL)
                  add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC})
              elseif(IOS)
-@@ -1283,7 +1299,7 @@ function(check_for_ulimit)
+@@ -1313,7 +1329,7 @@ function(check_for_ulimit)
  
  function(check_for_ulimit)
      message("-- Checking 'ulimit -n'")
@@ -93,7 +84,7 @@
          OUTPUT_VARIABLE ulimitOutput
      )
      string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}")
-@@ -1292,7 +1308,7 @@ function(check_for_ulimit)
+@@ -1322,7 +1338,7 @@ function(check_for_ulimit)
          if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0")
              message(" -- Creating linker launcher")
              file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh
diff --git a/www/qt6-webengine/files/patch-configure.cmake b/www/qt6-webengine/files/patch-configure.cmake
index ff2e426fbc47..7fdd8b60d800 100644
--- a/www/qt6-webengine/files/patch-configure.cmake
+++ b/www/qt6-webengine/files/patch-configure.cmake
@@ -1,6 +1,6 @@
---- configure.cmake.orig	2024-02-10 00:23:21 UTC
+--- configure.cmake.orig	2023-12-12 22:08:45 UTC
 +++ configure.cmake
-@@ -67,7 +67,7 @@ endif()
+@@ -68,7 +68,7 @@ endif()
  endif()
  
  #### Tests
@@ -9,7 +9,7 @@
     check_for_ulimit()
  endif()
  
-@@ -427,7 +427,7 @@ qt_feature("webengine-ozone-x11" PRIVATE
+@@ -428,7 +428,7 @@ qt_feature("webengine-ozone-x11" PRIVATE
  
  qt_feature("webengine-ozone-x11" PRIVATE
      LABEL "Support GLX on qpa-xcb"
@@ -18,7 +18,7 @@
          AND TARGET Qt::Gui
          AND QT_FEATURE_xcb
          AND X11_FOUND
-@@ -464,12 +464,12 @@ add_check_for_support(
+@@ -465,12 +465,12 @@ add_check_for_support(
  )
  add_check_for_support(
     MODULES QtWebEngine
@@ -28,9 +28,9 @@
  )
  add_check_for_support(
     MODULES QtPdf
--   CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32)
-+   CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR (ANDROID AND NOT CMAKE_HOST_WIN32) OR FREEBSD
-    MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android(on non-Windows hosts only)."
+-   CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID
++   CONDITION LINUX OR (WIN32 AND NOT WIN_ARM_64) OR MACOS OR IOS OR ANDROID OR FREEBSD
+    MESSAGE "Build can be done only on Linux, Windows, macO, iOS and Android."
  )
  if(LINUX AND CMAKE_CROSSCOMPILING)
 @@ -492,13 +492,6 @@ add_check_for_support(
diff --git a/www/qt6-webengine/files/patch-security-rollup b/www/qt6-webengine/files/patch-security-rollup
deleted file mode 100644
index cc5eefd44e79..000000000000
--- a/www/qt6-webengine/files/patch-security-rollup
+++ /dev/null
@@ -1,58 +0,0 @@
-Add security patches to this file.
-
-Addresses the following security issues:
-
-- CVE-2023-7104
-
-From b8c9622b71d032a48412e342cff91fc0f3f5e3d9 Mon Sep 17 00:00:00 2001
-From: Michal Klocek <michal.klocek@qt.io>
-Date: Tue, 19 Mar 2024 21:20:24 +0100
-Subject: [PATCH] CVE-2023-7104
-
-Fix a buffer overread in the sessions extension
-that could occur when processing a corrupt changeset.
-
-Backported from:
-https://sqlite.org/src/info/0e4e7a05c4204b47
-
-Change-Id: I670960f13234971f48e8837a3935495a0d69a026
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/549500
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-(cherry picked from commit 147f7790602ab5d43bfe19f759074258ca7e975b)
-Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/550068
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- .../sqlite/src/amalgamation/sqlite3.c          | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/chromium/third_party/sqlite/src/amalgamation/sqlite3.c b/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
-index b353aa88348..a0feb5d200c 100644
---- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
-+++ src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -218682,15 +218682,19 @@ static int sessionReadRecord(
-         }
-       }
-       if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
--        sqlite3_int64 v = sessionGetI64(aVal);
--        if( eType==SQLITE_INTEGER ){
--          sqlite3VdbeMemSetInt64(apOut[i], v);
-+        if( (pIn->nData-pIn->iNext)<8 ){
-+          rc = SQLITE_CORRUPT_BKPT;
-         }else{
--          double d;
--          memcpy(&d, &v, 8);
--          sqlite3VdbeMemSetDouble(apOut[i], d);
-+          sqlite3_int64 v = sessionGetI64(aVal);
-+          if( eType==SQLITE_INTEGER ){
-+            sqlite3VdbeMemSetInt64(apOut[i], v);
-+          }else{
-+            double d;
-+            memcpy(&d, &v, 8);
-+            sqlite3VdbeMemSetDouble(apOut[i], d);
-+          }
-+          pIn->iNext += 8;
-         }
--        pIn->iNext += 8;
-       }
-     }
-   }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
index f22c3b6676f2..0f0336991402 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/BUILD.gn
-@@ -61,7 +61,7 @@ declare_args() {
+@@ -62,7 +62,7 @@ declare_args() {
    qtwebengine_target = "//tools/gn"
  }
  
@@ -9,25 +9,58 @@
    # An official (maximally optimized!) component (optimized for build times)
    # build doesn't make sense and usually doesn't work.
    assert(!is_component_build)
-@@ -428,7 +428,7 @@ if (!is_qtwebengine){
+@@ -96,7 +96,6 @@ group("gn_all") {
+       "//codelabs",
+       "//components:components_unittests",
+       "//components/gwp_asan:gwp_asan_unittests",
+-      "//infra/orchestrator:orchestrator_all",
+       "//net:net_unittests",
+       "//sandbox:sandbox_unittests",
+       "//services:services_unittests",
+@@ -418,7 +417,7 @@ group("gn_all") {
+       }
+     }
+ 
+-    if (is_linux || is_chromeos || is_android) {
++    if ((is_linux && !is_bsd) || is_chromeos || is_android) {
+       deps += [
+         "//third_party/breakpad:breakpad_unittests",
+         "//third_party/breakpad:core-2-minidump",
+@@ -618,6 +617,15 @@ group("gn_all") {
+       }
+     }
+ 
++    if (is_bsd) {
++      deps -= [
++        "//third_party/breakpad:dump_syms($host_toolchain)",
++        "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++        "//third_party/breakpad:minidump_dump($host_toolchain)",
++        "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++      ]
++    }
++
+     if (is_mac) {
+       deps += [
+         "//third_party/breakpad:dump_syms",
+@@ -667,7 +675,7 @@ group("gn_all") {
+           host_os == "win") {
+         deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+       }
+-    } else if (!is_android && !is_ios && !is_fuchsia) {
++    } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+       deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
      }
-   }
  
--  if (is_linux || is_chromeos || is_android) {
-+  if ((is_linux && !is_bsd) || is_chromeos || is_android) {
-     deps += [
-       "//third_party/breakpad:breakpad_unittests",
-       "//third_party/breakpad:core-2-minidump",
-@@ -1098,7 +1098,7 @@ if (!is_ios && !is_qtwebengine) {
+@@ -1095,7 +1103,7 @@ if (use_blink && !is_cronet_build) {
      ]
    }
  
 -  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
 +  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
-     # WPT Webdriver tests runner
-     # chrome/test/chromedriver/test/run_webdriver_tests.py
      script_test("webdriver_wpt_tests") {
-@@ -1198,7 +1198,7 @@ if (!is_ios && !is_qtwebengine) {
+       script = "//third_party/blink/tools/run_wpt_tests.py"
+       args = [
+@@ -1185,7 +1193,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
      }
  
@@ -36,7 +69,7 @@
        data_deps +=
            [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
      }
-@@ -1207,7 +1207,7 @@ if (!is_ios && !is_qtwebengine) {
+@@ -1194,7 +1202,7 @@ if (use_blink && !is_cronet_build) {
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
@@ -45,7 +78,7 @@
        data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
      }
  
-@@ -1675,7 +1675,7 @@ group("chromium_builder_perf") {
+@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") {
        data_deps += [ "//chrome/test:performance_browser_tests" ]
      }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn
index 9c2a0f9c2332..07baa903ce0a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/base/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/base/BUILD.gn
-@@ -189,7 +189,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -199,7 +199,7 @@ buildflag_header("ios_cronet_buildflags") {
    flags = [ "CRONET_BUILD=$is_cronet_build" ]
  }
  
@@ -9,24 +9,32 @@
  buildflag_header("message_pump_buildflags") {
    header = "message_pump_buildflags.h"
    header_dir = "base/message_loop"
-@@ -1009,7 +1009,6 @@ jumbo_component("base") {
-       "threading/thread_type_delegate.cc",
-       "threading/thread_type_delegate.h",
-     ]
--    jumbo_excluded_sources += [ "process/memory_linux.cc" ]
+@@ -1117,11 +1117,23 @@ jumbo_component("base") {
+   # Needed for <atomic> if using newer C++ library than sysroot, except if
+   # building inside the cros_sdk environment - use host_toolchain as a
+   # more robust check for this.
+-  if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
++  if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
+       host_toolchain != "//build/toolchain/cros:host") {
+     libs += [ "atomic" ]
    }
  
-   if (is_linux || is_chromeos || is_android || is_fuchsia) {
-@@ -1132,7 +1131,7 @@ jumbo_component("base") {
-       ]
-       configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
-     }
--    if (is_chromeos || is_linux) {
-+    if (is_chromeos || (is_linux && !is_bsd)) {
-       sources += [
-         "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
-         "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1173,7 +1172,7 @@ jumbo_component("base") {
++  # *BSD needs libkvm
++  if (is_bsd) {
++    libs += [ "kvm" ]
++  }
++
++  if (is_freebsd) {
++    libs += [
++      "execinfo",
++      "util",
++    ]
++  }
++
+   if (use_allocator_shim) {
+     if (is_apple) {
+       sources += [ "allocator/early_zone_registration_apple.h" ]
+@@ -1141,7 +1153,7 @@ jumbo_component("base") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -35,7 +43,30 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -2119,6 +2118,43 @@ jumbo_component("base") {
+@@ -2091,6 +2103,22 @@ jumbo_component("base") {
+     ]
+   }
+ 
++  if (is_openbsd) {
++    sources += [
++      "process/process_handle_openbsd.cc",
++      "process/process_iterator_openbsd.cc",
++      "process/process_metrics_openbsd.cc",
++      "system/sys_info_openbsd.cc",
++    ]
++  } else if (is_freebsd) {
++    sources += [
++      "process/process_handle_freebsd.cc",
++      "process/process_iterator_freebsd.cc",
++      "process/process_metrics_freebsd.cc",
++      "system/sys_info_freebsd.cc",
++    ]
++  }
++
+   # iOS
+   if (is_ios) {
+     sources += [
+@@ -2223,6 +2251,29 @@ jumbo_component("base") {
      }
    }
  
@@ -43,43 +74,29 @@
 +    sources -= [
 +      "files/file_path_watcher_inotify.cc",
 +      "files/scoped_file_linux.cc",
-+      "process/process_linux.cc",
 +      "system/sys_info_linux.cc",
 +      "process/process_iterator_linux.cc",
++      "process/process_linux.cc",
 +      "process/process_metrics_linux.cc",
 +      "process/process_handle_linux.cc",
 +      "profiler/stack_copier_signal.cc",
 +      "profiler/stack_copier_signal.h",
 +      "profiler/thread_delegate_posix.cc",
 +      "profiler/thread_delegate_posix.h",
++      "threading/platform_thread_linux.cc",
 +    ]
 +    sources += [
 +      "files/file_path_watcher_kqueue.cc",
 +      "files/file_path_watcher_kqueue.h",
 +      "files/file_path_watcher_bsd.cc",
++      "threading/platform_thread_bsd.cc",
 +    ]
 +  }
 +
-+  if (is_openbsd) {
-+    sources += [
-+      "process/process_handle_openbsd.cc",
-+      "process/process_iterator_openbsd.cc",
-+      "process/process_metrics_openbsd.cc",
-+      "system/sys_info_openbsd.cc",
-+    ]
-+  } else if (is_freebsd) {
-+    sources += [
-+      "process/process_handle_freebsd.cc",
-+      "process/process_iterator_freebsd.cc",
-+      "process/process_metrics_freebsd.cc",
-+      "system/sys_info_freebsd.cc",
-+    ]
-+  }
-+
-   # iOS
-   if (is_ios) {
+   if (use_blink) {
      sources += [
-@@ -2214,7 +2250,7 @@ jumbo_component("base") {
+       "files/file_path_watcher.cc",
+@@ -2233,7 +2284,7 @@ jumbo_component("base") {
    }
  
    if (dep_libevent) {
@@ -88,7 +105,7 @@
    }
  
    if (use_libevent) {
-@@ -3482,7 +3518,7 @@ test("base_unittests") {
+@@ -3607,7 +3658,7 @@ test("base_unittests") {
      ]
    }
  
@@ -97,7 +114,7 @@
      sources += [
        "debug/proc_maps_linux_unittest.cc",
        "files/scoped_file_linux_unittest.cc",
-@@ -3531,7 +3567,7 @@ test("base_unittests") {
+@@ -3628,7 +3679,7 @@ test("base_unittests") {
        "posix/file_descriptor_shuffle_unittest.cc",
        "posix/unix_domain_socket_unittest.cc",
      ]
@@ -106,7 +123,7 @@
        sources += [
          "profiler/stack_base_address_posix_unittest.cc",
          "profiler/stack_copier_signal_unittest.cc",
-@@ -3542,7 +3578,7 @@ test("base_unittests") {
+@@ -3639,7 +3690,7 @@ test("base_unittests") {
  
    # Allow more direct string conversions on platforms with native utf8
    # strings
@@ -115,7 +132,7 @@
      defines += [ "SYSTEM_NATIVE_UTF8" ]
    }
  
-@@ -3763,7 +3799,7 @@ test("base_unittests") {
+@@ -3895,7 +3946,7 @@ test("base_unittests") {
      }
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h
index e0f121f10163..e31181bb5508 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/base/allocator/dispatcher/tls.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
        partition_alloc::PartitionPageSize();
  #elif BUILDFLAG(IS_APPLE)
    constexpr static size_t AllocationChunkSize = 16384;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn
new file mode 100644
index 000000000000..16dc80d6f2e1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/base/allocator/partition_allocator/BUILD.gn
+@@ -562,7 +562,7 @@ source_set("allocator_shim") {
+       ]
+       configs += [ ":mac_no_default_new_delete_symbols" ]
+     }
+-    if (is_chromeos || is_linux) {
++    if ((is_chromeos || is_linux) && !is_bsd) {
+       sources += [
+         "shim/allocator_shim_override_cpp_symbols.h",
+         "shim/allocator_shim_override_glibc_weak_symbols.h",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h
index 0b96554c9d5b..c48328b2fae5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_address__space__randomization.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/address_space_randomization.h
 @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
  
  #if defined(ARCH_CPU_64_BITS)
  
 -  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
-+  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD)
++  #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !BUILDFLAG(IS_BSD)
  
      // We shouldn't allocate system pages at all for sanitizer builds. However,
      // we do, and if random hint addresses interfere with address ranges
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h
index 8c4250d7d91e..3eb4f28da567 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t 
+@@ -258,7 +258,7 @@ void DecommitAndZeroSystemPages(void* address,
  // recommitted. Do not assume that this will not change over time.
  constexpr PA_COMPONENT_EXPORT(
      PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h
index 925000cf8eef..272faad2da2b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__constants.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_constants.h
 @@ -25,7 +25,7 @@
  // elimination.
@@ -9,7 +9,7 @@
  // This should work for all POSIX (if needed), but currently all other
  // supported OS/architecture combinations use either hard-coded values
  // (such as x86) or have means to determine these values without needing
-@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
+@@ -92,7 +92,7 @@ PageAllocationGranularityShift() {
    return 14;  // 16kB
  #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
    return static_cast<size_t>(vm_page_shift);
@@ -18,7 +18,7 @@
    // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
    // page sizes. Retrieve from or initialize cache.
    size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
-@@ -102,7 +102,7 @@ PageAllocationGranularity() {
+@@ -113,7 +113,7 @@ PageAllocationGranularity() {
    // This is literally equivalent to |1 << PageAllocationGranularityShift()|
    // below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
    return vm_page_size;
@@ -27,8 +27,8 @@
    // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
    // initialize cache.
    size_t size = page_characteristics.size.load(std::memory_order_relaxed);
-@@ -141,7 +141,7 @@ SystemPageShift() {
- PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
+@@ -152,7 +152,7 @@ SystemPageShift() {
+ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
  SystemPageSize() {
  #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
 -    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h
index 734969897517..b0e1fabca7e2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -403,8 +403,12 @@ bool TryRecommitSystemPagesInternal(
  
  void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
    void* ptr = reinterpret_cast<void*>(address);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc
index b16f589d70fe..9171c87c625d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__address__space.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_address_space.cc
-@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
+@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
  }
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni
index e5856f005242..7cf907ee908d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.gni
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.gni
-@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
-        "AsanBackupRefPtr requires RawPtrHookableImpl")
- 
- declare_args() {
--  enable_pkeys = is_linux && target_cpu == "x64"
-+  enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
+@@ -328,7 +328,7 @@ declare_args() {
+   # pkeys support is explicitly disabled in all Cronet builds, as some test
+   # dependencies that use partition_allocator are compiled in AOSP against a
+   # version of glibc that does not include pkeys syscall numbers.
+-  enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
++  enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
  }
  assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
         "Pkeys are only supported on x64 linux")
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h
new file mode 100644
index 000000000000..2577bd6e1d7a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h
@@ -0,0 +1,32 @@
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
+@@ -24,9 +24,9 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ //   NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
+ #define PA_NOINLINE [[clang::noinline]]
+-#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
+ #define PA_NOINLINE __attribute__((noinline))
+ #elif defined(COMPILER_MSVC)
+ #define PA_NOINLINE __declspec(noinline)
+@@ -34,7 +34,7 @@
+ #define PA_NOINLINE
+ #endif
+ 
+-#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
++#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
+ #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
+ #elif defined(COMPILER_GCC) && defined(NDEBUG) && \
+     PA_HAS_ATTRIBUTE(always_inline)
+@@ -53,7 +53,7 @@
+ // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+ // Use like:
+ //   void NOT_TAIL_CALLED FooBar();
+-#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
++#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
+ #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
+ #else
+ #define PA_NOT_TAIL_CALLED
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc
new file mode 100644
index 000000000000..4f82b1eff27f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_debug_stack__trace__posix.cc
@@ -0,0 +1,34 @@
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/debug/stack_trace_posix.cc
+@@ -12,11 +12,11 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ #include <link.h>  // For ElfW() macro.
+ #endif
+ 
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ #define HAVE_DLADDR
+ #include <dlfcn.h>
+ #endif
+@@ -25,7 +25,7 @@ namespace partition_alloc::internal::base::debug {
+ 
+ namespace {
+ 
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+ 
+ constexpr size_t kBufferSize = 4096u;
+ 
+@@ -359,7 +359,7 @@ void PrintStackTraceInternal(void* const* trace, size_
+ }
+ #endif  // !BUILDFLAG(IS_APPLE)
+ 
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ // Since /proc/self/maps is not available, use dladdr() to obtain module
+ // names and offsets inside the modules from the given addresses.
+ void PrintStackTraceInternal(void* const* trace, size_t size) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
index 3862972fb3c6..1c070033462d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig	2022-07-22 17:30:31 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
-@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
+@@ -90,6 +90,10 @@ void RandBytes(void* output, size_t output_length) {
    if (getentropy(output, output_length) == 0) {
      return;
    }
@@ -9,5 +9,5 @@
 +    return;
 +  }
  #endif
- 
-   // If the OS-specific mechanisms didn't work, fall through to reading from
+   // If getrandom(2) above returned with an error and the /dev/urandom fallback
+   // took place on Linux/ChromeOS bots, they would fail with a CHECK in
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h
index fd5c07ae23ed..cd7f463a4040 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_config.h
-@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
+@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
  // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
  // features such as futex(2).
  #define PA_CONFIG_HAS_LINUX_KERNEL() \
@@ -9,7 +9,7 @@
  
  // On some platforms, we implement locking by spinning in userspace, then going
  // into the kernel only if there is contention. This requires platform support,
-@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -237,7 +237,7 @@ constexpr bool kUseLazyCommit = false;
  // On these platforms, lock all the partitions before fork(), and unlock after.
  // This may be required on more platforms in the future.
  #define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -18,7 +18,7 @@
  
  // PartitionAlloc uses PartitionRootEnumerator to acquire all
  // PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -284,7 +284,7 @@ constexpr bool kUseLazyCommit = false;
  // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
  // larger slot spans.
  #define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h
index 7a6ee0bf9191..397135e90aa3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,20 +1,21 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -92,7 +92,7 @@ PartitionPageShift() {
+@@ -95,7 +95,7 @@ PartitionPageShift() {
    return 18;  // 256 KiB
  }
  #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
 -    (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
 +    ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
- PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
+ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
  PartitionPageShift() {
    return PageAllocationGranularityShift() + 2;
-@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
- // When pointer compression is enabled, we cannot use large pools (at most
+@@ -297,7 +297,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
  // 8GB for each of the glued pools).
  #if BUILDFLAG(HAS_64_BIT_POINTERS)
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
+-    BUILDFLAG(ENABLE_POINTER_COMPRESSION)
++    BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
++    BUILDFLAG(IS_BSD)
  constexpr size_t kPoolMaxSize = 8 * kGiB;
  #else
  constexpr size_t kPoolMaxSize = 16 * kGiB;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h
index a00532114b5f..c3fcc5774afb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__forward.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_forward.h
-@@ -27,9 +27,13 @@ namespace internal {
+@@ -28,9 +28,13 @@ namespace internal {
  // the second one 16. We could technically return something different for
  // malloc() and operator new(), but this would complicate things, and most of
  // our allocations are presumably coming from operator new() anyway.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h
deleted file mode 100644
index 7ec258bfe64e..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page.h
-@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
-   // PartitionPageSize() is 4 times the OS page size.
-   static constexpr size_t kMaxSlotsPerSlotSpan =
-       4 * (1 << 14) / kSmallestBucket;
--#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
-   // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
-   // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
-   // so we use the 16 kiB maximum (64 kiB will crash).
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h
new file mode 100644
index 000000000000..33c47d3245bc
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__page__constants.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_page_constants.h
+@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
+ // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
+ // PartitionPageSize() is 4 times the OS page size.
+ static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
+-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
+ // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
+ // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
+ // so we use the 16 kiB maximum (64 kiB will crash).
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc
index 6f8d525cdbcc..b925619dd52c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__root.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_root.cc
-@@ -42,7 +42,7 @@
+@@ -47,7 +47,7 @@
  #include "wow64apiset.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <pthread.h>
  #endif
  
-@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -281,7 +281,7 @@ void PartitionAllocMallocInitOnce() {
      return;
    }
  
@@ -18,7 +18,7 @@
    // When fork() is called, only the current thread continues to execute in the
    // child process. If the lock is held, but *not* by this thread when fork() is
    // called, we have a deadlock.
-@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -379,7 +379,7 @@ static size_t PartitionPurgeSlotSpan(PartitionRoot* ro
    constexpr size_t kMaxSlotCount =
        (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
        MinPurgeableSlotSize();
@@ -27,7 +27,7 @@
    // It's better for slot_usage to be stack-allocated and fixed-size, which
    // demands that its size be constexpr. On IS_APPLE and Linux on arm64,
    // PartitionPageSize() is always SystemPageSize() << 2, so regardless of
-@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -948,7 +948,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
      // apple OSes.
      PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
               (internal::SystemPageSize() == (size_t{1} << 14)));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc
index 8f34cabed102..06cc5fa96143 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_spinning__mutex.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/spinning_mutex.cc
 @@ -18,7 +18,16 @@
  
@@ -17,7 +17,7 @@
  #include <sys/syscall.h>
  #include <unistd.h>
  #endif  // PA_CONFIG(HAS_LINUX_KERNEL)
-@@ -107,8 +116,16 @@ void SpinningMutex::FutexWait() {
+@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() {
    // |kLockedContended| anymore. Note that even without spurious wakeups, the
    // value of |state_| is not guaranteed when this returns, as another thread
    // may get the lock before we get to run.
@@ -34,7 +34,7 @@
  
    if (err) {
      // These are programming error, check them.
-@@ -120,8 +137,16 @@ void SpinningMutex::FutexWait() {
+@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() {
  
  void SpinningMutex::FutexWake() {
    int saved_errno = errno;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc
index 1f24d9074f2f..cfa0d433b7e8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_starscan_stack_stack.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/allocator/partition_allocator/starscan/stack/stack.cc
 @@ -18,6 +18,10 @@
  #include <pthread.h>
  #endif
  
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +#include <pthread_np.h>
 +#endif
 +
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc
index 49bcb7b5ac66..f5180faeb6f1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/base/base_switches.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/base_switches.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/base_switches.cc
-@@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
- 
+@@ -180,7 +180,7 @@ const char kPackageVersionName[] = "package-version-na
+ const char kPackageVersionCode[] = "package-version-code";
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h
index 21d5313d8ecf..e3ecb7515a0c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_base__switches.h
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/base/base_switches.h.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/base_switches.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/base_switches.h
-@@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[];
- extern const char kForceFieldTrialParams[];
+@@ -62,7 +62,7 @@ extern const char kPackageVersionName[];
+ extern const char kPackageVersionCode[];
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h
new file mode 100644
index 000000000000..ad3ed85ba102
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_compiler__specific.h
@@ -0,0 +1,35 @@
+--- src/3rdparty/chromium/base/compiler_specific.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/base/compiler_specific.h
+@@ -41,9 +41,9 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ //   NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE [[clang::noinline]]
+-#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE __attribute__((noinline))
+ #elif defined(COMPILER_MSVC)
+ #define NOINLINE __declspec(noinline)
+@@ -51,9 +51,9 @@
+ #define NOINLINE
+ #endif
+ 
+-#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
++#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+ #define ALWAYS_INLINE [[clang::always_inline]] inline
+-#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+ #define ALWAYS_INLINE inline __attribute__((__always_inline__))
+ #elif defined(COMPILER_MSVC) && defined(NDEBUG)
+ #define ALWAYS_INLINE __forceinline
+@@ -69,7 +69,7 @@
+ // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+ // Use like:
+ //   NOT_TAIL_CALLED void FooBar();
+-#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called)
+ #define NOT_TAIL_CALLED [[clang::not_tail_called]]
+ #else
+ #define NOT_TAIL_CALLED
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
index d4a4722204fd..babce6ea3dbf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/debug/elf_reader.cc
 @@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
      bool found = false;
      while (current_section < section_end) {
        current_note = reinterpret_cast<const Nhdr*>(current_section);
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
        if (current_note->n_type == NT_GNU_BUILD_ID) {
          StringPiece note_name(current_section + sizeof(Nhdr),
                                current_note->n_namesz);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
index c4a64e564a43..5d07bea8c52f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc
 @@ -41,7 +41,7 @@
  // execinfo.h and backtrace(3) are really only present in glibc and in macOS
@@ -18,7 +18,53 @@
  #include "base/debug/proc_maps_linux.h"
  #endif
  
-@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
+@@ -300,7 +300,7 @@ void PrintToStderr(const char* output) {
+   std::ignore = HANDLE_EINTR(write(STDERR_FILENO, output, strlen(output)));
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void AlarmSignalHandler(int signal, siginfo_t* info, void* void_context) {
+   // We have seen rare cases on AMD linux where the default signal handler
+   // either does not run or a thread (Probably an AMD driver thread) prevents
+@@ -317,7 +317,11 @@ void AlarmSignalHandler(int signal, siginfo_t* info, v
+       "Warning: Default signal handler failed to terminate process.\n");
+   PrintToStderr("Calling exit_group() directly to prevent timeout.\n");
+   // See: https://man7.org/linux/man-pages/man2/exit_group.2.html
++#if BUILDFLAG(IS_BSD) 
++  _exit(EXIT_FAILURE);
++#else
+   syscall(SYS_exit_group, EXIT_FAILURE);
++#endif
+ }
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+         // BUILDFLAG(IS_CHROMEOS)
+@@ -534,7 +538,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+     _exit(EXIT_FAILURE);
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Set an alarm to trigger in case the default handler does not terminate
+   // the process. See 'AlarmSignalHandler' for more details.
+   struct sigaction action;
+@@ -559,6 +563,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+   // signals that do not re-raise autonomously), such as signals delivered via
+   // kill() and asynchronous hardware faults such as SEGV_MTEAERR, which would
+   // otherwise be lost when re-raising the signal via raise().
++#if !BUILDFLAG(IS_BSD)
+   long retval = syscall(SYS_rt_tgsigqueueinfo, getpid(), syscall(SYS_gettid),
+                         info->si_signo, info);
+   if (retval == 0) {
+@@ -573,6 +578,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf
+   if (errno != EPERM) {
+     _exit(EXIT_FAILURE);
+   }
++#endif
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) ||
+         // BUILDFLAG(IS_CHROMEOS)
+ 
+@@ -821,6 +827,9 @@ class SandboxSymbolizeHelper {
    // for the modules that are loaded in the current process.
    // Returns true on success.
    bool CacheMemoryRegions() {
@@ -28,7 +74,7 @@
      // Reads /proc/self/maps.
      std::string contents;
      if (!ReadProcMaps(&contents)) {
-@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
+@@ -838,6 +847,7 @@ class SandboxSymbolizeHelper {
  
      is_initialized_ = true;
      return true;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc
index f483c647acfb..7f2c78bd85af 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/files/file_util_posix.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/files/file_util_posix.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/base/files/file_util_posix.cc
-@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
                                  File::Error* error) {
    ScopedBlockingCall scoped_blocking_call(
        FROM_HERE, BlockingType::MAY_BLOCK);  // For call to mkdir().
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
index a38478c3c072..5451c26e763e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/base/i18n/icu_util.cc
 @@ -51,7 +51,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
@@ -9,7 +9,7 @@
      BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  #endif
-@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() {
+@@ -349,7 +349,7 @@ void InitializeIcuTimeZone() {
        FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
    icu::TimeZone::adoptDefault(
        icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
index 5d034a4c4d1f..c5250c813ac6 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/linux_util.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/linux_util.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/linux_util.cc
 @@ -15,6 +15,7 @@
  
@@ -12,7 +12,7 @@
  }
  
  bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  return false;
 +#else
    // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc
index 47133357042d..65ff5cfba392 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc
-@@ -299,6 +299,10 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
  
  bool MadvFreeDiscardableMemoryPosix::IsResident() const {
    DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
@@ -11,7 +11,7 @@
  #if BUILDFLAG(IS_APPLE)
    std::vector<char> vec(allocated_pages_);
  #else
-@@ -314,6 +318,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
        return false;
    }
    return true;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h
index bdc1f9a4b417..30ea9baa2090 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_memory_platform__shared__memory__region.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/base/memory/platform_shared_memory_region.h.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/base/memory/platform_shared_memory_region.h
 @@ -16,7 +16,7 @@
  
@@ -18,7 +18,7 @@
    // Structure to limit access to executable region creation.
    struct ExecutableRegion {
     private:
-@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
                             CheckPlatformHandlePermissionsCorrespondToMode);
    static PlatformSharedMemoryRegion Create(Mode mode,
                                             size_t size
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h
index 0d027a49424e..a744c9a96f61 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/process/launch.h.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/base/process/launch.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/base/process/launch.h
-@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -200,7 +200,7 @@ struct BASE_EXPORT LaunchOptions {
    bool clear_environment = false;
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc
index d78f3991d67a..95df631a5545 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/process/process_metrics.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/process/process_metrics.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/base/process/process_metrics.cc
 @@ -17,7 +17,7 @@ namespace base {
  namespace {
@@ -27,7 +27,7 @@
    Value::Dict meminfo = memory_info_.ToDict();
    meminfo.Merge(vmstat_info_.ToDict());
    res.Set("meminfo", std::move(meminfo));
-@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
  #endif  // !BUILDFLAG(IS_MAC)
  }
  
@@ -35,7 +35,7 @@
  double ProcessMetrics::GetPlatformIndependentCPUUsage(
      TimeDelta cumulative_cpu) {
    TimeTicks time = TimeTicks::Now();
-@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
  double ProcessMetrics::GetPlatformIndependentCPUUsage() {
    return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
  }
@@ -43,7 +43,7 @@
  
  #if BUILDFLAG(IS_WIN)
  double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
-@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
  #endif  // BUILDFLAG(IS_WIN)
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h
index 90733ad68e8c..d66d3ffb3d6a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/process/process_metrics.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/process/process_metrics.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/process/process_metrics.h
 @@ -37,7 +37,7 @@
  #endif
@@ -54,7 +54,7 @@
    int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
  #endif
  #if BUILDFLAG(IS_APPLE)
-@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics {
    // Used to store the previous times and CPU usage counts so we can
    // compute the CPU usage between calls.
    TimeTicks last_cpu_time_;
@@ -64,7 +64,7 @@
  
  #if BUILDFLAG(IS_WIN)
    TimeTicks last_cpu_time_for_precise_cpu_usage_;
-@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
  #endif
  
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc
index cd614ca55016..85a72669036d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__openbsd.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/process/process_metrics_openbsd.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/process/process_metrics_openbsd.cc
 @@ -6,14 +6,23 @@
  
@@ -83,13 +83,14 @@
  size_t GetSystemCommitCharge() {
    int mib[] = { CTL_VM, VM_METER };
    int pagesize;
-@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() {
+@@ -84,6 +67,133 @@ size_t GetSystemCommitCharge() {
    pagesize = getpagesize();
  
    return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
 +}
 +
 +int ProcessMetrics::GetOpenFdCount() const {
++#if 0
 +  struct kinfo_file *files;
 +  kvm_t *kd = NULL;
 +  int total_count = 0;
@@ -108,10 +109,13 @@
 +
 +out:
 +  return total_count;
++#endif
++  return getdtablecount();
 +}
 +
 +int ProcessMetrics::GetOpenFdSoftLimit() const {
-+  return GetMaxFds();
++  return getdtablesize();
++//  return GetMaxFds();
 +}
 +
 +uint64_t ProcessMetrics::GetVmSwapBytes() const {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc
index 8ef51d87848b..f820e17841e2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/base/process/process_metrics_posix.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/base/process/process_metrics_posix.cc
-@@ -20,6 +20,8 @@
+@@ -21,6 +21,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #else
  #include <malloc.h>
  #endif
-@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() {
    return stats.size_in_use;
  #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
    return GetMallocUsageMallinfo();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc
index c24ad3485633..f7da874a37ff 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/base/process/process_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/process/process_posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/process/process_posix.cc
 @@ -23,10 +23,15 @@
  #include "base/trace_event/base_tracing.h"
@@ -9,7 +9,7 @@
  #include <sys/event.h>
  #endif
  
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +#include <sys/types.h>
 +#include <sys/sysctl.h> 
 +#endif
@@ -35,21 +35,21 @@
      // On Mac we can wait on non child processes.
      return WaitForSingleNonChildProcess(handle, timeout);
  #else
-@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const {
+@@ -387,7 +392,56 @@ void Process::Exited(int exit_code) const {
  
- int Process::GetPriority() const {
+ int Process::GetOSPriority() const {
    DCHECK(IsValid());
 +// avoid pledge(2) violation
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  return 0;
 +#else
    return getpriority(PRIO_PROCESS, static_cast<id_t>(process_));
 +#endif
-+}
+ }
 +
 +Time Process::CreationTime() const {
 +// avoid ps pledge in the network process
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
 +  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(),
 +               sizeof(struct kinfo_proc), 0 };
 +  struct kinfo_proc *info = nullptr;
@@ -57,7 +57,7 @@
 +#endif
 +  Time ct = Time();
 +
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
 +  if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
 +    goto out;
 +
@@ -77,17 +77,18 @@
 +  return ct;
 +}
 +
-+bool Process::IsProcessBackgrounded() const {
-+  return false;
++#if BUILDFLAG(IS_BSD)
++Process::Priority Process::GetPriority() const {
++  return Priority::kUserBlocking;
 +}
-+ 
-+bool Process::SetProcessBackgrounded(bool value) {
++
++bool Process::SetPriority(Priority priority) {
 +  return false;
 +}
-+ 
-+// static
-+bool Process::CanBackgroundProcesses() {
++
++bool Process::CanSetPriority() {
 +  return false;
- }
++}
++#endif
  
  }  // namespace base
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc
index 58412582057f..b6c3709aa44a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_module__cache.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/profiler/module_cache.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/profiler/module_cache.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/profiler/module_cache.cc
-@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
+@@ -52,7 +52,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
    // Android and Linux Chrome builds use the "breakpad" format to index their
    // build id, so we transform the build id for these platforms. All other
    // platforms keep their symbols indexed by the original build ID.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc
index e4ed87ae163a..aefe2a163bd5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__test__util.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_test_util.cc
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,7 @@
  // Fortunately, it provides _alloca, which functions identically.
  #include <malloc.h>
  #define alloca _alloca
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h
index df6405773e53..16eba4061a14 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_rand__util.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/rand_util.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/base/rand_util.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/base/rand_util.h
-@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
    std::shuffle(first, last, RandomBitGenerator());
  }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc
index 5ae54d0bdd4e..db411e4749cd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/system/sys_info.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/system/sys_info.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/system/sys_info.cc
-@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() {
+@@ -166,7 +166,7 @@ std::string SysInfo::HardwareModelName() {
  #endif
  
  void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
index 226b5a530701..b69d60cc2735 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/base/system/sys_info.h.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/base/system/sys_info.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/base/system/sys_info.h
-@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo {
-   static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
+@@ -266,6 +266,8 @@ class BASE_EXPORT SysInfo {
+   static void ResetCpuSecurityMitigationsEnabledForTesting();
  #endif
  
 +  static uint64_t MaxSharedMemorySize();
 +
   private:
+   friend class test::ScopedAmountOfPhysicalMemoryOverride;
    FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
-   FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo {
+@@ -278,7 +280,7 @@ class BASE_EXPORT SysInfo {
    static HardwareInfo GetHardwareInfoSync();
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc
index 9b5a1d6262b0..73a5f9f01a17 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__posix.cc
@@ -1,21 +1,24 @@
---- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/base/system/sys_info_posix.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/base/system/sys_info_posix.cc
-@@ -165,12 +165,12 @@ int NumberOfProcessors() {
+@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
  
- }  // namespace internal
+ namespace base {
  
 -#if !BUILDFLAG(IS_OPENBSD)
 +#if !BUILDFLAG(IS_BSD)
  int SysInfo::NumberOfProcessors() {
-   static int number_of_processors = internal::NumberOfProcessors();
-   return number_of_processors;
+ #if BUILDFLAG(IS_MAC)
+   absl::optional<int> number_of_physical_cores =
+@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() {
+ 
+   return num_cpus;
  }
 -#endif  // !BUILDFLAG(IS_OPENBSD)
 +#endif  // !BUILDFLAG(IS_BSD)
  
  // static
  uint64_t SysInfo::AmountOfVirtualMemory() {
-@@ -260,6 +260,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
      arch = "x86";
    } else if (arch == "amd64") {
      arch = "x86_64";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc
index 49b9ce7d6fbe..0a61f568e7e7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_test_test__file__util__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/base/test/test_file_util_linux.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/base/test/test_file_util_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/test/test_file_util_linux.cc
 @@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) {
      return false;
    if (fdatasync(fd.get()) != 0)
      return false;
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
    if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0)
      return false;
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc
new file mode 100644
index 000000000000..62a5b20ce6c5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_hang__watcher.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/base/threading/hang_watcher.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/base/threading/hang_watcher.cc
+@@ -331,7 +331,7 @@ void HangWatcher::InitializeOnMainThread(ProcessType p
+ 
+   bool enable_hang_watcher = base::FeatureList::IsEnabled(kEnableHangWatcher);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD)
+   if (is_zygote_child) {
+     enable_hang_watcher =
+         enable_hang_watcher &&
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc
new file mode 100644
index 000000000000..d2ea66bf3ea5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__bsd.cc
@@ -0,0 +1,34 @@
+--- src/3rdparty/chromium/base/threading/platform_thread_bsd.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/base/threading/platform_thread_bsd.cc
+@@ -0,0 +1,31 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++// Description: These are stubs for *BSD.
++
++#include "base/threading/platform_thread.h"
++
++namespace base {
++namespace internal {
++
++bool CanSetThreadTypeToRealtimeAudio() {
++  return false;
++}
++
++bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
++                                MessagePumpType pump_type_hint) {
++  return false;
++}
++
++absl::optional<ThreadPriorityForTest>
++GetCurrentThreadPriorityForPlatformForTest() {
++  return absl::nullopt;
++}
++}  // namespace internal
++
++// static
++void PlatformThreadBase::SetName(const std::string& name) {
++  SetNameCommon(name);
++}
++
++}  // namespace base
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc
new file mode 100644
index 000000000000..7feb2dec502e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__internal__posix.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/base/threading/platform_thread_internal_posix.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/base/threading/platform_thread_internal_posix.cc
+@@ -41,7 +41,7 @@ ThreadPriorityForTest NiceValueToThreadPriorityForTest
+ }
+ 
+ int GetCurrentThreadNiceValue() {
+-#if BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
+   NOTIMPLEMENTED();
+   return 0;
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc
deleted file mode 100644
index e7a0ef2e0396..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/base/threading/platform_thread_linux.cc
-@@ -30,7 +30,9 @@
- 
- #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
- #include <pthread.h>
-+#if !BUILDFLAG(IS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/resource.h>
- #include <sys/time.h>
- #include <sys/types.h>
-@@ -139,7 +141,7 @@ long sched_setattr(pid_t pid,
- #endif  // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
- #endif  // BUILDFLAG(IS_CHROMEOS)
- 
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- const FilePath::CharType kCgroupDirectory[] =
-     FILE_PATH_LITERAL("/sys/fs/cgroup");
- 
-@@ -313,7 +315,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th
- namespace internal {
- 
- namespace {
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- const struct sched_param kRealTimePrio = {8};
- #endif
- }  // namespace
-@@ -340,7 +342,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue
- };
- 
- bool CanSetThreadTypeToRealtimeAudio() {
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
-   // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
-   // pthread_setschedparam in SetCurrentThreadTypeForPlatform().
-   struct rlimit rlim;
-@@ -352,7 +354,7 @@ bool CanSetThreadTypeToRealtimeAudio() {
- 
- bool SetCurrentThreadTypeForPlatform(ThreadType thread_type,
-                                      MessagePumpType pump_type_hint) {
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
-   const PlatformThreadId tid = PlatformThread::CurrentId();
- 
-   if (g_thread_type_delegate &&
-@@ -378,7 +380,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread
- 
- absl::optional<ThreadPriorityForTest>
- GetCurrentThreadPriorityForPlatformForTest() {
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
-   int maybe_sched_rr = 0;
-   struct sched_param maybe_realtime_prio = {0};
-   if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
-@@ -397,7 +399,7 @@ GetCurrentThreadPriorityForPlatformForTest() {
- void PlatformThread::SetName(const std::string& name) {
-   ThreadIdNameManager::GetInstance()->SetName(name);
- 
--#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD)
-   // On linux we can get the thread names to show up in the debugger by setting
-   // the process name for the LWP.  We don't want to do this for the main
-   // thread because that would rename the process, causing tools like killall
-@@ -417,7 +419,7 @@ void PlatformThread::SetName(const std::string& name) 
- #endif  //  !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
- }
- 
--#if !BUILDFLAG(IS_NACL)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
- // static
- void PlatformThread::SetThreadTypeDelegate(ThreadTypeDelegate* delegate) {
-   // A component cannot override a delegate set by another component, thus
-@@ -428,7 +430,7 @@ void PlatformThread::SetThreadTypeDelegate(ThreadTypeD
- }
- #endif
- 
--#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
-+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD)
- // static
- void PlatformThread::SetThreadType(ProcessId process_id,
-                                    PlatformThreadId thread_id,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc
index ab57809e0ac0..3e8c5740f048 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc
-@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) {
+@@ -76,12 +76,12 @@ void* ThreadFunc(void* params) {
      if (!thread_params->joinable)
        base::DisallowSingleton();
  
@@ -9,6 +9,21 @@
      partition_alloc::internal::PCScan::NotifyThreadCreated(
          partition_alloc::internal::GetStackPointer());
  #endif
+ 
+-#if !BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_APPLE)
+     PlatformThread::SetCurrentThreadRealtimePeriodValue(
+         delegate->GetRealtimePeriod());
+@@ -353,7 +353,7 @@ void PlatformThreadBase::Detach(PlatformThreadHandle t
+ 
+ // static
+ bool PlatformThreadBase::CanChangeThreadType(ThreadType from, ThreadType to) {
+-#if BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
+   return false;
+ #else
+   if (from >= to) {
 @@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
                                MessagePumpType pump_type_hint) {
  #if BUILDFLAG(IS_NACL)
@@ -19,3 +34,12 @@
  #else
    if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint))
      return;
+@@ -396,7 +399,7 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type,
+ 
+ // static
+ ThreadPriorityForTest PlatformThreadBase::GetCurrentThreadPriorityForTest() {
+-#if BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD)
+   NOTIMPLEMENTED();
+   return ThreadPriorityForTest::kNormal;
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc
index 6f4bb60c70b9..dc3be50876aa 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
 @@ -25,6 +25,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
 +#include <stdlib.h>
  #else
  #include <malloc.h>
  #endif
-@@ -187,7 +189,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -188,7 +190,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
  
  #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
      (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) &&    \
@@ -18,11 +18,11 @@
  void ReportMallinfoStats(ProcessMemoryDump* pmd,
                           size_t* total_virtual_size,
                           size_t* resident_size,
-@@ -358,6 +360,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -359,6 +361,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
                       &allocated_objects_count);
  #elif BUILDFLAG(IS_FUCHSIA)
  // TODO(fuchsia): Port, see https://crbug.com/706592.
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
 +  total_virtual_size = 0;
 +  allocated_objects_size = 0;
  #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc
new file mode 100644
index 000000000000..6fe3d1861bc9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_base_trace__event_trace__log.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/base/trace_event/trace_log.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/base/trace_event/trace_log.cc
+@@ -2190,8 +2190,13 @@ void TraceLog::SetTraceBufferForTesting(
+ #if BUILDFLAG(USE_PERFETTO_CLIENT_LIBRARY)
+ void TraceLog::OnSetup(const perfetto::DataSourceBase::SetupArgs& args) {
+   AutoLock lock(track_event_lock_);
++#if defined(__clang__) && (__clang_major__ >= 16)
+   track_event_sessions_.emplace_back(args.internal_instance_index, *args.config,
+                                      args.backend_type);
++#else
++  track_event_sessions_.emplace_back(TrackEventSession{args.internal_instance_index, *args.config,
++                                     args.backend_type});
++#endif
+ }
+ 
+ void TraceLog::OnStart(const perfetto::DataSourceBase::StartArgs&) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn
index b1f5f44f2f80..a3f30fdd37eb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn
@@ -1,22 +1,13 @@
---- src/3rdparty/chromium/build/config/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/build/config/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/build/config/BUILD.gn
-@@ -222,13 +222,17 @@ config("default_libs") {
-       "CoreText.framework",
-       "Foundation.framework",
-     ]
--  } else if (is_linux || is_chromeos) {
-+  } else if ((is_linux && !is_bsd) || is_chromeos) {
-     libs = [
-       "dl",
-       "pthread",
-       "rt",
-     ]
--  }
+@@ -218,6 +218,10 @@ config("default_libs") {
+     # Targets should choose to explicitly link frameworks they require. Since
+     # linking can have run-time side effects, nothing should be listed here.
+     libs = []
 +  } else if (is_bsd) {
 +    libs = [
 +      "pthread",
 +    ]
-+ }
- }
- 
- group("common_deps") {
+   } else if (is_linux || is_chromeos) {
+     libs = [
+       "dl",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn
index a7e1736e9cce..c9eb9e97a18d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn
 @@ -136,7 +136,8 @@ declare_args() {
    is_official_build = false
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
index 85c5c8963128..7945516dc450 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn
@@ -1,6 +1,15 @@
---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
-@@ -243,13 +243,16 @@ config("no_unresolved_symbols") {
+@@ -198,7 +198,7 @@ declare_args() {
+   # This greatly reduces the size of debug builds, at the cost of
+   # debugging information which is required by some specialized
+   # debugging tools.
+-  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple
++  simple_template_names = is_clang && !is_nacl && !is_win && !is_apple && !is_bsd
+ }
+ 
+ declare_args() {
+@@ -262,13 +262,16 @@ config("no_unresolved_symbols") {
  # Compiler instrumentation can introduce dependencies in DSOs to symbols in
  # the executable they are loaded into, so they are unresolved at link-time.
  config("no_unresolved_symbols") {
@@ -18,7 +27,7 @@
  }
  
  # compiler ---------------------------------------------------------------------
-@@ -513,6 +516,10 @@ config("compiler") {
+@@ -555,6 +558,10 @@ config("compiler") {
      }
    }
  
@@ -29,16 +38,16 @@
    # Linux-specific compiler flags setup.
    # ------------------------------------
    if (use_gold) {
-@@ -882,7 +889,7 @@ config("compiler") {
-   # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
-   #   lldb doesn't have the needed changes yet.
-   # TODO(crbug.com/1379070): Remove if the upstream default ever changes.
--  if (is_clang && !is_nacl && !is_win && !is_apple) {
-+  if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
-     cflags_cc += [ "-gsimple-template-names" ]
-   }
+@@ -823,7 +830,7 @@ config("compiler") {
  
-@@ -1065,7 +1072,7 @@ config("compiler_cpu_abi") {
+       ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
+ 
+-      if (!is_chromeos) {
++      if (!is_chromeos && !is_bsd) {
+         # TODO(https://crbug.com/972449): turn on for ChromeOS when that
+         # toolchain has this flag.
+         # We only use one version of LLVM within a build so there's no need to
+@@ -1170,7 +1177,7 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
@@ -47,7 +56,7 @@
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=arm-linux-gnueabihf" ]
          ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -1083,7 +1090,7 @@ config("compiler_cpu_abi") {
+@@ -1188,7 +1195,7 @@ config("compiler_cpu_abi") {
          cflags += [ "-mtune=$arm_tune" ]
        }
      } else if (current_cpu == "arm64") {
@@ -56,7 +65,7 @@
            !(is_chromeos_lacros && is_chromeos_device)) {
          cflags += [ "--target=aarch64-linux-gnu" ]
          ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1418,7 +1425,7 @@ config("compiler_deterministic") {
+@@ -1523,7 +1530,7 @@ config("compiler_deterministic") {
      # different build directory like "out/feature_a" and "out/feature_b" if
      # we build same files with same compile flag.
      # Other paths are already given in relative, no need to normalize them.
@@ -65,7 +74,7 @@
        # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
        cflags += [
          "-Xclang",
-@@ -1470,7 +1477,7 @@ config("clang_revision") {
+@@ -1575,7 +1582,7 @@ config("clang_revision") {
  }
  
  config("clang_revision") {
@@ -74,7 +83,7 @@
      update_args = [
        "--print-revision",
        "--verify-version=$clang_version",
-@@ -1872,7 +1879,7 @@ config("default_warnings") {
+@@ -2005,7 +2012,7 @@ config("default_warnings") {
          "-Wno-ignored-pragma-optimize",
        ]
  
@@ -83,7 +92,7 @@
          cflags += [
            # TODO(crbug.com/1343975) Evaluate and possibly enable.
            "-Wno-deprecated-builtins",
-@@ -2054,7 +2061,7 @@ config("no_chromium_code") {
+@@ -2218,7 +2225,7 @@ config("no_chromium_code") {
        # third-party libraries.
        "-Wno-c++11-narrowing",
      ]
@@ -92,7 +101,7 @@
        cflags += [
          # Disabled for similar reasons as -Wunused-variable.
          "-Wno-unused-but-set-variable",
-@@ -2570,7 +2577,7 @@ config("afdo") {
+@@ -2736,7 +2743,7 @@ config("afdo") {
  # There are some targeted places that AFDO regresses, so we provide a separate
  # config to allow AFDO to be disabled per-target.
  config("afdo") {
@@ -101,8 +110,8 @@
      cflags = []
      if (clang_emit_debug_info_for_profiling) {
        # Add the following flags to generate debug info for profiling.
-@@ -2589,7 +2596,7 @@ config("afdo") {
-       }
+@@ -2763,7 +2770,7 @@ config("afdo") {
+       cflags += [ "-Wno-backend-plugin" ]
        inputs = [ _clang_sample_profile ]
      }
 -  } else if (auto_profile_path != "" && is_a_target_toolchain) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn
new file mode 100644
index 000000000000..e5f736b1a13c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_pgo_BUILD.gn
@@ -0,0 +1,19 @@
+--- src/3rdparty/chromium/build/config/compiler/pgo/BUILD.gn.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/build/config/compiler/pgo/BUILD.gn
+@@ -143,13 +143,14 @@ config("pgo_optimization_flags") {
+ 
+     # Enable basic block layout based on the extended TSP problem. This aims to
+     # improve icache utilization and reduce the binary size.
+-    if (use_thin_lto) {
++    # __clang_major__ >= 15
++    if (use_thin_lto && !is_bsd) {
+       if (is_win) {
+         ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
+       } else {
+         ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
+       }
+-    } else {
++    } else if (!is_bsd) {
+       cflags += [
+         "-mllvm",
+         "-enable-ext-tsp-block-placement=1",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni
deleted file mode 100644
index ab30256825eb..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_freetype_freetype.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/build/config/freetype/freetype.gni.orig	2023-08-23 22:56:29 UTC
-+++ src/3rdparty/chromium/build/config/freetype/freetype.gni
-@@ -10,7 +10,5 @@ declare_args() {
-   # than version 2.7.1 and have color bitmap support compiled in. WARNING:
-   # System FreeType configurations other than as described WILL INTRODUCE TEXT
-   # RENDERING AND SECURITY REGRESSIONS.
--  use_system_freetype = false
--  use_qt_freetype = false
--  qt_freetype_config = ""
-+  use_system_freetype = true
- }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_BUILD.gn
new file mode 100644
index 000000000000..63e443ae5628
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/build/config/linux/BUILD.gn.orig	2022-05-19 14:06:27 UTC
++++ src/3rdparty/chromium/build/config/linux/BUILD.gn
+@@ -41,7 +41,7 @@ config("runtime_library") {
+   }
+ 
+   if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") &&
+-      (!use_custom_libcxx || current_cpu == "mipsel")) {
++      (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) {
+     libs = [ "atomic" ]
+   }
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py
index 5bf1f6d7757d..afea5c617dfa 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig	2024-02-10 00:23:21 UTC
+--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig	2024-01-23 10:07:29 UTC
 +++ src/3rdparty/chromium/build/config/linux/pkg-config.py
 @@ -108,7 +108,7 @@ def main():
    # If this is run on non-Linux platforms, just return nothing and indicate
    # success. This allows us to "kind of emulate" a Linux build from other
    # platforms.
 -  if 'linux' not in sys.platform and 'darwin' not in sys.platform:
-+  if not sys.platform.startswith(tuple(['linux', 'openbsd', 'freebsd', 'darwin'])):
++  if not sys.platform.startswith(tuple(['linux', 'darwin', 'freebsd', 'openbsd'])):
      print("[[],[],[],[],[]]")
      return 0
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni
index 122af743c6f6..763302535df5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_ozone.gni
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/build/config/ozone.gni.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/build/config/ozone.gni.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/build/config/ozone.gni
-@@ -90,7 +90,15 @@ declare_args() {
+@@ -87,7 +87,15 @@ declare_args() {
      } else if (is_chromeos_lacros) {
        ozone_platform = "wayland"
        ozone_platform_wayland = true
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni
deleted file mode 100644
index c0ed80bc9866..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_config_rust.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/build/config/rust.gni.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/build/config/rust.gni
-@@ -135,7 +135,7 @@ if (enable_rust) {
-     rust_sysroot = "//third_party/rust-toolchain"
-     use_unverified_rust_toolchain = false
-   } else {
--    if (host_os != "linux") {
-+    if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") {
-       assert(false,
-              "Attempt to use Android Rust toolchain on an unsupported platform")
-     }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
index c4d3cef02ebe..a83eea70421e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig	2023-11-20 16:08:07 UTC
+--- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni
 @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) {
        "enable_resource_allowlist_generation=true does not work for target_os=$target_os")
@@ -14,7 +14,7 @@
  # This template defines a toolchain for something that works like gcc
  # (including clang).
  #
-@@ -839,22 +846,12 @@ template("clang_toolchain") {
+@@ -888,22 +895,12 @@ template("clang_toolchain") {
  # use_gold too.
  template("clang_toolchain") {
    gcc_toolchain(target_name) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni
new file mode 100644
index 000000000000..ce33cb085585
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_build_toolchain_toolchain.gni
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/build/toolchain/toolchain.gni.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/build/toolchain/toolchain.gni
+@@ -67,7 +67,7 @@ if (host_os == "mac") {
+   host_shlib_extension = ".dylib"
+ } else if (host_os == "win") {
+   host_shlib_extension = ".dll"
+-} else if (host_os == "linux" || host_os == "aix") {
++} else if (is_posix) {
+   host_shlib_extension = ".so"
+ } else {
+   assert(false, "Host platform not supported")
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn
index 36c7ea079dde..416cda0112e3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/cc/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/cc/BUILD.gn.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/cc/BUILD.gn
-@@ -668,7 +668,7 @@ cc_test_static_library("test_support") {
+@@ -674,7 +674,7 @@ cc_test_static_library("test_support") {
    if (enable_vulkan) {
      deps += [ "//gpu/vulkan/init" ]
    }
@@ -8,9 +8,9 @@
 +  if (!is_android && !is_bsd) {
      data_deps = [ "//third_party/mesa_headers" ]
    }
- }
-@@ -913,7 +913,6 @@ cc_test("cc_unittests") {
-   data = [ "//components/viz/test/data/" ]
+   if (skia_use_dawn) {
+@@ -929,7 +929,6 @@ cc_test("cc_unittests") {
+   data = [ "//components/test/data/viz/" ]
    data_deps = [
      "//testing/buildbot/filters:cc_unittests_filters",
 -    "//third_party/mesa_headers",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc
new file mode 100644
index 000000000000..17cb349564cb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_cc_base_features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/cc/base/features.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/cc/base/features.cc
+@@ -85,7 +85,7 @@ CONSTINIT const base::Feature kUseDMSAAForTiles(
+ // be using a separate flag to control the launch on GL.
+ CONSTINIT const base::Feature kUseDMSAAForTiles(
+              "UseDMSAAForTiles",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp
new file mode 100644
index 000000000000..a336b3f36bc5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_app__management__strings.grdp
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/app/app_management_strings.grdp.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/app/app_management_strings.grdp
+@@ -188,7 +188,7 @@
+       You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
+     </message>
+   </if>
+-  <if expr="is_fuchsia or is_linux">
++  <if expr="is_fuchsia or is_posix">
+     <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
+       You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
+     </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd
new file mode 100644
index 000000000000..378a00f12881
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd
@@ -0,0 +1,38 @@
+--- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/app/chromium_strings.grd
+@@ -315,7 +315,7 @@ If you update this file, be sure also to update google
+           Welcome to Chromium; new browser window opened
+         </message>
+       </if>
+-      <if expr="is_macosx or is_linux">
++      <if expr="is_macosx or is_posix">
+         <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
+           Welcome to Chromium
+         </message>
+@@ -465,7 +465,7 @@ If you update this file, be sure also to update google
+                     To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
+         </message>
+       </if>
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
+           Chromium may not function correctly because it is no longer supported on this Linux distribution
+         </message>
+@@ -870,7 +870,7 @@ Permissions you've already given to websites and apps 
+         </message>
+       </if>
+ 
+-      <if expr="is_win or is_macosx or is_linux">
++      <if expr="is_win or is_macosx or is_posix">
+         <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
+         Not used in Chromium. Placeholder to keep resource maps in sync.
+         </message>
+@@ -1255,7 +1255,7 @@ Permissions you've already given to websites and apps 
+         </message>
+       </if>
+ 
+-      <if expr="is_win or is_macosx or is_linux">
++      <if expr="is_win or is_macosx or is_posix">
+         <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false">
+           Not used in Chromium. Placeholder to keep resource maps in sync.
+         </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd
new file mode 100644
index 000000000000..185d3fbc661b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd
@@ -0,0 +1,92 @@
+--- src/3rdparty/chromium/chrome/app/generated_resources.grd.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/app/generated_resources.grd
+@@ -2,7 +2,7 @@
+ 
+ <!--
+ This file contains definitions of resources that will be translated for each
+-locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
++locale.  The variables is_win, is_macosx, is_posix, and is_posix are available
+ for making strings OS specific.  Other platform defines such as use_titlecase
+ are declared in tools/grit/grit_rule.gni.
+ -->
+@@ -3601,7 +3601,7 @@ are declared in tools/grit/grit_rule.gni.
+       </if>
+ 
+       <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
+-      <if expr="is_win or is_linux">
++      <if expr="is_win or is_posix">
+         <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
+           Device Credentials
+         </message>
+@@ -5432,7 +5432,7 @@ are declared in tools/grit/grit_rule.gni.
+             Read information about your browser, OS, device, installed software, registry values and files
+           </message>
+         </if>
+-        <if expr="is_macosx or is_linux">
++        <if expr="is_macosx or is_posix">
+           <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS.">
+             Read information about your browser, OS, device, installed software and files
+           </message>
+@@ -6145,7 +6145,7 @@ Keep your key file in a safe place. You will need it t
+           Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app.
+         </message>
+       </if>
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog">
+           Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app.
+         </message>
+@@ -6191,7 +6191,7 @@ Keep your key file in a safe place. You will need it t
+           Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available.
+         </message>
+       </if>
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
+           Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
+         </message>
+@@ -10396,7 +10396,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+       <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
+         Update
+       </message>
+-      <if expr="is_win or is_macosx or is_linux">
++      <if expr="is_win or is_macosx or is_posix">
+         <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
+           Finish update
+         </message>
+@@ -10743,7 +10743,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+         Google Pay
+       </message>
+ 
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
+           Use system title bar and borders
+         </message>
+@@ -11728,7 +11728,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+       </message>
+ 
+       <!-- Device Trust Consent dialog -->
+-      <if expr="is_win or is_macosx or is_linux or is_chromeos">
++      <if expr="is_win or is_macosx or is_posix or is_chromeos">
+         <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
+           Share information about your device?
+         </message>
+@@ -12136,7 +12136,7 @@ Please help our engineers fix this problem. Tell us wh
+         Set as default
+       </message>
+ 
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
+           Minimize
+         </message>
+@@ -14346,7 +14346,7 @@ Please help our engineers fix this problem. Tell us wh
+       Open Anyway
+     </message>
+ 
+-    <if expr="is_win or is_macosx or is_linux">
++    <if expr="is_win or is_macosx or is_posix">
+       <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux.">
+         System Signals Utilities
+       </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd
new file mode 100644
index 000000000000..fdd0c329a1d4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_google__chrome__strings.grd
@@ -0,0 +1,38 @@
+--- src/3rdparty/chromium/chrome/app/google_chrome_strings.grd.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/app/google_chrome_strings.grd
+@@ -301,7 +301,7 @@ chromium_strings.grd. -->
+           Welcome to Chrome; new browser window opened
+         </message>
+       </if>
+-      <if expr="is_macosx or is_linux">
++      <if expr="is_macosx or is_posix">
+         <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
+           Welcome to Google Chrome
+         </message>
+@@ -453,7 +453,7 @@ chromium_strings.grd. -->
+                     To get future Google Chrome updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
+         </message>
+       </if>
+-      <if expr="is_linux">
++      <if expr="is_posix">
+         <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
+           Google Chrome may not function correctly because it is no longer supported on this Linux distribution
+         </message>
+@@ -855,7 +855,7 @@ Permissions you've already given to websites and apps 
+         </if>
+       </if>
+ 
+-      <if expr="is_win or is_macosx or is_linux">
++      <if expr="is_win or is_macosx or is_posix">
+         <if expr="use_titlecase">
+           <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
+             Relaunch to Update - Your tabs will reopen
+@@ -1278,7 +1278,7 @@ Permissions you've already given to websites and apps 
+         </message>
+       </if>
+ 
+-      <if expr="is_win or is_macosx or is_linux">
++      <if expr="is_win or is_macosx or is_posix">
+         <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog.">
+           Relaunch to finish Chrome update
+         </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp
new file mode 100644
index 000000000000..1d8767a94030
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_profiles__strings.grdp
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/app/profiles_strings.grdp.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/app/profiles_strings.grdp
+@@ -54,7 +54,7 @@
+       Add Profile...
+     </message>
+   </if>
+-  <if expr="is_linux">
++  <if expr="is_posix">
+     <message name="IDS_PROFILES_ADD_PROFILE_LABEL" desc="Menu item for adding a new profile.">
+       Add profile...
+     </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp
new file mode 100644
index 000000000000..09d3a37079d2
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_settings__strings.grdp
@@ -0,0 +1,35 @@
+--- src/3rdparty/chromium/chrome/app/settings_strings.grdp.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/app/settings_strings.grdp
+@@ -183,12 +183,12 @@
+       Manage accessibility features
+     </message>
+   </if>
+-  <if expr="is_win or is_linux or is_macosx">
++  <if expr="is_win or is_posix or is_macosx">
+     <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE" desc="Title for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
+       Swipe between pages
+     </message>
+   </if>
+-  <if expr="is_win or is_linux">
++  <if expr="is_win or is_posix">
+     <message name="IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_SUBTITLE" desc="Subtitle for the overscroll history navigation setting, which allows you to navigate back and forward by swiping left or right with a touch device.">
+       Navigate back and forward with swipe gesture
+     </message>
+@@ -222,7 +222,7 @@
+       Theme
+     </message>
+   </if>
+-  <if expr="is_linux">
++  <if expr="is_posix">
+     <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
+       GTK
+     </message>
+@@ -242,7 +242,7 @@
+       Use Classic
+     </message>
+   </if>
+-  <if expr="not is_linux or is_chromeos or is_fuchsia">
++  <if expr="not is_posix or is_chromeos or is_fuchsia">
+     <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
+       Reset to default
+     </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd
new file mode 100644
index 000000000000..f3ceafba7bcb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
+@@ -16,7 +16,7 @@
+     <includes>
+       <if expr="_google_chrome">
+         <then>
+-          <if expr="is_linux">
++          <if expr="is_posix">
+             <then>
+               <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" />
+               <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" />
+@@ -61,7 +61,7 @@
+         <else> <!-- not _google_chrome -->
+           <if expr="_is_chrome_for_testing_branded">
+             <then>
+-              <if expr="is_linux">
++              <if expr="is_posix">
+                 <then>
+                   <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
+                   <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
+@@ -75,7 +75,7 @@
+               </if>
+             </then>
+             <else>  <!-- not _is_chrome_for_testing_branded -->
+-              <if expr="is_linux">
++              <if expr="is_posix">
+                 <then>
+                   <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" />
+                   <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" />
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd
new file mode 100644
index 000000000000..10224bce93ce
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_theme__resources.grd
@@ -0,0 +1,59 @@
+--- src/3rdparty/chromium/chrome/app/theme/theme_resources.grd.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/app/theme/theme_resources.grd
+@@ -146,14 +146,14 @@
+       </if>
+       <if expr="_google_chrome">
+         <then>
+-          <if expr="is_linux">
++          <if expr="is_posix">
+             <then>
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" />
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" />
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" />
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/linux/product_logo_32_dev.png" />
+             </then>
+-            <else> <!-- not is_linux -->
++            <else> <!-- not is_posix -->
+               <if expr="not is_android">
+                 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
+                 <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
+@@ -161,7 +161,7 @@
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
+               <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
+             </else>
+-          </if> <!-- is_linux -->
++          </if> <!-- is_posix -->
+           <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" />
+           <if expr="not is_android">
+             <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" />
+@@ -173,7 +173,7 @@
+         <else> <!-- not _google_chrome -->
+           <if expr="_is_chrome_for_testing_branded">
+             <then>
+-              <if expr="is_linux">
++              <if expr="is_posix">
+                 <then>
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/linux/product_logo_16.png" />
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/linux/product_logo_32.png" />
+@@ -182,10 +182,10 @@
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/google_chrome_for_testing/product_logo_16.png" />
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/google_chrome_for_testing/product_logo_32.png" />
+                 </else>
+-              </if> <!-- is_linux -->
++              </if> <!-- is_posix -->
+             </then>
+             <else> <!-- not _is_chrome_for_testing_branded -->
+-              <if expr="is_linux">
++              <if expr="is_posix">
+                 <then>
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
+@@ -194,7 +194,7 @@
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
+                   <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
+                 </else>
+-              </if> <!-- is_linux -->
++              </if> <!-- is_posix -->
+             </else>
+           </if> <!-- _is_chrome_for_testing_branded -->
+           <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" />
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn
new file mode 100644
index 000000000000..95970a4cb06a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/BUILD.gn
+@@ -6312,6 +6312,13 @@ static_library("browser") {
+     }
+   }
+ 
++  if (is_bsd) {
++    sources -= [
++      "metrics/bluetooth_metrics_provider.cc",
++      "metrics/bluetooth_metrics_provider.h",
++    ]
++  }
++
+   if (is_linux && use_dbus) {
+     sources += [
+       "dbus_memory_pressure_evaluator_linux.cc",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
new file mode 100644
index 000000000000..808db0af5867
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
+@@ -77,7 +77,7 @@ bool ChromeProtocolHandlerRegistryDelegate::ShouldRemo
+ // If true default protocol handlers will be removed if the OS level
+ // registration for a protocol is no longer Chrome.
+ bool ChromeProtocolHandlerRegistryDelegate::ShouldRemoveHandlersNotInOS() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // We don't do this on Linux as the OS registration there is not reliable,
+   // and Chrome OS doesn't have any notion of OS registration.
+   // TODO(benwells): When Linux support is more reliable remove this
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn
new file mode 100644
index 000000000000..06da7024e1e3
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn
+@@ -1372,6 +1372,10 @@ static_library("extensions") {
+     deps += [ "//chrome/services/printing/public/mojom" ]
+   }
+ 
++  if (is_bsd) {
++    sources -= [ "api/image_writer_private/removable_storage_provider_linux.cc" ]
++  }
++
+   if (enable_service_discovery) {
+     sources += [
+       "api/mdns/mdns_api.cc",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
new file mode 100644
index 000000000000..06a864400955
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
+@@ -43,7 +43,7 @@
+ #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
+ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
+ #endif
+ 
+@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+   extensions::SettingsPrivateEventRouterFactory::GetInstance();
+   extensions::SettingsOverridesAPI::GetFactoryInstance();
+   extensions::SidePanelService::GetFactoryInstance();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   extensions::SystemIndicatorManagerFactory::GetInstance();
+ #endif
+   extensions::TabGroupsEventRouterFactory::GetInstance();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
new file mode 100644
index 000000000000..5f0523de5f4c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig	2022-07-22 17:30:31 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
+@@ -24,7 +24,7 @@
+ #include "base/win/registry.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/environment.h"
+ #include "base/nix/xdg_util.h"
+ #endif
+@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() {
+   bool got_path = false;
+ #if BUILDFLAG(IS_WIN)
+   got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<base::Environment> env(base::Environment::Create());
+   path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
+                                     base::nix::kDotConfigDir);
+@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() {
+   if (!got_path)
+     return path;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   path = path.AppendASCII("google");
+ #else
+   path = path.AppendASCII("Google");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
new file mode 100644
index 000000000000..277b0a7db4ab
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig	2022-11-30 08:12:58 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc
+@@ -8,7 +8,7 @@
+ 
+ #include "build/build_config.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ #include <memory>
+ #include <utility>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
new file mode 100644
index 000000000000..36906235599b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig	2022-08-31 12:19:35 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h
+@@ -7,7 +7,7 @@
+ 
+ #include "build/build_config.h"
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ #include <vector>
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
new file mode 100644
index 000000000000..971325d39aff
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -0,0 +1,38 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
+@@ -32,7 +32,7 @@
+ #include "components/reporting/util/statusor.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/strings/string_util.h"
+ #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
+ #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h"
+@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+   return info;
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ device_signals::SignalsAggregationRequest CreateAggregationRequest(
+     device_signals::SignalName signal_name) {
+@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+ 
+ // getPersistentSecret
+ 
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ 
+ EnterpriseReportingPrivateGetPersistentSecretFunction::
+     EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
+@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+ }
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ // getFileSystemInfo
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
new file mode 100644
index 000000000000..f8809f86b0d8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
+@@ -20,7 +20,7 @@
+ #include "components/reporting/proto/synced/record.pb.h"
+ #include "components/reporting/proto/synced/record_constants.pb.h"
+ #include "components/reporting/util/statusor.h"
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/time/time.h"
+ #include "components/device_signals/core/browser/signals_types.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+@@ -56,7 +56,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : 
+   ~EnterpriseReportingPrivateGetDeviceIdFunction() override;
+ };
+ 
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ 
+ class EnterpriseReportingPrivateGetPersistentSecretFunction
+     : public ExtensionFunction {
+@@ -266,7 +266,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction
+ 
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ 
+ class EnterpriseReportingPrivateGetFileSystemInfoFunction
+     : public ExtensionFunction {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
new file mode 100644
index 000000000000..87a92318daf3
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
+@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL
+ 
+ void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++#if !BUILDFLAG(IS_BSD)
+   if (g_test_device_list.Get().get() != nullptr) {
+     base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+         FROM_HERE,
+@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis
+        base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN},
+       base::BindOnce(&RemovableStorageProvider::PopulateDeviceList),
+       std::move(callback));
++#else
++  NOTIMPLEMENTED();
++#endif
+ }
+ 
+ // static
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
new file mode 100644
index 000000000000..91fcc20ed463
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc
+@@ -82,7 +82,7 @@ bool NativeProcessLauncher::LaunchNativeProcess(
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   // Don't use no_new_privs mode, e.g. in case the host needs to use sudo.
+   options.allow_new_privs = true;
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
new file mode 100644
index 000000000000..802634836f97
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
+@@ -603,7 +603,7 @@ void PasswordsPrivateDelegateImpl::OnFetchingFamilyMem
+ }
+ 
+ void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   PasswordsPrivateEventRouter* router =
+       PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
+   if (router) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
new file mode 100644
index 000000000000..5c9454eeb598
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig	2023-09-29 10:14:06 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
+   } else if (strcmp(os, "linux") == 0) {
+     info->os = extensions::api::runtime::PlatformOs::kLinux;
+   } else if (strcmp(os, "openbsd") == 0) {
+-    info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
++    info->os = extensions::api::runtime::PlatformOs::kLinux;
++  } else if (strcmp(os, "freebsd") == 0) {
++    info->os = extensions::api::runtime::PlatformOs::kLinux;
+   } else if (strcmp(os, "fuchsia") == 0) {
+     info->os = extensions::api::runtime::PlatformOs::kFuchsia;
+   } else {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc
new file mode 100644
index 000000000000..ab7ab9a7009d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/settings_private/prefs_util.cc
+@@ -199,7 +199,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+   (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   (*s_allowlist)[::prefs::kUseCustomChromeFrame] =
+       settings_api::PrefType::PREF_TYPE_BOOLEAN;
+ #endif
+@@ -211,7 +211,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+       settings_api::PrefType::PREF_TYPE_STRING;
+   (*s_allowlist)[::prefs::kPolicyThemeColor] =
+       settings_api::PrefType::PREF_TYPE_NUMBER;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   (*s_allowlist)[::prefs::kSystemTheme] =
+       settings_api::PrefType::PREF_TYPE_NUMBER;
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc
new file mode 100644
index 000000000000..0a42e29cfbed
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_tabs_tabs__api.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/tabs/tabs_api.cc
+@@ -860,7 +860,7 @@ ExtensionFunction::ResponseAction WindowsCreateFunctio
+ // ui::SHOW_STATE_MINIMIZED above, on Linux the window is not created as
+ // minimized.
+ // TODO(crbug.com/1410400): Remove this workaround when linux is fixed.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1410400): Find a fix for wayland as well.
+ 
+ // Must be defined inside IS_LINUX to compile on windows/mac.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
new file mode 100644
index 000000000000..e0f8858decb5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
+@@ -31,7 +31,7 @@
+ #include "extensions/browser/process_manager.h"
+ #include "extensions/common/error_utils.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "extensions/common/permissions/permissions_data.h"
+ #endif
+ 
+@@ -40,7 +40,7 @@ bool CanEnableAudioDebugRecordingsFromExtension(
+ bool CanEnableAudioDebugRecordingsFromExtension(
+     const extensions::Extension* extension) {
+   bool enabled_by_permissions = false;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (extension) {
+     enabled_by_permissions =
+         extension->permissions_data()->active_permissions().HasAPIPermission(
+@@ -598,7 +598,7 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
+ 
+ ExtensionFunction::ResponseAction
+ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object,
+   // this function shouldn't be called by a component extension on behalf of
+   // some web code. It returns a DirectoryEntry for use directly in the calling
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
new file mode 100644
index 000000000000..da9a51a03c39
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_webstore__private_webstore__private__api.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+@@ -924,7 +924,7 @@ void WebstorePrivateBeginInstallWithManifest3Function:
+         RequestExtensionApproval(contents);
+         return;
+       }
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+       // Shows a parental permission dialog directly bypassing the extension
+       // install dialog view. The parental permission dialog contains a superset
+       // of data from the extension install dialog: requested extension
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc
new file mode 100644
index 000000000000..2f92338c3b30
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_gcm__profile__service__factory.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/gcm/gcm_profile_service_factory.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/gcm/gcm_profile_service_factory.cc
+@@ -91,7 +91,7 @@ GCMProfileService* GCMProfileServiceFactory::GetForPro
+ // static
+ GCMProfileService* GCMProfileServiceFactory::GetForProfile(
+     content::BrowserContext* profile) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On desktop, incognito profiles are checked with IsIncognitoProfile().
+   // It's possible for non-incognito profiles to also be off-the-record.
+   bool is_profile_supported =
+@@ -131,7 +131,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceIn
+ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
+     content::BrowserContext* context) const {
+   Profile* profile = Profile::FromBrowserContext(context);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   DCHECK(!profile->IsIncognitoProfile());
+ #else
+   DCHECK(!profile->IsOffTheRecord());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
new file mode 100644
index 000000000000..de8d94187879
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_gcm_instance__id_instance__id__profile__service__factory.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/browser/gcm/instance_id/instance_id_profile_service_factory.cc
+@@ -16,7 +16,7 @@ namespace instance_id {
+ // static
+ InstanceIDProfileService* InstanceIDProfileServiceFactory::GetForProfile(
+     content::BrowserContext* profile) {
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On desktop, the guest profile is actually the primary OTR profile of
+   // the "regular" guest profile.  The regular guest profile is never used
+   // directly by users.  Also, user are not able to create child OTR profiles
+@@ -61,7 +61,7 @@ InstanceIDProfileServiceFactory::~InstanceIDProfileSer
+ KeyedService* InstanceIDProfileServiceFactory::BuildServiceInstanceFor(
+     content::BrowserContext* context) const {
+   Profile* profile = Profile::FromBrowserContext(context);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On desktop, incognito profiles are checked with IsIncognitoProfile().
+   // It's possible for non-incognito profiles to also be off-the-record.
+   bool is_incognito = profile->IsIncognitoProfile();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn
new file mode 100644
index 000000000000..483961bbc5a5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_router_discovery_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn.orig	2022-10-24 13:33:33 UTC
++++ src/3rdparty/chromium/chrome/browser/media/router/discovery/BUILD.gn
+@@ -80,7 +80,7 @@ static_library("discovery") {
+     "media_sink_discovery_metrics.h",
+   ]
+ 
+-  if (is_linux || is_chromeos) {
++  if ((is_linux || is_chromeos) && !is_bsd) {
+     sources += [ "discovery_network_list_wifi_linux.cc" ]
+   }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc
index 77d0b039dee3..91903778b113 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_capture__policy__utils.cc
@@ -1,20 +1,20 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/capture_policy_utils.cc
-@@ -118,7 +118,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
+@@ -139,7 +139,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
+ }
  
- bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
-     content::BrowserContext* context) {
+ bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) {
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    Profile* profile = Profile::FromBrowserContext(context);
    if (!profile) {
      return false;
-@@ -145,7 +145,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
- bool IsGetDisplayMediaSetSelectAllScreensAllowed(
-     content::BrowserContext* context,
-     const GURL& url) {
+@@ -174,7 +174,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br
+ 
+ bool IsGetAllScreensMediaAllowed(content::BrowserContext* context,
+                                  const GURL& url) {
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    Profile* profile = Profile::FromBrowserContext(context);
-   if (!profile)
+   if (!profile) {
      return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index c53c86c51fbd..e3b515d773a3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/chrome_screen_enumerator.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "ash/shell.h"
  #include "ui/aura/window.h"
@@ -9,7 +9,7 @@
  #include "base/functional/callback.h"
  #include "content/public/browser/desktop_capture.h"
  #endif
-@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
+@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
      root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
  }  // namespace
  
@@ -18,7 +18,7 @@
  namespace {
  base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
      g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
+@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
    return stream_devices_set;
  }
  
@@ -27,7 +27,7 @@
  blink::mojom::StreamDevicesSetPtr EnumerateScreens(
      blink::mojom::MediaStreamType stream_type) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
+@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
    root_windows_for_testing_.Get() = std::move(root_windows);
  }
  
@@ -36,9 +36,9 @@
  void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
      std::unique_ptr<webrtc::DesktopCapturer> capturer) {
    g_desktop_capturer_for_testing.Get() = std::move(capturer);
-@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
-   DCHECK(base::FeatureList::IsEnabled(
-       features::kGetDisplayMediaSetAutoSelectAllScreens));
+@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
+   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+   DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
  
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
index 226274e7a074..1997053b0136 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -43,7 +43,7 @@ const char kProduct[] = "Chrome_ChromeOS";
+@@ -44,7 +44,7 @@ const char kProduct[] = "Chrome_ChromeOS";
  const char kProduct[] = "Chrome_Mac";
  #elif BUILDFLAG(IS_CHROMEOS_ASH)
  const char kProduct[] = "Chrome_ChromeOS";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc
index 647f9df48f94..de2a37accf04 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__log__uploader.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -365,6 +365,10 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -375,6 +375,10 @@ void WebRtcLogUploader::SetupMultipart(
    const char product[] = "Chrome_ChromeOS";
  #elif BUILDFLAG(IS_FUCHSIA)
    const char product[] = "Chrome_Fuchsia";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc
index fdebe744f962..c74047f8bfa1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.cc
-@@ -23,10 +23,10 @@
- #include "content/public/browser/browser_context.h"
+@@ -25,10 +25,10 @@
+ #include "components/webrtc_logging/browser/text_log_list.h"
  #include "content/public/browser/render_process_host.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -13,7 +13,7 @@
  
  using webrtc_event_logging::WebRtcEventLogManager;
  
-@@ -278,7 +278,7 @@ void WebRtcLoggingController::StartEventLogging(
+@@ -285,7 +285,7 @@ void WebRtcLoggingController::StartEventLogging(
          web_app_id, callback);
  }
  
@@ -22,7 +22,7 @@
  void WebRtcLoggingController::GetLogsDirectory(
      LogsDirectoryCallback callback,
      LogsDirectoryErrorCallback error_callback) {
-@@ -323,7 +323,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+@@ -330,7 +330,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
        FROM_HERE,
        base::BindOnce(std::move(callback), file_system.id(), registered_name));
  }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h
index 1ba821af9e7a..49b8eb69053c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_media_webrtc_webrtc__logging__controller.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/browser/media/webrtc/webrtc_logging_controller.h
-@@ -137,7 +137,7 @@ class WebRtcLoggingController
+@@ -138,7 +138,7 @@ class WebRtcLoggingController
                           size_t web_app_id,
                           const StartEventLoggingCallback& callback);
  
@@ -9,9 +9,9 @@
    // Ensures that the WebRTC Logs directory exists and then grants render
    // process access to the 'WebRTC Logs' directory, and invokes |callback| with
    // the ids necessary to create a DirectoryEntry object.
-@@ -196,7 +196,7 @@ class WebRtcLoggingController
-       bool success,
-       const std::string& error_message);
+@@ -203,7 +203,7 @@ class WebRtcLoggingController
+ 
+   content::BrowserContext* GetBrowserContext() const;
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc
new file mode 100644
index 000000000000..f3128071a53f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.cc
@@ -0,0 +1,115 @@
+--- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.cc
+@@ -92,7 +92,7 @@
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #include "chrome/common/chrome_paths_internal.h"
+ #include "chrome/grit/chromium_strings.h"
+ #include "ui/base/l10n/l10n_util.h"
+@@ -183,7 +183,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+   auth_dynamic_params->basic_over_http_enabled =
+       local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   auth_dynamic_params->delegate_by_kdc_policy =
+       local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -241,7 +241,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+   if (g_previously_failed_to_launch_sandboxed_service) {
+     return NetworkSandboxState::kDisabledBecauseOfFailedLaunch;
+   }
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   auto* local_state = g_browser_process->local_state();
+ #endif
+ 
+@@ -262,7 +262,7 @@ NetworkSandboxState IsNetworkSandboxEnabledInternal() 
+   }
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (local_state &&
+       local_state->HasPrefPath(prefs::kNetworkServiceSandboxEnabled)) {
+     return local_state->GetBoolean(prefs::kNetworkServiceSandboxEnabled)
+@@ -457,7 +457,7 @@ void SystemNetworkContextManager::DeleteInstance() {
+   g_system_network_context_manager = nullptr;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ SystemNetworkContextManager::GssapiLibraryLoadObserver::
+     GssapiLibraryLoadObserver(SystemNetworkContextManager* owner)
+     : owner_(owner) {}
+@@ -515,7 +515,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+   pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
+                              auth_pref_callback);
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
+                              auth_pref_callback);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -562,7 +562,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   pref_change_registrar_.Add(
+       prefs::kEnforceLocalAnchorConstraintsEnabled,
+       base::BindRepeating(&SystemNetworkContextManager::
+@@ -611,7 +611,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+   registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
+ #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
+                                 false);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+@@ -640,7 +640,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+   registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
+ #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   // Note that the default value is not relevant because the pref is only
+   // evaluated when it is managed.
+   registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
+@@ -649,11 +649,11 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+ 
+   registry->RegisterListPref(prefs::kExplicitlyAllowedNetworkPorts);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   registry->RegisterBooleanPref(prefs::kNetworkServiceSandboxEnabled, true);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   registry->RegisterBooleanPref(prefs::kReceivedHttpAuthNegotiateHeader, false);
+ #endif  // BUILDFLAG(IS_LINUX)
+ }
+@@ -702,7 +702,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea
+   OnNewHttpAuthDynamicParams(http_auth_dynamic_params);
+   network_service->ConfigureHttpAuthPrefs(std::move(http_auth_dynamic_params));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   gssapi_library_loader_observer_.Install(network_service);
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -1009,7 +1009,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
+ #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ void SystemNetworkContextManager::UpdateEnforceLocalAnchorConstraintsEnabled() {
+   const PrefService::Preference* enforce_local_anchor_constraints_enabled_pref =
+       local_state_->FindPreference(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h
new file mode 100644
index 000000000000..03783d1b1351
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_net_system__network__context__manager.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/net/system_network_context_manager.h
+@@ -185,7 +185,7 @@ class SystemNetworkContextManager {
+   class URLLoaderFactoryForSystem;
+   class NetworkProcessLaunchWatcher;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   class GssapiLibraryLoadObserver
+       : public network::mojom::GssapiLibraryLoadObserver {
+    public:
+@@ -229,7 +229,7 @@ class SystemNetworkContextManager {
+ #endif  // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   // Applies the current value of the kEnforceLocalAnchorConstraintsEnabled
+   // pref to the enforcement state.
+   void UpdateEnforceLocalAnchorConstraintsEnabled();
+@@ -275,7 +275,7 @@ class SystemNetworkContextManager {
+ 
+   static absl::optional<bool> certificate_transparency_enabled_for_testing_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   GssapiLibraryLoadObserver gssapi_library_loader_observer_{this};
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc
new file mode 100644
index 000000000000..01dbe1ca48f5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_browser__prefs.cc
@@ -0,0 +1,69 @@
+--- src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/prefs/browser_prefs.cc
+@@ -478,13 +478,13 @@
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "components/device_signals/core/browser/pref_names.h"  // nogncheck due to crbug.com/1125897
+ #endif
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
+     (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
+ #endif
+@@ -517,7 +517,7 @@
+ #include "chrome/browser/sessions/session_service_log.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/color/system_theme.h"
+ #endif
+ 
+@@ -662,7 +662,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
+ const char kPluginsShowDetails[] = "plugins.show_details";
+ 
+ // Deprecated 02/2023.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+@@ -948,7 +948,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+   // Deprecated 02/2023.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+@@ -1863,12 +1863,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   device_signals::RegisterProfilePrefs(registry);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+         // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
+ #endif
+ 
+@@ -2018,7 +2018,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+   // Added 02/2023
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   local_state->ClearPref(kWebAppsUrlHandlerInfo);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc
new file mode 100644
index 000000000000..30ddf9a2ebc9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_prefs_pref__service__incognito__allowlist.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/chrome/browser/prefs/pref_service_incognito_allowlist.cc
+@@ -168,7 +168,7 @@ const char* const kPersistentPrefNames[] = {
+     prefs::kShowFullscreenToolbar,
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Toggleing custom frames affects all open windows in the profile, hence
+     // should be written to the regular profile when changed in incognito mode.
+     prefs::kUseCustomChromeFrame,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc
new file mode 100644
index 000000000000..8139fb923780
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_print__backend__service__manager.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/browser/printing/print_backend_service_manager.cc
+@@ -33,7 +33,7 @@
+ #include "printing/buildflags/buildflags.h"
+ #include "printing/printing_features.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "content/public/common/content_switches.h"
+ #endif
+ 
+@@ -851,7 +851,7 @@ PrintBackendServiceManager::GetServiceFromBundle(
+         host.BindNewPipeAndPassReceiver(),
+         content::ServiceProcessHost::Options()
+             .WithDisplayName(IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+             .WithExtraCommandLineSwitches({switches::kMessageLoopTypeUi})
+ #endif
+             .Pass());
+@@ -1024,7 +1024,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+       return kNoClientsRegisteredResetOnIdleTimeout;
+ 
+     case ClientType::kQueryWithUi:
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // No need to update if there were other query with UI clients.
+       if (HasQueryWithUiClientForRemoteId(remote_id)) {
+         return absl::nullopt;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc
new file mode 100644
index 000000000000..125dba287eaa
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_printing_printer__query.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/printing/printer_query.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/printing/printer_query.cc
+@@ -361,7 +361,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+     crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
+         print_backend->GetPrinterDriverInfo(printer_name));
+ 
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_CUPS)
++#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && BUILDFLAG(USE_CUPS)
+     PrinterBasicInfo basic_info;
+     if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) ==
+         mojom::ResultCode::kSuccess) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts
new file mode 100644
index 000000000000..e10b79e480c1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_sandbox__internals_sandbox__internals.ts
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig	2023-02-08 09:03:45 UTC
++++ src/3rdparty/chromium/chrome/browser/resources/sandbox_internals/sandbox_internals.ts
+@@ -2,7 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+-// <if expr="is_linux or is_chromeos">
++// <if expr="is_posix or is_chromeos">
+ import './strings.m.js';
+ 
+ import {loadTimeData} from 'chrome://resources/js/load_time_data.js';
+@@ -121,7 +121,7 @@ function androidHandler() {
+ }
+ // </if>
+ 
+-// <if expr="is_linux or is_chromeos">
++// <if expr="is_posix or is_chromeos">
+ 
+ /**
+  * Adds a status row that reports either Yes or No.
+@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => {
+   // <if expr="is_android">
+   androidHandler();
+   // </if>
+-  // <if expr="is_linux or is_chromeos">
++  // <if expr="is_posix or is_chromeos">
+   linuxHandler();
+   // </if>
+ });
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_signin__shared.css b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_signin__shared.css
new file mode 100644
index 000000000000..1a3008147862
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_signin__shared.css
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/resources/signin/signin_shared.css.orig	2022-11-30 08:12:58 UTC
++++ src/3rdparty/chromium/chrome/browser/resources/signin/signin_shared.css
+@@ -54,7 +54,7 @@ a {
+   border-radius: var(--scrollbar-width);
+ }
+ 
+-<if expr="is_macosx or is_linux or is_chromeos">
++<if expr="is_macosx or is_posix or is_chromeos">
+ .action-container {
+   flex-flow: row-reverse;
+   justify-content: flex-start;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
new file mode 100644
index 000000000000..5ec551183f86
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
+@@ -290,7 +290,7 @@
+         autofocus="[[isModalDialog_]]">
+       $i18n{syncConfirmationConfirmLabel}
+     </cr-button>
+-    <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
++    <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
+       <cr-button id="settingsButton" on-click="onGoToSettings_"
+           disabled="[[anyButtonClicked_]]" consent-confirmation>
+         $i18n{syncConfirmationSettingsLabel}
+@@ -300,7 +300,7 @@
+         disabled="[[anyButtonClicked_]]">
+       $i18n{syncConfirmationUndoLabel}
+     </cr-button>
+-    <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
++    <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
+       <cr-button id="settingsButton" on-click="onGoToSettings_"
+           disabled="[[anyButtonClicked_]]" consent-confirmation>
+         $i18n{syncConfirmationSettingsLabel}
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc
new file mode 100644
index 000000000000..565fc76382d7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_about__ui.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/about_ui.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/about_ui.cc
+@@ -635,7 +635,7 @@ std::string ChromeURLs() {
+   return html;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ std::string AboutLinuxProxyConfig() {
+   std::string data;
+   AppendHeader(&data,
+@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest(
+       response =
+           ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
+     }
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
+     response = AboutLinuxProxyConfig();
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc
new file mode 100644
index 000000000000..a7b61b1f993f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/app_home/app_home_page_handler.cc
+@@ -415,7 +415,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+ 
+   bool deprecated_app = false;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   auto* context = extension_system_->extension_service()->GetBrowserContext();
+   deprecated_app =
+       extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
+@@ -478,7 +478,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+     }
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     auto* context = extension_system_->extension_service()->GetBrowserContext();
+     const bool is_deprecated_app =
+         extensions::IsExtensionUnsupportedDeprecatedApp(context,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
new file mode 100644
index 000000000000..a717e9efc5ce
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -0,0 +1,92 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+@@ -213,7 +213,7 @@
+ #include "chrome/browser/ui/webui/chromeos/chrome_url_disabled/chrome_url_disabled_ui.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h"
+ #endif
+ 
+@@ -239,17 +239,17 @@
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/discards/discards_ui.h"
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
+ #endif
+ 
+@@ -402,7 +402,7 @@ bool IsAboutUI(const GURL& url) {
+ #if !BUILDFLAG(IS_ANDROID)
+           || url.host_piece() == chrome::kChromeUITermsHost
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
+ #endif
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -663,7 +663,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+   if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
+     return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
+     return &NewWebUI<WebUIJsErrorUI>;
+ #endif
+@@ -725,7 +725,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+   if (url.host_piece() == chrome::kChromeUINaClHost)
+     return &NewWebUI<NaClUI>;
+ #endif
+-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
+      defined(TOOLKIT_VIEWS)) ||                         \
+     defined(USE_AURA)
+   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
+@@ -794,27 +794,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+   }
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUISandboxHost) {
+     return &NewWebUI<SandboxInternalsUI>;
+   }
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost)
+     return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>;
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUIDiscardsHost)
+     return &NewWebUI<DiscardsUI>;
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost)
+     return &NewWebUI<BrowserSwitchUI>;
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost)
+     return &NewWebUI<WebAppSettingsUI>;
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
new file mode 100644
index 000000000000..1ef21d90c51b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_connectors__internals_device__trust__utils.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/connectors_internals/device_trust_utils.cc
+@@ -6,7 +6,7 @@
+ 
+ #include "build/build_config.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include "base/base64url.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/policy/chrome_browser_policy_connector.h"
+@@ -24,7 +24,7 @@ namespace utils {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ 
+ connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
+     BPKUR::KeyTrustLevel trust_level) {
+@@ -92,7 +92,7 @@ connectors_internals::mojom::Int32ValuePtr ToMojomValu
+ }  // namespace
+ 
+ connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   auto* key_manager = g_browser_process->browser_policy_connector()
+                           ->chrome_browser_cloud_management_controller()
+                           ->GetDeviceTrustKeyManager();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc
new file mode 100644
index 000000000000..c5e532d3d32b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui.cc
+@@ -92,7 +92,7 @@ content::WebUIDataSource* CreateAndAddManagementUIHtml
+     {kManagementOnFileTransferVisibleData,
+      IDS_MANAGEMENT_FILE_TRANSFER_VISIBLE_DATA},
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {kManagementScreenCaptureEvent, IDS_MANAGEMENT_SCREEN_CAPTURE_EVENT},
+     {kManagementScreenCaptureData, IDS_MANAGEMENT_SCREEN_CAPTURE_DATA},
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc
new file mode 100644
index 000000000000..084248a340c7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -0,0 +1,53 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.cc
+@@ -94,7 +94,7 @@
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
+ #include "components/device_signals/core/browser/user_permission_service.h"  // nogncheck
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -190,12 +190,12 @@ enum class ReportingType {
+   kLegacyTech,
+ };
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kManagementScreenCaptureEvent[] = "managementScreenCaptureEvent";
+ const char kManagementScreenCaptureData[] = "managementScreenCaptureData";
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const char kManagementDeviceSignalsDisclosure[] =
+     "managementDeviceSignalsDisclosure";
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -773,7 +773,7 @@ void ManagementUIHandler::AddReportingInfo(base::Value
+              GetReportingTypeValue(report_definition.reporting_type));
+     report_sources->Append(std::move(data));
+   }
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Insert the device signals consent disclosure at the end of browser
+   // reporting section.
+   auto* user_permission_service = GetUserPermissionService();
+@@ -1061,7 +1061,7 @@ base::Value::Dict ManagementUIHandler::GetThreatProtec
+                                   kManagementOnPageVisitedVisibleData, &info);
+   }
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
+     AddThreatProtectionPermission(kManagementScreenCaptureEvent,
+                                   kManagementScreenCaptureData, &info);
+@@ -1145,7 +1145,7 @@ policy::PolicyService* ManagementUIHandler::GetPolicyS
+       ->policy_service();
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ device_signals::UserPermissionService*
+ ManagementUIHandler::GetUserPermissionService() {
+   return enterprise_signals::UserPermissionServiceFactory::GetForProfile(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h
new file mode 100644
index 000000000000..fb7c7572967b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_management_management__ui__handler.h
@@ -0,0 +1,37 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/management/management_ui_handler.h
+@@ -24,14 +24,14 @@
+ #include "extensions/common/extension_id.h"
+ #include "url/gurl.h"
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Constants defining the IDs for the localized strings sent to the page as
+ // load time data.
+ extern const char kManagementScreenCaptureEvent[];
+ extern const char kManagementScreenCaptureData[];
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ extern const char kManagementDeviceSignalsDisclosure[];
+ #endif  // #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
+@@ -117,7 +117,7 @@ class StatusCollector;
+ class SystemLogUploader;
+ }  // namespace policy
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace device_signals {
+ class UserPermissionService;
+ }  // namespace device_signals
+@@ -177,7 +177,7 @@ class ManagementUIHandler : public content::WebUIMessa
+   base::Value::List GetManagedWebsitesInfo(Profile* profile) const;
+   base::Value::List GetApplicationsInfo(Profile* profile) const;
+   virtual policy::PolicyService* GetPolicyService();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   virtual device_signals::UserPermissionService* GetUserPermissionService();
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc
new file mode 100644
index 000000000000..8bf838a52106
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_ntp_app__launcher__handler.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+@@ -320,7 +320,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
+   bool is_deprecated_app = false;
+   auto* context = extension_service_->GetBrowserContext();
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   is_deprecated_app =
+       extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc
new file mode 100644
index 000000000000..286837de110d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_realbox_realbox__handler.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/realbox/realbox_handler.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/realbox/realbox_handler.cc
+@@ -146,7 +146,7 @@ constexpr char kMacShareIconResourceName[] =
+ #elif BUILDFLAG(IS_WIN)
+ constexpr char kWinShareIconResourceName[] =
+     "//resources/cr_components/omnibox/icons/win_share.svg";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr char kLinuxShareIconResourceName[] =
+     "//resources/cr_components/omnibox/icons/share.svg";
+ #else
+@@ -745,7 +745,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
+       icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
+     return kWinShareIconResourceName;
+   }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (icon.name == omnibox::kShareIcon.name ||
+       icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
+     return kLinuxShareIconResourceName;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc
new file mode 100644
index 000000000000..17580c061f6b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2022-10-24 13:33:33 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/settings/appearance_handler.cc
+@@ -28,7 +28,7 @@ void AppearanceHandler::RegisterMessages() {
+       "useDefaultTheme",
+       base::BindRepeating(&AppearanceHandler::HandleUseTheme,
+                           base::Unretained(this), ui::SystemTheme::kDefault));
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   web_ui()->RegisterMessageCallback(
+       "useGtkTheme",
+       base::BindRepeating(&AppearanceHandler::HandleUseTheme,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
new file mode 100644
index 000000000000..e93abe0efa2d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -0,0 +1,65 @@
+--- src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+@@ -135,7 +135,7 @@
+ #include "ash/webui/settings/public/constants/routes.mojom.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+ #include "ui/display/screen.h"
+ #endif
+ 
+@@ -155,7 +155,7 @@
+ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui_factory.h"
+ #include "ui/ozone/public/ozone_platform.h"
+ #endif
+@@ -263,7 +263,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
+       base::FeatureList::IsEnabled(
+           supervised_user::kClearingCookiesKeepsSupervisedUsersSignedIn));
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
+ #else
+   bool allow_qt_theme = false;
+@@ -294,7 +294,7 @@ void AddA11yStrings(content::WebUIDataSource* html_sou
+     {"focusHighlightLabel",
+      IDS_SETTINGS_ACCESSIBILITY_FOCUS_HIGHLIGHT_DESCRIPTION},
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     {"overscrollHistoryNavigationTitle",
+      IDS_SETTINGS_OVERSCROLL_HISTORY_NAVIGATION_TITLE},
+     {"overscrollHistoryNavigationSubtitle",
+@@ -433,7 +433,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+     {"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
+     {"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
+     {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     {"gtkTheme", IDS_SETTINGS_GTK_THEME},
+     {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
+     {"qtTheme", IDS_SETTINGS_QT_THEME},
+@@ -443,7 +443,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ #else
+     {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
+ #endif
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+     {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
+ #endif
+ #if BUILDFLAG(IS_MAC)
+@@ -468,7 +468,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+   bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance()
+                                       ->GetPlatformRuntimeProperties()
+                                       .supports_server_side_window_decorations;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h
new file mode 100644
index 000000000000..2c5c06693e34
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info.h
@@ -0,0 +1,18 @@
+--- src/3rdparty/chromium/chrome/common/channel_info.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/chrome/common/channel_info.h
+@@ -104,13 +104,13 @@ void ClearChannelForTesting();
+ std::string GetChannelSuffixForDataDir();
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string GetChannelSuffixForExtraFlagsEnvVarName();
+ #endif
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ // Returns the channel-specific filename of the desktop shortcut used to launch
+ // the browser.
+ std::string GetDesktopName(base::Environment* env);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc
new file mode 100644
index 000000000000..e0d82654c4e1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_channel__info__posix.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/common/channel_info_posix.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/chrome/common/channel_info_posix.cc
+@@ -92,7 +92,7 @@ std::string GetChannelSuffixForDataDir() {
+   }
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string GetChannelSuffixForExtraFlagsEnvVarName() {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+   const auto channel_state = GetChannelImpl();
+@@ -118,7 +118,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName() 
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ std::string GetDesktopName(base::Environment* env) {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+   // Google Chrome packaged as a snap is a special case: the application name
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc
new file mode 100644
index 000000000000..18a04c2ad7dd
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.cc
@@ -0,0 +1,83 @@
+--- src/3rdparty/chromium/chrome/common/chrome_features.cc.orig	2024-01-23 10:07:29 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_features.cc
+@@ -74,7 +74,7 @@ BASE_FEATURE(kAppShimNotificationAttribution,
+ 
+ // Enables the built-in DNS resolver.
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kAsyncDns,
+              "AsyncDns",
+              base::FEATURE_ENABLED_BY_DEFAULT
+@@ -87,7 +87,7 @@ BASE_FEATURE(kAsyncDns,
+ #endif
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ // Enables or disables the Autofill survey triggered by opening a prompt to
+ // save address info.
+ BASE_FEATURE(kAutofillAddressSurvey,
+@@ -105,7 +105,7 @@ BASE_FEATURE(kAutofillPasswordSurvey,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Enables the Restart background mode optimization. When all Chrome UI is
+ // closed and it goes in the background, allows to restart the browser to
+ // discard memory.
+@@ -301,7 +301,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ // Enables or disables Desktop PWAs to be auto-started on OS login.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
+              "DesktopPWAsRunOnOsLogin",
+              base::FEATURE_ENABLED_BY_DEFAULT
+@@ -335,7 +335,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
+ // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
+ // Apps will not launch and will be marked in the UI as deprecated.
+@@ -366,7 +366,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
+ 
+ // Enable DNS over HTTPS (DoH).
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kDnsOverHttps,
+              "DnsOverHttps",
+              base::FEATURE_ENABLED_BY_DEFAULT
+@@ -387,7 +387,7 @@ const base::FeatureParam<bool> kDnsOverHttpsShowUiPara
+ const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
+   &kDnsOverHttps, "ShowUi",
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       true
+ #else
+       false
+@@ -875,7 +875,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+              "KAnonymityServiceStorage",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kLinuxLowMemoryMonitor,
+              "LinuxLowMemoryMonitor",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -888,7 +888,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+     &kLinuxLowMemoryMonitor, "critical_level", 255};
+ #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kListWebAppsSwitch,
+              "ListWebAppsSwitch",
+              base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h
new file mode 100644
index 000000000000..033e2af8b846
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__features.h
@@ -0,0 +1,45 @@
+--- src/3rdparty/chromium/chrome/common/chrome_features.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_features.h
+@@ -61,13 +61,13 @@ BASE_DECLARE_FEATURE(kAppShimNotificationAttribution);
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillAddressSurvey);
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillCardSurvey);
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAutofillPasswordSurvey);
+ #endif
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
+@@ -499,7 +499,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
+ 
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
+@@ -507,7 +507,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+ extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
+ #endif  // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kListWebAppsSwitch);
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
new file mode 100644
index 000000000000..5ea4fc7401a8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc
@@ -0,0 +1,84 @@
+--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
+@@ -30,7 +30,7 @@
+ #include "base/apple/foundation_util.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+ #include "components/policy/core/common/policy_paths.h"
+ #endif
+ 
+@@ -49,14 +49,14 @@
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // The path to the external extension <id>.json files.
+ // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
+ const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-    FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
++    FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
+ #else
+-    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
++    FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ 
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -211,7 +211,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       }
+       break;
+     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+       if (!GetUserDownloadsDirectorySafe(&cur)) {
+         return false;
+       }
+@@ -504,7 +504,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         return false;
+       }
+       break;
+-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+     case chrome::DIR_POLICY_FILES: {
+       cur = base::FilePath(policy::kPolicyPath);
+       break;
+@@ -515,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) {
+ #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
+     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+      BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
+       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) {
+         return false;
+@@ -524,7 +524,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       break;
+     }
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
+       cur = base::FilePath(kFilepathSinglePrefExtensions);
+       break;
+@@ -571,7 +571,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       break;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+     case chrome::DIR_NATIVE_MESSAGING:
+ #if BUILDFLAG(IS_MAC)
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+@@ -585,6 +585,9 @@ bool PathProvider(int key, base::FilePath* result) {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+       cur = base::FilePath(
+           FILE_PATH_LITERAL("/etc/opt/chrome/native-messaging-hosts"));
++#elif BUILDFLAG(IS_FREEBSD)
++      cur = base::FilePath(FILE_PATH_LITERAL(
++          "/usr/local/etc/chromium/native-messaging-hosts"));
+ #else
+       cur = base::FilePath(
+           FILE_PATH_LITERAL("/etc/chromium/native-messaging-hosts"));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h
new file mode 100644
index 000000000000..7a1e8b1854d5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_paths.h
+@@ -57,7 +57,7 @@ enum {
+ #if BUILDFLAG(IS_CHROMEOS_ASH) ||                              \
+     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+      BUILDFLAG(CHROMIUM_BRANDING)) ||                          \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
+                                  // on Chrome Mac and Chromium Linux.
+                                  // On Chrome OS, this path is used for OEM
+@@ -65,7 +65,7 @@ enum {
+                                  // create it.
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
+                                        // definition manifest files that
+                                        // describe extensions which are to be
+@@ -123,7 +123,7 @@ enum {
+                           // must be cleared on device reboot.
+ 
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   DIR_NATIVE_MESSAGING,       // System directory where native messaging host
+                               // manifest files are stored.
+   DIR_USER_NATIVE_MESSAGING,  // Directory with Native Messaging Hosts
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h
new file mode 100644
index 000000000000..ef783e50e09d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_paths_internal.h
+@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+ // Get the path to the user's documents directory.
+ bool GetUserDocumentsDirectory(base::FilePath* result);
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Gets the path to a safe default download directory for a user.
+ bool GetUserDownloadsDirectorySafe(base::FilePath* result);
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc
new file mode 100644
index 000000000000..a75007a16709
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc
@@ -0,0 +1,19 @@
+--- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_switches.cc
+@@ -849,14 +849,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+ #endif
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon";
+ 
+ // Causes the browser to launch directly in guest mode.
+ const char kGuest[] = "guest";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Writes open and installed web apps for each profile to the specified file
+ // without launching a new browser window or tab. Pass a absolute file path to
+ // specify where to output the information. Can be used together with optional
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h
new file mode 100644
index 000000000000..409d50bc04d6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h
@@ -0,0 +1,17 @@
+--- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/chrome_switches.h
+@@ -269,12 +269,12 @@ extern const char kAllowNaClSocketAPI[];
+ #endif
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ extern const char kEnableNewAppMenuIcon[];
+ extern const char kGuest[];
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ extern const char kListApps[];
+ extern const char kProfileBaseName[];
+ extern const char kProfileManagementAttributes[];
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc
new file mode 100644
index 000000000000..495166345ead
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_permissions_chrome__permission__message__rules.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc
+@@ -287,7 +287,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId()
+ #endif
+ #if BUILDFLAG(IS_WIN)
+   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN;
+-#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) or BUILDFLAG(IS_BSD)
+   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS;
+ #else
+   return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__host__file__path.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__host__file__path.cc
new file mode 100644
index 000000000000..1ae38d605706
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__host__file__path.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/media/cdm_host_file_path.cc.orig	2023-02-08 09:03:45 UTC
++++ src/3rdparty/chromium/chrome/common/media/cdm_host_file_path.cc
+@@ -90,7 +90,7 @@ void AddCdmHostFilePaths(
+   cdm_host_file_paths->emplace_back(chrome_framework_path,
+                                     chrome_framework_sig_path);
+ 
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ 
+   base::FilePath chrome_exe_dir;
+   if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir))
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc
new file mode 100644
index 000000000000..e6eee8f508c5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_cdm__registration.cc
@@ -0,0 +1,52 @@
+--- src/3rdparty/chromium/chrome/common/media/cdm_registration.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/media/cdm_registration.cc
+@@ -25,11 +25,11 @@
+ 
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"  // nogncheck
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "base/native_library.h"
+ #include "chrome/common/chrome_paths.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/no_destructor.h"
+ #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h"
+ #include "components/cdm/common/cdm_manifest.h"
+@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness;
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+ #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) ||            \
+      BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and
+ // |capability|.
+ std::unique_ptr<content::CdmInfo> CreateWidevineCdmInfo(
+@@ -101,7 +101,7 @@ std::unique_ptr<content::CdmInfo> CreateCdmInfoFromWid
+         // BUILDFLAG(IS_CHROMEOS))
+ 
+ #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // On Linux/ChromeOS we have to preload the CDM since it uses the zygote
+ // sandbox. On Windows and Mac, the bundled CDM is handled by the component
+ // updater.
+@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() {
+         // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
+ 
+ #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \
+-    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ // This code checks to see if a component updated Widevine CDM can be found. If
+ // there is one and it looks valid, return the CdmInfo for that CDM. Otherwise
+ // return nullptr.
+@@ -160,7 +160,7 @@ void AddSoftwareSecureWidevine(std::vector<content::Cd
+       /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName,
+       kWidevineCdmType, base::Version(), base::FilePath());
+ 
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
+   base::Version glibc_version(gnu_get_libc_version());
+   DCHECK(glibc_version.IsValid());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h
new file mode 100644
index 000000000000..c5be9ae3d7d6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_media_component__widevine__cdm__hint__file__linux.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/media/component_widevine_cdm_hint_file_linux.h
+@@ -15,7 +15,7 @@
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+ #error "This file only applies to desktop Linux and ChromeOS."
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h
new file mode 100644
index 000000000000..b83fa0c4e311
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_pref__names.h
@@ -0,0 +1,82 @@
+--- src/3rdparty/chromium/chrome/common/pref_names.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/pref_names.h
+@@ -1316,7 +1316,7 @@ inline constexpr char kUseAshProxy[] = "lacros.proxy.u
+ 
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ // Linux specific preference on whether we should match the system theme.
+ inline constexpr char kSystemTheme[] = "extensions.theme.system_theme";
+ #endif
+@@ -1442,7 +1442,7 @@ inline constexpr char kShowUpdatePromotionInfoBar[] =
+     "browser.show_update_promotion_info_bar";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Boolean that is false if we should show window manager decorations.  If
+ // true, we draw a custom chrome frame (thicker title bar and blue border).
+ inline constexpr char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
+@@ -1986,7 +1986,7 @@ inline constexpr char kDownloadLastCompleteTime[] =
+     "download.last_complete_time";
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ inline constexpr char kOpenPdfDownloadInSystemReader[] =
+     "download.open_pdf_in_system_reader";
+ #endif
+@@ -2392,14 +2392,14 @@ inline constexpr char kMediaStorageIdSalt[] = "media.s
+ inline constexpr char kMediaCdmOriginData[] = "media.cdm.origin_data";
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // A boolean pref to determine whether or not the network service is running
+ // sandboxed.
+ inline constexpr char kNetworkServiceSandboxEnabled[] =
+     "net.network_service_sandbox";
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Records whether the user has seen an HTTP auth "negotiate" header.
+ inline constexpr char kReceivedHttpAuthNegotiateHeader[] =
+     "net.received_http_auth_negotiate_headers";
+@@ -2477,7 +2477,7 @@ inline constexpr char kAmbientAuthenticationInPrivateM
+ inline constexpr char kBasicAuthOverHttpEnabled[] =
+     "auth.basic_over_http_enabled";
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
+ // along with kAuthNegotiateDelegateAllowlist.
+ inline constexpr char kAuthNegotiateDelegateByKdcPolicy[] =
+@@ -3551,7 +3551,7 @@ inline constexpr char kFileOrDirectoryPickerWithoutGes
+ inline constexpr char kSandboxExternalProtocolBlocked[] =
+     "profile.sandbox_external_protocol_blocked";
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Boolean that indicates if system notifications are allowed to be used in
+ // place of Chrome notifications.
+ inline constexpr char kAllowSystemNotifications[] =
+@@ -3607,7 +3607,7 @@ inline constexpr char kCACertificateManagementAllowed[
+ inline constexpr char kChromeRootStoreEnabled[] = "chrome_root_store_enabled";
+ #endif
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ inline constexpr char kEnforceLocalAnchorConstraintsEnabled[] =
+     "enforce_local_anchor_constraints_enabled";
+ #endif
+@@ -3921,7 +3921,7 @@ inline constexpr char kThrottleNonVisibleCrossOriginIf
+ inline constexpr char kNewBaseUrlInheritanceBehaviorAllowed[] =
+     "new_base_url_inheritance_behavior_allowed";
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If this exists and is true, Chrome may run system DNS resolution out of the
+ // network process. If false, Chrome will run system DNS resolution in the
+ // network process. If non-existent, Chrome will decide where to run system DNS
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc
new file mode 100644
index 000000000000..4e4c4256a7c0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/url_constants.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/url_constants.cc
+@@ -560,7 +560,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+     "https://support.google.com/chromebook/?p=multidevice";
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ const char kChromeAppsDeprecationLearnMoreURL[] =
+     "https://support.google.com/chrome/?p=chrome_app_deprecation";
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h
new file mode 100644
index 000000000000..f6a5d2a1b0dd
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_url__constants.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/common/url_constants.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/chrome/common/url_constants.h
+@@ -537,7 +537,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+ extern const char kPhoneHubPermissionLearnMoreURL[];
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ 
+ // "Learn more" URL for the chrome apps deprecation dialog.
+ extern const char kChromeAppsDeprecationLearnMoreURL[];
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
index d77fe97d96d2..b6a7bd6460f4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
-@@ -514,18 +514,18 @@ const char kOsUIVersionURL[] = "os://version";
+@@ -503,18 +503,18 @@ const char kOsUIVersionURL[] = "os://version";
  const char kOsUIVersionURL[] = "os://version";
  #endif
  
@@ -22,7 +22,7 @@
  const char kChromeUIDiscardsHost[] = "discards";
  const char kChromeUIDiscardsURL[] = "chrome://discards/";
  #endif
-@@ -540,14 +540,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -529,14 +529,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -39,7 +39,7 @@
  const char kChromeUIBrowserSwitchHost[] = "browser-switch";
  const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/";
  const char kChromeUIEnterpriseProfileWelcomeHost[] =
-@@ -564,7 +564,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta
+@@ -555,7 +555,7 @@ const char kChromeUIProfilePickerStartupQuery[] = "sta
  const char kChromeUIProfilePickerStartupQuery[] = "startup";
  #endif
  
@@ -48,7 +48,7 @@
       defined(TOOLKIT_VIEWS)) ||                         \
      defined(USE_AURA)
  const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -644,7 +644,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -637,7 +637,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
  const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
  const char kChromeUIWebAppSettingsHost[] = "app-settings";
  #endif
-@@ -880,7 +880,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -888,7 +888,7 @@ const char* const kChromeDebugURLs[] = {
      blink::kChromeUIGpuJavaCrashURL,
      kChromeUIJavaCrashURL,
  #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
index 595b89b1194f..0d4b951f5af2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
-@@ -433,24 +433,24 @@ extern const char kOsUIVersionURL[];
+@@ -420,24 +420,24 @@ extern const char kOsUIVersionURL[];
  extern const char kOsUIVersionURL[];
  #endif
  
@@ -29,7 +29,7 @@
  extern const char kChromeUIWebAppSettingsURL[];
  extern const char kChromeUIWebAppSettingsHost[];
  #endif
-@@ -465,14 +465,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -452,7 +452,7 @@ extern const char kChromeUILinuxProxyConfigHost[];
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -38,15 +38,16 @@
  extern const char kChromeUISandboxHost[];
  #endif
  
+@@ -464,7 +464,7 @@ extern const char kChromeUISearchEngineChoiceHost[];
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \
 -    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
++    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
  extern const char kChromeUIBrowserSwitchHost[];
  extern const char kChromeUIBrowserSwitchURL[];
  extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -486,7 +486,7 @@ extern const char kChromeUIProfilePickerStartupQuery[]
+@@ -480,7 +480,7 @@ extern const char kChromeUIProfilePickerStartupQuery[]
  extern const char kChromeUIProfilePickerStartupQuery[];
  #endif
  
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc
index ecb4426cda6b..92600c40052b 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_chrome__render__frame__observer.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_render_frame_observer.cc.orig	2024-04-19 13:02:56 UTC
-+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -358,7 +358,7 @@ void ChromeRenderFrameObserver::WillDetach(blink::Deta
+--- src/3rdparty/chromium/chrome/renderer/chrome_render_frame_observer.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/renderer/chrome_render_frame_observer.cc
+@@ -349,7 +349,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
  
  void ChromeRenderFrameObserver::DraggableRegionsChanged() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn
new file mode 100644
index 000000000000..67fbfe0dbd94
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/chrome/test/BUILD.gn.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/chrome/test/BUILD.gn
+@@ -11028,7 +11028,7 @@ test("chrome_app_unittests") {
+     "//components/heap_profiling/in_process",
+     "//components/safe_browsing:buildflags",
+   ]
+-  if (!is_fuchsia && !is_mac) {
++  if (!is_fuchsia && !is_mac && !is_bsd) {
+     deps += [ "//third_party/breakpad:client" ]
+   }
+   if (is_android) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc
new file mode 100644
index 000000000000..3445ef9a0d31
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome__launcher.cc
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/chrome/test/chromedriver/chrome_launcher.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/chrome/test/chromedriver/chrome_launcher.cc
+@@ -69,6 +69,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #elif BUILDFLAG(IS_WIN)
+ #include <windows.h>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc
new file mode 100644
index 000000000000..0bdc905691f4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2023-08-04 12:03:57 UTC
++++ src/3rdparty/chromium/chrome/test/chromedriver/chrome/chrome_finder.cc
+@@ -57,7 +57,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l
+         installation_locations[i].Append(L"Chromium\\Application"));
+   }
+ }
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
+   // TODO: Respect users' PATH variables.
+   // Until then, we use an approximation of the most common defaults.
+@@ -157,7 +157,7 @@ bool FindChrome(base::FilePath* browser_exe) {
+     base::FilePath(chrome::kGoogleChromeForTestingBrowserProcessExecutablePath),
+     base::FilePath(chrome::kGoogleChromeBrowserProcessExecutablePath),
+     base::FilePath(chrome::kChromiumBrowserProcessExecutablePath),
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     base::FilePath(chrome::kBrowserProcessExecutablePath),
+     base::FilePath("chrome"),  // Chrome for Testing or Google Chrome
+     base::FilePath("google-chrome"),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp
index 2b6ae7227567..1e0b53511ea1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill__payments__strings.grdp
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/autofill_payments_strings.grdp.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/components/autofill_payments_strings.grdp.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/autofill_payments_strings.grdp
-@@ -118,7 +118,7 @@
+@@ -130,7 +130,7 @@
    <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
      Save card
    </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc
new file mode 100644
index 000000000000..b80b75fc5ee4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_contact__info__sync__util.cc
@@ -0,0 +1,18 @@
+--- src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/autofill/core/browser/contact_info_sync_util.cc
+@@ -174,9 +174,15 @@ class ContactInfoProfileSetter {
+     CHECK(observations.empty());
+     for (const sync_pb::ContactInfoSpecifics::Observation& proto_observation :
+          proto_observations) {
++#if defined(__clang__) && (__clang_major__ >= 15)
+       observations.emplace_back(proto_observation.type(),
+                                 ProfileTokenQuality::FormSignatureHash(
+                                     proto_observation.form_hash()));
++#else
++      observations.emplace_back() = { static_cast<unsigned char>(proto_observation.type()),
++                                ProfileTokenQuality::FormSignatureHash(
++                                    proto_observation.form_hash()) };
++#endif
+     }
+   }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc
index 2b1ac7181e5a..69dc752cebd1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/autofill/core/browser/personal_data_manager.cc
-@@ -2253,7 +2253,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2492,7 +2492,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -9,4 +9,4 @@
 +    BUILDFLAG(IS_BSD)
    // This option should only be shown for users that have not enabled the Sync
    // Feature and that have server credit cards available.
-   if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() ||
+   // TODO(crbug.com/1462552): Simplify once ConsentLevel::kSync and
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc
new file mode 100644
index 000000000000..8e4f33f7ee9e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_browser_webdata_autofill__sync__bridge__util.cc
@@ -0,0 +1,22 @@
+--- src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/autofill/core/browser/webdata/autofill_sync_bridge_util.cc
+@@ -553,11 +553,19 @@ ServerCvc AutofillWalletCvcStructDataFromWalletCredent
+   base::StringToInt64(wallet_credential_specifics.instrument_id(),
+                       &instrument_id);
+ 
++#if defined(__clang__) && (__clang_major__ >= 15)
+   return ServerCvc(
+       instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()),
+       base::Time::UnixEpoch() +
+           base::Milliseconds(wallet_credential_specifics
+                                  .last_updated_time_unix_epoch_millis()));
++#else
++  return ServerCvc( {
++      instrument_id, base::UTF8ToUTF16(wallet_credential_specifics.cvc()),
++      base::Time::UnixEpoch() +
++          base::Milliseconds(wallet_credential_specifics
++                                 .last_updated_time_unix_epoch_millis()) });
++#endif
+ }
+ 
+ VirtualCardUsageData VirtualCardUsageDataFromUsageSpecifics(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc
index 175dce1c3881..a9efef1f1241 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/autofill/core/common/autofill_payments_features.cc
-@@ -270,7 +270,7 @@ const base::FeatureParam<int>
+@@ -281,7 +281,7 @@ BASE_FEATURE(kEnablePixPayments,
  bool ShouldShowImprovedUserConsentForCreditCardSave() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc
index 45ed3e6c7a57..3050c1af8432 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_autofill_core_common_autofill__util.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/autofill/core/common/autofill_util.cc
-@@ -156,7 +156,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
+@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value
  
  bool ShouldAutoselectFirstSuggestionOnArrowDown() {
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp
new file mode 100644
index 000000000000..c2c2bfd11d9c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_commerce__strings.grdp
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/commerce_strings.grdp.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/commerce_strings.grdp
+@@ -292,7 +292,7 @@
+     <message name="IDS_PRICE_HISTORY_DESCRIPTION" desc="The description of the Price History section in the Shopping Insights side panel explaining how the prices are gathered.">
+       Typical prices are based on stores across the web over the past 90 days.
+     </message>
+-    <if expr="is_win or is_linux">
++    <if expr="is_win or is_posix">
+       <then>
+         <message name="IDS_PRICE_HISTORY_GRAPH_ACCESSIBILITY" desc="Accessibility string for the price history graph indicating how users can review the price changes on the graph.">
+           Browse mode, you can change to Forms mode to use the left/right arrow to review price changes on the graph
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd
index 33e63f90895e..e9a83b5cca65 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__chromium__strings.grd
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/components_chromium_strings.grd.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/components/components_chromium_strings.grd.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/components/components_chromium_strings.grd
-@@ -220,7 +220,7 @@
+@@ -226,7 +226,7 @@
          </message>
        </if>
        <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd
index d3c31feb7f34..9e9e4e219df3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_components__google__chrome__strings.grd
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/components_google_chrome_strings.grd.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/components/components_google_chrome_strings.grd.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/components/components_google_chrome_strings.grd
-@@ -220,7 +220,7 @@
+@@ -226,7 +226,7 @@
          </message>
        </if>
        <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn
index 0a45f6bb117d..0df6ae034759 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/components/crash/core/app/BUILD.gn.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/crash/core/app/BUILD.gn
-@@ -52,7 +52,7 @@ static_library("app") {
+@@ -72,7 +72,7 @@ static_library("app") {
      "crashpad.h",
    ]
  
@@ -9,7 +9,7 @@
      sources += [ "crashpad_linux.cc" ]
    }
  
-@@ -65,6 +65,10 @@ static_library("app") {
+@@ -85,6 +85,10 @@ static_library("app") {
      ]
    }
  
@@ -20,7 +20,7 @@
    defines = [ "CRASH_IMPLEMENTATION" ]
  
    public_deps = [ ":lib" ]
-@@ -96,7 +100,7 @@ static_library("app") {
+@@ -113,7 +117,7 @@ static_library("app") {
      libs = [ "log" ]
    }
  
@@ -29,7 +29,7 @@
      deps += [
        "//base:base_static",
        "//components/crash/core/common",
-@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -241,11 +245,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
    # define custom UserStreamDataSources.
    executable("chrome_crashpad_handler") {
      sources = [ "chrome_crashpad_handler.cc" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc
new file mode 100644
index 000000000000..c8ec0dfb2bf6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_app_chrome__crashpad__handler.cc
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/components/crash/core/app/chrome_crashpad_handler.cc.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/components/crash/core/app/chrome_crashpad_handler.cc
+@@ -6,5 +6,9 @@
+ extern "C" int CrashpadHandlerMain(int argc, char* argv[]);
+ 
+ int main(int argc, char* argv[]) {
++#if defined(__OpenBSD__) || defined(__FreeBSD__)
++  return -1;
++#else
+   return CrashpadHandlerMain(argc, argv);
++#endif
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc
new file mode 100644
index 000000000000..52f8cda11e33
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_browser_crash__upload__list__crashpad.cc
@@ -0,0 +1,26 @@
+--- src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/crash/core/browser/crash_upload_list_crashpad.cc
+@@ -38,7 +38,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() = 
+ std::vector<std::unique_ptr<UploadList::UploadInfo>>
+ CrashUploadListCrashpad::LoadUploadList() {
+   std::vector<crash_reporter::Report> reports;
++#if !BUILDFLAG(IS_BSD)
+   crash_reporter::GetReports(&reports);
++#endif
+ 
+   std::vector<std::unique_ptr<UploadInfo>> uploads;
+   for (const crash_reporter::Report& report : reports) {
+@@ -52,9 +54,13 @@ CrashUploadListCrashpad::LoadUploadList() {
+ 
+ void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin,
+                                               const base::Time& end) {
++#if !BUILDFLAG(IS_BSD)
+   crash_reporter::ClearReportsBetween(begin, end);
++#endif
+ }
+ 
+ void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) {
++#if !BUILDFLAG(IS_BSD)
+   crash_reporter::RequestSingleCrashUpload(local_id);
++#endif
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
index f1bbd08b7b3a..71e24e436073 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
-@@ -8,7 +8,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
+@@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
  
  declare_args() {
    # If set to true, this will stub out and disable the entire crash key system.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_mock__signals__aggregator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_mock__signals__aggregator.h
new file mode 100644
index 000000000000..c10e886469e8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_mock__signals__aggregator.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/mock_signals_aggregator.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/mock_signals_aggregator.h
+@@ -17,7 +17,7 @@ class MockSignalsAggregator : public SignalsAggregator
+   MockSignalsAggregator();
+   ~MockSignalsAggregator() override;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   MOCK_METHOD(void,
+               GetSignalsForUser,
+               (const UserContext&,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator.h
new file mode 100644
index 000000000000..8945a39bfae4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator.h
+@@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedService {
+ 
+   ~SignalsAggregator() override = default;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Will asynchronously collect signals whose names are specified in the
+   // `request` object, and will also use a `user_context` to validate that the
+   // user has permissions to the device's signals. Invokes `callback` with the
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.cc
new file mode 100644
index 000000000000..b969d8274da0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator_impl.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator_impl.cc
+@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl(
+ 
+ SignalsAggregatorImpl::~SignalsAggregatorImpl() = default;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void SignalsAggregatorImpl::GetSignalsForUser(
+     const UserContext& user_context,
+     const SignalsAggregationRequest& request,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.h
new file mode 100644
index 000000000000..16687e49a244
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_signals__aggregator__impl.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator_impl.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/signals_aggregator_impl.h
+@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public SignalsAggregator
+   ~SignalsAggregatorImpl() override;
+ 
+   // SignalsAggregator:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void GetSignalsForUser(const UserContext& user_context,
+                          const SignalsAggregationRequest& request,
+                          GetSignalsCallback callback) override;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service.h
new file mode 100644
index 000000000000..7e4320d11974
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service.h
+@@ -57,7 +57,7 @@ class UserPermissionService : public KeyedService {
+   // missing.
+   virtual bool ShouldCollectConsent() const = 0;
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Will verify whether context-aware signals can be collected
+   // on behalf of the user represented by `user_context`. Returns `kGranted` if
+   // collection is allowed.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc
new file mode 100644
index 000000000000..64bcd72f3ed5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.cc
+@@ -92,7 +92,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
+          consent_required_by_dependent_policy;
+ }
+ 
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ UserPermission UserPermissionServiceImpl::CanUserCollectSignals(
+     const UserContext& user_context) const {
+   // Return "unknown user" if no user ID was given.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h
new file mode 100644
index 000000000000..d13ac5ce39bc
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_browser_user__permission__service__impl.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/device_signals/core/browser/user_permission_service_impl.h
+@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio
+ 
+   // UserPermissionService:
+   bool ShouldCollectConsent() const override;
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   UserPermission CanUserCollectSignals(
+       const UserContext& user_context) const override;
+ #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.cc
new file mode 100644
index 000000000000..e4133bba0bd3
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/common/signals_features.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/components/device_signals/core/common/signals_features.cc
+@@ -46,7 +46,7 @@ bool IsNewFunctionEnabled(NewEvFunction new_ev_functio
+ }
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ // Enables the triggering of device signals consent dialog when conditions met
+ // This feature also requires UnmanagedDeviceSignalsConsentFlowEnabled policy to
+ // be enabled
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.h
new file mode 100644
index 000000000000..5dc4cb05216f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_common_signals__features.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/common/signals_features.h.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/components/device_signals/core/common/signals_features.h
+@@ -28,7 +28,7 @@ enum class NewEvFunction { kFileSystemInfo, kSettings,
+ bool IsNewFunctionEnabled(NewEvFunction new_ev_function);
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kDeviceSignalsConsentDialog);
+ 
+ // Returns true if device signals consent dialog has been enabled for
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_system__signals_platform__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_system__signals_platform__delegate.cc
new file mode 100644
index 000000000000..ba31ef8c88fa
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_device__signals_core_system__signals_platform__delegate.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/device_signals/core/system_signals/platform_delegate.cc.orig	2022-09-24 10:57:32 UTC
++++ src/3rdparty/chromium/components/device_signals/core/system_signals/platform_delegate.cc
+@@ -11,7 +11,7 @@ namespace device_signals {
+ 
+ bool CustomFilePathComparator::operator()(const base::FilePath& a,
+                                           const base::FilePath& b) const {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // On Linux, the file system is case sensitive.
+   return a < b;
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc
new file mode 100644
index 000000000000..df08ebcae4e2
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_embedder__support_user__agent__utils.cc
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/components/embedder_support/user_agent_utils.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/embedder_support/user_agent_utils.cc
+@@ -432,6 +432,9 @@ std::string GetPlatformForUAMetadata() {
+ # else
+   return "Chromium OS";
+ # endif
++#elif BUILDFLAG(IS_BSD)
++  // The internet is weird...
++  return "Linux";
+ #else
+   return std::string(version_info::GetOSType());
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.cc
new file mode 100644
index 000000000000..45d8fe3c9b29
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/event_constants.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/event_constants.cc
+@@ -11,7 +11,7 @@ namespace feature_engagement {
+ namespace events {
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ const char kNewTabOpened[] = "new_tab_opened";
+ const char kSixthTabOpened[] = "sixth_tab_opened";
+ const char kTabGroupCreated[] = "tab_group_created";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.h
new file mode 100644
index 000000000000..1c61f2507d9f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_event__constants.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/event_constants.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/event_constants.h
+@@ -14,7 +14,7 @@ namespace events {
+ 
+ // Desktop
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ // The user has explicitly opened a new tab via an entry point from inside of
+ // Chrome.
+ extern const char kNewTabOpened[];
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc
new file mode 100644
index 000000000000..eacb45825e24
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__configurations.cc
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/feature_configurations.cc
+@@ -46,7 +46,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
+ absl::optional<FeatureConfig> GetClientSideFeatureConfig(
+     const base::Feature* feature) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
+     absl::optional<FeatureConfig> config = FeatureConfig();
+     config->valid = true;
+@@ -1336,7 +1336,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ 
+   if (kIPHAutofillExternalAccountProfileSuggestionFeature.name ==
+       feature->name) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc
new file mode 100644
index 000000000000..8dd1aa2f62ed
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.cc
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/feature_constants.cc
+@@ -21,7 +21,7 @@ BASE_FEATURE(kUseClientConfigIPH,
+ BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature,
+              "IPH_AutofillFeedbackNewBadge",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -519,7 +519,8 @@ BASE_FEATURE(kIPHiOSPromoPasswordManagerWidgetFeature,
+ #endif  // BUILDFLAG(IS_IOS)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
+              "IPH_AutofillExternalAccountProfileSuggestion",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h
new file mode 100644
index 000000000000..67ad6e46d739
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__constants.h
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/feature_constants.h
+@@ -23,7 +23,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
+ BASE_DECLARE_FEATURE(kIPHDummyFeature);
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature);
+ BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
+ BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature);
+@@ -211,7 +211,8 @@ BASE_DECLARE_FEATURE(kIPHiOSPromoPasswordManagerWidget
+ #endif  // BUILDFLAG(IS_IOS)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
+ BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardCVCSuggestionFeature);
+ BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc
new file mode 100644
index 000000000000..17611addcc17
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.cc
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/feature_list.cc
+@@ -139,7 +139,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kIPHiOSPromoPasswordManagerWidgetFeature,
+ #endif  // BUILDFLAG(IS_IOS)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+     &kIPHAutofillFeedbackNewBadgeFeature,
+     &kIPHBatterySaverModeFeature,
+     &kIPHCompanionSidePanelFeature,
+@@ -186,7 +186,8 @@ const base::Feature* const kAllFeatures[] = {
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+     &kIPHAutofillExternalAccountProfileSuggestionFeature,
+     &kIPHAutofillVirtualCardCVCSuggestionFeature,
+     &kIPHAutofillVirtualCardSuggestionFeature,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h
new file mode 100644
index 000000000000..f39c82c3a1b9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feature__engagement_public_feature__list.h
@@ -0,0 +1,40 @@
+--- src/3rdparty/chromium/components/feature_engagement/public/feature_list.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/feature_engagement/public/feature_list.h
+@@ -259,7 +259,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSPromoPasswordManagerWidg
+ #endif  // BUILDFLAG(IS_IOS)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature,
+                        "IPH_AutofillFeedbackNewBadge");
+ DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
+@@ -335,7 +335,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature, 
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
+                        "IPH_AutofillExternalAccountProfileSuggestion");
+ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardCVCSuggestionFeature,
+@@ -541,7 +542,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+         VARIATION_ENTRY(kIPHiOSPromoPostRestoreDefaultBrowserFeature),
+         VARIATION_ENTRY(kIPHiOSPromoPasswordManagerWidgetFeature),
+ #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillFeedbackNewBadgeFeature),
+         VARIATION_ENTRY(kIPHBatterySaverModeFeature),
+         VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
+@@ -589,7 +590,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+         // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++    BUILDFLAG(IS_BSD)
+         VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
+         VARIATION_ENTRY(kIPHAutofillVirtualCardCVCSuggestionFeature),
+         VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_proto_v2_wire_version.proto b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_proto_v2_wire_version.proto
new file mode 100644
index 000000000000..626494912842
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_proto_v2_wire_version.proto
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/components/feed/core/proto/v2/wire/version.proto.orig	2021-05-12 22:05:49 UTC
++++ src/3rdparty/chromium/components/feed/core/proto/v2/wire/version.proto
+@@ -25,8 +25,8 @@ message Version {
+     BETA = 3;
+     RELEASE = 4;
+   }
+-  optional int32 major = 1;
+-  optional int32 minor = 2;
++  optional int32 gmajor = 1;
++  optional int32 gminor = 2;
+   optional int32 build = 3;
+   optional int32 revision = 4;
+   optional Architecture architecture = 5;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_v2_proto__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_v2_proto__util.cc
new file mode 100644
index 000000000000..076274fd9203
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_feed_core_v2_proto__util.cc
@@ -0,0 +1,24 @@
+--- src/3rdparty/chromium/components/feed/core/v2/proto_util.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/feed/core/v2/proto_util.cc
+@@ -93,8 +93,8 @@ feedwire::Version GetPlatformVersionMessage() {
+ 
+   int32_t major, minor, revision;
+   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision);
+-  result.set_major(major);
+-  result.set_minor(minor);
++  result.set_gmajor(major);
++  result.set_gminor(minor);
+   result.set_revision(revision);
+ #if BUILDFLAG(IS_ANDROID)
+   result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int());
+@@ -109,8 +109,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf
+   // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH.
+   const std::vector<uint32_t>& numbers = chrome_info.version.components();
+   if (numbers.size() > 3) {
+-    result.set_major(static_cast<int32_t>(numbers[0]));
+-    result.set_minor(static_cast<int32_t>(numbers[1]));
++    result.set_gmajor(static_cast<int32_t>(numbers[0]));
++    result.set_gminor(static_cast<int32_t>(numbers[1]));
+     result.set_build(static_cast<int32_t>(numbers[2]));
+     result.set_revision(static_cast<int32_t>(numbers[3]));
+   }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc
index 56dd7feeee6c..4c38ab9ecbd8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig	2022-07-22 17:30:31 UTC
+--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/flags_ui/flags_state.cc
-@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -741,7 +741,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
    return kOsCrOS;
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
    return kOsLacros;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_BUILD.gn
new file mode 100644
index 000000000000..07b7216ee88b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/gwp_asan/BUILD.gn.orig	2022-11-30 08:12:58 UTC
++++ src/3rdparty/chromium/components/gwp_asan/BUILD.gn
+@@ -15,7 +15,7 @@ test("gwp_asan_unittests") {
+     "//testing/gtest",
+     "//third_party/boringssl",
+   ]
+-  if (is_win || is_mac || is_linux || is_chromeos || is_android) {
++  if ((is_win || is_mac || is_linux || is_chromeos || is_android) && !is_bsd) {
+     deps += [
+       "//components/gwp_asan/client:unit_tests",
+       "//components/gwp_asan/crash_handler:unit_tests",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_guarded__page__allocator__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_guarded__page__allocator__posix.cc
new file mode 100644
index 000000000000..b9a40268566b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_guarded__page__allocator__posix.cc
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/components/gwp_asan/client/guarded_page_allocator_posix.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/gwp_asan/client/guarded_page_allocator_posix.cc
+@@ -35,8 +35,9 @@ void GuardedPageAllocator::MarkPageInaccessible(void* 
+   // mmap() a PROT_NONE page over the address to release it to the system, if
+   // we used mprotect() here the system would count pages in the quarantine
+   // against the RSS.
++  // MAP_ANONYMOUS requires the fd to be -1 on !linux
+   void* err = mmap(ptr, state_.page_size, PROT_NONE,
+-                   MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
++                   MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+   PCHECK(err == ptr) << "mmap";
+ }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc
new file mode 100644
index 000000000000..45ec484e308d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_client_gwp__asan.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/gwp_asan/client/gwp_asan.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/gwp_asan/client/gwp_asan.cc
+@@ -64,7 +64,7 @@ constexpr bool kCpuIs64Bit =
+ // ProcessSamplingBoost is the multiplier to increase the
+ // ProcessSamplingProbability in scenarios where we want to perform additional
+ // testing (e.g., on canary/dev builds).
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ constexpr int kDefaultMaxAllocations = 50;
+ constexpr int kDefaultMaxMetadata = 210;
+ constexpr int kDefaultTotalPages = kCpuIs64Bit ? 2048 : kDefaultMaxMetadata * 2;
+@@ -84,7 +84,7 @@ constexpr int kDefaultProcessSamplingBoost2 = 10;
+         // BUILDFLAG(IS_FUCHSIA)
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS_ASH)
++    BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ constexpr base::FeatureState kDefaultEnabled = base::FEATURE_ENABLED_BY_DEFAULT;
+ #else
+ constexpr base::FeatureState kDefaultEnabled =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc
new file mode 100644
index 000000000000..2e677802856f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/gwp_asan/crash_handler/crash_analyzer.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/components/gwp_asan/crash_handler/crash_analyzer.cc
+@@ -30,7 +30,7 @@
+ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
+ #include "third_party/crashpad/crashpad/util/process/process_memory.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include <signal.h>
+ #elif BUILDFLAG(IS_APPLE)
+ #include <mach/exception_types.h>
+@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+ 
+ crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
+     const crashpad::ExceptionSnapshot& exception) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   if (exception.Exception() == SIGSEGV || exception.Exception() == SIGBUS)
+     return exception.ExceptionAddress();
+ #elif BUILDFLAG(IS_APPLE)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc
new file mode 100644
index 000000000000..ce4ef2e65108
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/live_caption/caption_util.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/live_caption/caption_util.cc
+@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() {
+     return false;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Check if the CPU has the required instruction set to run the Speech
+   // On-Device API (SODA) library.
+   static bool has_sse41 = base::CPU().has_sse41();
+@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() {
+   return "chrome://os-settings/audioAndCaptions";
+ #endif  // BUILDFLAG(IS_CHROMEOS)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return "chrome://settings/captions";
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h
new file mode 100644
index 000000000000..8a704f098a16
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_live__caption_caption__util.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/live_caption/caption_util.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/live_caption/caption_util.h
+@@ -14,7 +14,7 @@ class PrefService;
+ namespace captions {
+ 
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ extern const char kCaptionSettingsUrl[];
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+         // BUILDFLAG(IS_MAC)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp
new file mode 100644
index 000000000000..e45b81485e41
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_management__strings.grdp
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/management_strings.grdp.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/management_strings.grdp
+@@ -346,7 +346,7 @@
+   </if>
+ 
+   <!-- Strings related to Chrome Enterprise Device Signals Sharing -->
+-  <if expr="is_win or is_linux or is_macosx">
++  <if expr="is_win or is_posix or is_macosx">
+     <message name="IDS_MANAGEMENT_DEVICE_SIGNALS_DISCLOSURE" desc="Disclosure message explaining that device signals can be shared.">
+       Information about your browser, OS, device, installed software, and files
+     </message>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc
new file mode 100644
index 000000000000..68fff7e336fe
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_media__router_common_providers_cast_channel_cast__message__util.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/media_router/common/providers/cast/channel/cast_message_util.cc.orig	2022-11-30 08:12:58 UTC
++++ src/3rdparty/chromium/components/media_router/common/providers/cast/channel/cast_message_util.cc
+@@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() {
+   return 4;
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
+   return 5;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   return 6;
+ #else
+   return 0;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc
index d4aadea8dca0..0fde59efeb73 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig	2021-04-14 18:40:59 UTC
+--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc
 @@ -4,7 +4,13 @@
  
  #include "components/metrics/drive_metrics_provider.h"
  
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +#include <sys/types.h>
 +#define MAJOR(dev) major(dev)
 +#define MINOR(dev) minor(dev)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc
index 76142e0ff3bf..baa13d124508 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_metrics_metrics__log.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/components/metrics/metrics_log.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/metrics/metrics_log.cc
 @@ -53,7 +53,7 @@
  #include "base/win/current_module.h"
@@ -9,7 +9,7 @@
  #include "base/environment.h"
  #include "base/nix/xdg_util.h"
  #endif
-@@ -123,7 +123,7 @@ void RecordCurrentTime(
+@@ -139,7 +139,7 @@ void RecordCurrentTime(
    }
  }
  
@@ -18,7 +18,7 @@
  metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
      base::nix::SessionType session_type) {
    switch (session_type) {
-@@ -375,7 +375,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -399,7 +399,7 @@ void MetricsLog::RecordCoreSystemProfile(
  // OperatingSystemVersion refers to the ChromeOS release version.
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    os->set_kernel_version(base::SysInfo::KernelVersion());
@@ -27,7 +27,7 @@
    // Linux operating system version is copied over into kernel version to be
    // consistent.
    os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -392,7 +392,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -416,7 +416,7 @@ void MetricsLog::RecordCoreSystemProfile(
    os->set_build_number(base::SysInfo::GetIOSBuildNumber());
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc
index 63b224579fe1..9fef706ac19d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/network_session_configurator/browser/network_session_configurator.cc
-@@ -807,7 +807,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
-   }
- #endif  // #if !BUILDFLAG(IS_ANDROID)
- 
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -793,7 +793,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+   // backport, having it behave differently than in stable would be a bigger
+   // problem. TODO: Does this work in later macOS releases?
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
  #else
    return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc
new file mode 100644
index 000000000000..50c12084abdd
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_optimization__guide__util.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/optimization_guide/core/optimization_guide_util.cc.orig	2022-10-24 13:33:33 UTC
++++ src/3rdparty/chromium/components/optimization_guide/core/optimization_guide_util.cc
+@@ -27,7 +27,7 @@ optimization_guide::proto::Platform GetPlatform() {
+   return optimization_guide::proto::PLATFORM_CHROMEOS;
+ #elif BUILDFLAG(IS_ANDROID)
+   return optimization_guide::proto::PLATFORM_ANDROID;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return optimization_guide::proto::PLATFORM_LINUX;
+ #else
+   return optimization_guide::proto::PLATFORM_UNKNOWN;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h
new file mode 100644
index 000000000000..1382842194a0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_optimization__guide_core_tflite__model__executor.h
@@ -0,0 +1,62 @@
+--- src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/optimization_guide/core/tflite_model_executor.h
+@@ -240,7 +240,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
+   void SendForBatchExecution(
+       BatchExecutionCallback callback_on_complete,
+       base::TimeTicks start_time,
++#if defined(__clang__) && (__clang_major__ >= 15)
+       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++#else
++      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++#endif
+       override {
+     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -262,7 +266,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
+   // Starts the synchronous execution of the model. Returns model outputs.
+   // Model needs to be loaded. Synchronous calls do not load or unload model.
+   std::vector<absl::optional<OutputType>> SendForBatchExecutionSync(
++#if defined(__clang__) && (__clang_major__ >= 15)
+       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++#else
++      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
++#endif
+       override {
+     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -417,7 +425,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
+   // executes it on the model execution thread.
+   void LoadModelFileAndBatchExecute(
+       BatchExecutionCallback callback_on_complete,
++#if defined(__clang__) && (__clang_major__ >= 15)
+       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
++#else
++      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs) {
++#endif
+     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ 
+@@ -434,7 +446,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
+ 
+   // Batch executes the loaded model for inputs.
+   void BatchExecuteLoadedModel(
++#if defined(__clang__) && (__clang_major__ >= 15)
+       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++#else
++      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++#endif
+       std::vector<absl::optional<OutputType>>* outputs) {
+     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+@@ -494,7 +510,11 @@ class TFLiteModelExecutor : public ModelExecutor<Outpu
+   // Unloads the model if needed.
+   void BatchExecuteLoadedModelAndRunCallback(
+       BatchExecutionCallback callback_on_complete,
++#if defined(__clang__) && (__clang_major__ >= 15)
+       ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++#else
++      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs,
++#endif
+       ExecutionStatus execution_status) {
+     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc
deleted file mode 100644
index dc3bd7fb17c4..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_keyring__util__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/3rdparty/chromium/components/os_crypt/keyring_util_linux.cc.orig	2022-04-21 18:48:31 UTC
-+++ src/3rdparty/chromium/components/os_crypt/keyring_util_linux.cc
-@@ -68,12 +68,12 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() {
-   if (keyring_loaded)
-     return true;
- 
--  void* handle = dlopen("libgnome-keyring.so.0", RTLD_NOW | RTLD_GLOBAL);
-+  void* handle = dlopen("libgnome-keyring.so", RTLD_NOW | RTLD_GLOBAL);
-   if (!handle) {
-     // We wanted to use GNOME Keyring, but we couldn't load it. Warn, because
-     // either the user asked for this, or we autodetected it incorrectly. (Or
-     // the system has broken libraries, which is also good to warn about.)
--    LOG(WARNING) << "Could not load libgnome-keyring.so.0: " << dlerror();
-+    LOG(WARNING) << "Could not load libgnome-keyring.so: " << dlerror();
-     return false;
-   }
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc
deleted file mode 100644
index 5d331a6d8dcb..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_libsecret__util__linux.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc.orig	2022-06-17 14:20:10 UTC
-+++ src/3rdparty/chromium/components/os_crypt/libsecret_util_linux.cc
-@@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() {
-   if (libsecret_loaded_)
-     return true;
- 
--  static void* handle = dlopen("libsecret-1.so.0", RTLD_NOW | RTLD_GLOBAL);
-+  static void* handle = dlopen("libsecret-1.so", RTLD_NOW | RTLD_GLOBAL);
-   if (!handle) {
-     // We wanted to use libsecret, but we couldn't load it. Warn, because
-     // either the user asked for this, or we autodetected it incorrectly. (Or
-     // the system has broken libraries, which is also good to warn about.)
-     // TODO(crbug.com/607435): Channel this message to the user-facing log
--    VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
-+    VLOG(1) << "Could not load libsecret-1.so: " << dlerror();
-     return false;
-   }
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc
new file mode 100644
index 000000000000..82e9cd60a576
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_libsecret__util__linux.cc
@@ -0,0 +1,27 @@
+--- src/3rdparty/chromium/components/os_crypt/sync/libsecret_util_linux.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/components/os_crypt/sync/libsecret_util_linux.cc
+@@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() {
+ 
+ // static
+ bool LibsecretLoader::LoadLibsecret() {
++#if BUILDFLAG(IS_BSD)
++  const char* kSecretLib = "libsecret-1.so";
++#else
++  const char* kSecretLib = "libsecret-1.so.0";
++#endif
++
+   if (libsecret_loaded_)
+     return true;
+ 
+-  static void* handle = dlopen("libsecret-1.so.0", RTLD_NOW | RTLD_GLOBAL);
++  static void* handle = dlopen(kSecretLib, RTLD_NOW | RTLD_GLOBAL);
+   if (!handle) {
+     // We wanted to use libsecret, but we couldn't load it. Warn, because
+     // either the user asked for this, or we autodetected it incorrectly. (Or
+     // the system has broken libraries, which is also good to warn about.)
+     // TODO(crbug.com/607435): Channel this message to the user-facing log
+-    VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
++    VLOG(1) << "Could not load << " << kSecretLib << ": " << dlerror();
+     return false;
+   }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h
index 948a26a809bc..8bbbbc3083c8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_sync_os__crypt.h
@@ -1,5 +1,5 @@
---- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig	2023-01-11 09:17:16 UTC
-+++ src/3rdparty/chromium/components/os_crypt/os_crypt.h
+--- src/3rdparty/chromium/components/os_crypt/sync/os_crypt.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/components/os_crypt/sync/os_crypt.h
 @@ -14,7 +14,7 @@
  #include "build/build_config.h"
  #include "build/chromecast_buildflags.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc
new file mode 100644
index 000000000000..69c6b096d20a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_browser_paint__preview__client.cc
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/components/paint_preview/browser/paint_preview_client.cc
+@@ -310,8 +310,8 @@ void PaintPreviewClient::CapturePaintPreview(
+   metadata->set_url(url.spec());
+   metadata->set_version(kPaintPreviewVersion);
+   auto* chromeVersion = metadata->mutable_chrome_version();
+-  chromeVersion->set_major(CHROME_VERSION_MAJOR);
+-  chromeVersion->set_minor(CHROME_VERSION_MINOR);
++  chromeVersion->set_gmajor(CHROME_VERSION_MAJOR);
++  chromeVersion->set_gminor(CHROME_VERSION_MINOR);
+   chromeVersion->set_build(CHROME_VERSION_BUILD);
+   chromeVersion->set_patch(CHROME_VERSION_PATCH);
+   document_data.callback = std::move(callback);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc
new file mode 100644
index 000000000000..43b3203fc18b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_paint__preview_player_player__compositor__delegate.cc
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/components/paint_preview/player/player_compositor_delegate.cc
+@@ -452,8 +452,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT
+   // use the AXTreeUpdate.
+   auto chrome_version = capture_result_->proto.metadata().chrome_version();
+   if (capture_result_->proto.metadata().has_chrome_version() &&
+-      chrome_version.major() == CHROME_VERSION_MAJOR &&
+-      chrome_version.minor() == CHROME_VERSION_MINOR &&
++      chrome_version.gmajor() == CHROME_VERSION_MAJOR &&
++      chrome_version.gminor() == CHROME_VERSION_MINOR &&
+       chrome_version.build() == CHROME_VERSION_BUILD &&
+       chrome_version.patch() == CHROME_VERSION_PATCH) {
+     paint_preview_service_->GetFileMixin()->GetAXTreeUpdate(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc
new file mode 100644
index 000000000000..01678c9ccaf3
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_features_password__features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc.orig	2023-10-27 05:38:38 UTC
++++ src/3rdparty/chromium/components/password_manager/core/browser/features/password_features.cc
+@@ -27,7 +27,7 @@ BASE_FEATURE(kBiometricTouchToFill,
+ // Delete undecryptable passwords from the store when Sync is active.
+ BASE_FEATURE(kClearUndecryptablePasswordsOnSync,
+              "ClearUndecryptablePasswordsInSync",
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc
new file mode 100644
index 000000000000..93e1c684834f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc.orig	2023-10-27 05:38:38 UTC
++++ src/3rdparty/chromium/components/password_manager/core/browser/sync/password_sync_bridge.cc
+@@ -197,7 +197,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+ }
+ 
+ bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return ShouldRecoverPasswordsDuringMerge() &&
+          base::FeatureList::IsEnabled(
+              features::kForceInitialSyncWhenDecryptionFails);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc
index 6e905d43147c..a43967c49118 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc.orig	2023-10-27 05:38:38 UTC
 +++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.cc
-@@ -76,7 +76,7 @@ BASE_FEATURE(kFillOnAccountSelect,
-              "fill-on-account-select",
+@@ -18,7 +18,7 @@ BASE_FEATURE(kEnableOverwritingPlaceholderUsernames,
+              "EnableOverwritingPlaceholderUsernames",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,12 +9,3 @@
  // When enabled, initial sync will be forced during startup if the password
  // store has encryption service failures.
  BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -197,7 +197,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
-              "PasswordStrengthIndicator",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Displays at least the decryptable and never saved logins in the password
- // manager
- BASE_FEATURE(kSkipUndecryptablePasswords,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h
index 01f51114dce4..38d2d8679d7d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_common_password__manager__features.h
@@ -1,20 +1,11 @@
---- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h.orig	2023-10-27 05:38:38 UTC
 +++ src/3rdparty/chromium/components/password_manager/core/common/password_manager_features.h
-@@ -35,7 +35,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear
- BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame);
- BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites);
- BASE_DECLARE_FEATURE(kFillOnAccountSelect);
+@@ -24,7 +24,7 @@ namespace password_manager::features {
+ // alongside the definition of their values in the .cc file.
+ BASE_DECLARE_FEATURE(kEnableOverwritingPlaceholderUsernames);
+ 
 -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
  #endif
- BASE_DECLARE_FEATURE(kInferConfirmationPasswordField);
-@@ -67,7 +67,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)  // Desktop
- BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble);
- #endif
--#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- BASE_DECLARE_FEATURE(kSkipUndecryptablePasswords);
- #endif
- #if BUILDFLAG(IS_ANDROID)
+ BASE_DECLARE_FEATURE(kForgotPasswordFormSupport);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h
index 4b534d0d55ea..c16bc41b33e8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/performance_manager/public/features.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/components/performance_manager/public/features.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/components/performance_manager/public/features.h
-@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThread);
+@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread);
  
  #if !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_permissions_prediction__service_prediction__common.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_permissions_prediction__service_prediction__common.cc
new file mode 100644
index 000000000000..67fbbfb894e4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_permissions_prediction__service_prediction__common.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/permissions/prediction_service/prediction_common.cc.orig	2022-08-31 12:19:35 UTC
++++ src/3rdparty/chromium/components/permissions/prediction_service/prediction_common.cc
+@@ -33,7 +33,7 @@ int BucketizeValue(int count) {
+ 
+ ClientFeatures_Platform GetCurrentPlatformProto() {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP;
+ #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+   return permissions::ClientFeatures_Platform_PLATFORM_MOBILE;
+@@ -44,7 +44,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() {
+ 
+ ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_MAC)
++    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+   return permissions::ClientFeatures_PlatformEnum_PLATFORM_DESKTOP_V2;
+ #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+   return permissions::ClientFeatures_PlatformEnum_PLATFORM_MOBILE_V2;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc
new file mode 100644
index 000000000000..ef087ec77852
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_browser_policy__pref__mapping__test.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/policy/core/browser/policy_pref_mapping_test.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/components/policy/core/browser/policy_pref_mapping_test.cc
+@@ -327,7 +327,7 @@ class PolicyTestCase {
+     const std::string os("chromeos_lacros");
+ #elif BUILDFLAG(IS_IOS)
+     const std::string os("ios");
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     const std::string os("linux");
+ #elif BUILDFLAG(IS_MAC)
+     const std::string os("mac");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc
new file mode 100644
index 000000000000..54ac5041816a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__client.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_client.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_client.cc
+@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() {
+         fetch_request->set_invalidation_payload(invalidation_payload_);
+       }
+     }
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Only set browser device identifier for CBCM Chrome cloud policy on
+     // desktop.
+     if (type_to_fetch.first ==
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc
new file mode 100644
index 000000000000..2a5e84693fdb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_cloud_cloud__policy__util.cc
@@ -0,0 +1,55 @@
+--- src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_util.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/policy/core/common/cloud/cloud_policy_util.cc
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -35,10 +35,15 @@
+ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #include <limits.h>  // For HOST_NAME_MAX
+ #endif
+ 
++#if BUILDFLAG(IS_FREEBSD)
++#include <sys/param.h>
++#define HOST_NAME_MAX MAXHOSTNAMELEN
++#endif
++
+ #include <algorithm>
+ #include <utility>
+ 
+@@ -86,7 +91,7 @@ namespace em = enterprise_management;
+ 
+ std::string GetMachineName() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   char hostname[HOST_NAME_MAX];
+   if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
+     return hostname;
+@@ -144,7 +149,7 @@ std::string GetMachineName() {
+ 
+ std::string GetOSVersion() {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   return base::SysInfo::OperatingSystemVersion();
+ #elif BUILDFLAG(IS_WIN)
+   base::win::OSInfo::VersionNumber version_number =
+@@ -167,7 +172,7 @@ std::string GetOSArchitecture() {
+ }
+ 
+ std::string GetOSUsername() {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+   struct passwd* creds = getpwuid(getuid());
+   if (!creds || !creds->pw_name)
+     return std::string();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc
new file mode 100644
index 000000000000..9e7c70f6615e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__loader__common.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/policy/core/common/policy_loader_common.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/policy/core/common/policy_loader_common.cc
+@@ -46,7 +46,7 @@ const char* kSensitivePolicies[] = {
+     key::kDefaultSearchProviderEnabled,
+     key::kSafeBrowsingEnabled,
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     key::kAutoOpenFileTypes,
+     key::kSafeBrowsingAllowlistDomains,
+     key::kHomepageIsNewTabPage,
+@@ -55,7 +55,7 @@ const char* kSensitivePolicies[] = {
+     key::kRestoreOnStartup,
+     key::kRestoreOnStartupURLs,
+ #endif
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     key::kCommandLineFlagSecurityWarningsEnabled,
+ #endif
+ #if !BUILDFLAG(IS_IOS)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc
new file mode 100644
index 000000000000..d9ed95b999a8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_core_common_policy__paths.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/policy/core/common/policy_paths.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/policy/core/common/policy_paths.cc
+@@ -16,6 +16,8 @@ namespace policy {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING) || \
+     BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
+ const char kPolicyPath[] = "/etc/opt/chrome/policies";
++#elif BUILDFLAG(IS_FREEBSD)
++const char kPolicyPath[] = "/usr/local/etc/chromium/policies";
+ #else
+ const char kPolicyPath[] = "/etc/chromium/policies";
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py
new file mode 100644
index 000000000000..fb0b794ebdc6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_policy_tools_generate__policy__source.py
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/components/policy/tools/generate_policy_source.py.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/policy/tools/generate_policy_source.py
+@@ -37,9 +37,9 @@ PLATFORM_STRINGS = {
+     'ios': ['ios'],
+     'fuchsia': ['fuchsia'],
+     'chrome.win': ['win'],
+-    'chrome.linux': ['linux'],
++    'chrome.linux': ['linux', 'openbsd', 'freebsd'],
+     'chrome.mac': ['mac'],
+-    'chrome.*': ['win', 'mac', 'linux'],
++    'chrome.*': ['win', 'mac', 'linux', 'openbsd', 'freebsd'],
+     'chrome.win7': ['win'],
+ }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_BUILD.gn
new file mode 100644
index 000000000000..27faeb446ffb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/power_metrics/BUILD.gn.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/power_metrics/BUILD.gn
+@@ -41,7 +41,7 @@ static_library("power_metrics") {
+     ldflags = [ "/DELAYLOAD:setupapi.dll" ]
+   }
+ 
+-  if (is_linux || is_chromeos) {
++  if ((is_linux && !is_bsd) || is_chromeos) {
+     sources += [
+       "energy_metrics_provider_linux.cc",
+       "energy_metrics_provider_linux.h",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_energy__metrics__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_energy__metrics__provider.cc
new file mode 100644
index 000000000000..8858d3024b34
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_power__metrics_energy__metrics__provider.cc
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/power_metrics/energy_metrics_provider.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/components/power_metrics/energy_metrics_provider.cc
+@@ -9,6 +9,8 @@
+ #include "components/power_metrics/energy_metrics_provider_win.h"
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #include "components/power_metrics/energy_metrics_provider_linux.h"
++#elif BUILDFLAG(IS_BSD)
++#include "base/notreached.h"
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+ namespace power_metrics {
+@@ -22,6 +24,9 @@ std::unique_ptr<EnergyMetricsProvider> EnergyMetricsPr
+   return EnergyMetricsProviderWin::Create();
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+   return EnergyMetricsProviderLinux::Create();
++#elif BUILDFLAG(IS_BSD)
++  NOTIMPLEMENTED();
++  return nullptr;
+ #else
+   return nullptr;
+ #endif  // BUILDFLAG(IS_WIN)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py
new file mode 100644
index 000000000000..bdf0bdb12355
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_content_resources_gen__file__type__proto.py
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/components/safe_browsing/content/resources/gen_file_type_proto.py.orig	2023-01-11 09:17:16 UTC
++++ src/3rdparty/chromium/components/safe_browsing/content/resources/gen_file_type_proto.py
+@@ -38,6 +38,8 @@ def PlatformTypes():
+         "fuchsia":
+         download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_FUCHSIA,
+         "linux": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
++        "openbsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
++        "freebsd": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_LINUX,
+         "mac": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_MAC,
+         "win": download_file_types_pb2.DownloadFileType.PLATFORM_TYPE_WINDOWS,
+     }
+@@ -181,7 +183,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera
+             '-t',
+             '--type',
+             help='The platform type. One of android, chromeos, ' +
+-            'linux, mac, win')
++            'linux, mac, win, openbsd, freebsd')
+ 
+     def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command):
+         if opts.type is not None:
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
new file mode 100644
index 000000000000..6bfbade8af4e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
+@@ -117,7 +117,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
+ PlatformType GetCurrentPlatformType() {
+ #if BUILDFLAG(IS_WIN)
+   return WINDOWS_PLATFORM;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return LINUX_PLATFORM;
+ #elif BUILDFLAG(IS_IOS)
+   return IOS_PLATFORM;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
new file mode 100644
index 000000000000..a1dc6484a884
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc
+@@ -109,7 +109,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() {
+   return RTLookupRequest::OS_TYPE_FUCHSIA;
+ #elif BUILDFLAG(IS_IOS)
+   return RTLookupRequest::OS_TYPE_IOS;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return RTLookupRequest::OS_TYPE_LINUX;
+ #elif BUILDFLAG(IS_MAC)
+   return RTLookupRequest::OS_TYPE_MAC;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
new file mode 100644
index 000000000000..69a7909e2f4e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc
+@@ -179,7 +179,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput(
+ // Check for current device type and subtract it from the device count
+ // calculation.
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   desktop_count -= 1;
+ #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
new file mode 100644
index 000000000000..a6c20612bade
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
+@@ -21,7 +21,7 @@
+ 
+ #if BUILDFLAG(IS_WIN)
+ #include "content/public/child/dwrite_font_proxy_init_win.h"
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "components/services/font/public/cpp/font_loader.h"
+ #endif
+ 
+@@ -78,7 +78,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+     // Initialize font access for Skia.
+ #if BUILDFLAG(IS_WIN)
+   content::InitializeDWriteFontProxy();
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   mojo::PendingRemote<font_service::mojom::FontService> font_service;
+   content::UtilityThread::Get()->BindHostReceiver(
+       font_service.InitWithNewPipeAndPassReceiver());
+@@ -101,7 +101,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+                              base::BindOnce([] { SkFontMgr::RefDefault(); }));
+ 
+   // Sanity check that fonts are working.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   // No WebSandbox is provided on Linux so the local fonts aren't accessible.
+   // This is fine since since the subsetted fonts are provided in the SkPicture.
+   // However, we still need to check that the SkFontMgr starts as it is used by
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
index 23f0ffd45cb3..2e9a316712ba 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
 @@ -53,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
      }
@@ -8,7 +8,7 @@
    auto* instance = sandbox::policy::SandboxLinux::GetInstance();
  
    std::vector<BrokerFilePermission> permissions{
-@@ -76,6 +77,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -82,6 +83,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
                              sandbox::syscall_broker::COMMAND_OPEN}),
        permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options);
    instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
index 4a345456a725..6b7b6ea44244 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_
@@ -7,7 +7,7 @@
 +#include "build/build_config.h"
 +
 +#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc
new file mode 100644
index 000000000000..60d321baf24c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_services_screen__ai_screen__ai__library__wrapper.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/components/services/screen_ai/screen_ai_library_wrapper.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/services/screen_ai/screen_ai_library_wrapper.cc
+@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima
+ 
+   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
+   // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   free_library_allocated_char_array_(library_buffer.release());
+ #endif
+ 
+@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap& 
+ 
+   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
+   // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   free_library_allocated_char_array_(library_buffer.release());
+ #endif
+ 
+@@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr
+ 
+   // TODO(crbug.com/1443341): Remove this after fixing the crash issue on Linux
+   // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   free_library_allocated_int32_array_(library_buffer.release());
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc
new file mode 100644
index 000000000000..f1659cc70599
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_startup__metric__utils_common_startup__metric__utils.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/startup_metric_utils/common/startup_metric_utils.cc
+@@ -78,7 +78,7 @@ base::TimeTicks CommonStartupMetricRecorder::StartupTi
+   // Enabling this logic on OS X causes a significant performance regression.
+   // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are
+   // ignored on Mac main thread.
+-#if !BUILDFLAG(IS_APPLE)
++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
+   static bool statics_initialized = false;
+   if (!statics_initialized) {
+     statics_initialized = true;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn
index 516f089d4638..1318ba5b920a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn
 @@ -75,7 +75,7 @@ jumbo_static_library("storage_monitor") {
        deps += [ "//services/device/public/mojom" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc
new file mode 100644
index 000000000000..011f6a2d4585
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.cc
@@ -0,0 +1,39 @@
+--- src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.cc
+@@ -398,8 +398,11 @@ class RetryingFetcherImpl final : public DeferredFetch
+   // Not copyable.
+   RetryingFetcherImpl(const RetryingFetcherImpl&) = delete;
+   RetryingFetcherImpl& operator=(const RetryingFetcherImpl&) = delete;
+-
++#if defined(__clang__) && (__clang_major__ >= 15)
+   void Start(ProtoFetcher<Response>::Callback callback) override {
++#else
++  void Start(typename ProtoFetcher<Response>::Callback callback) override {
++#endif
+     callback_ = std::move(callback);
+     Retry();
+   }
+@@ -435,7 +438,11 @@ class RetryingFetcherImpl final : public DeferredFetch
+   }
+ 
+   // Client callback.
++#if defined(__clang__) && (__clang_major__ >= 15)
+   ProtoFetcher<Response>::Callback callback_;
++#else
++  typename ProtoFetcher<Response>::Callback callback_;
++#endif
+ 
+   // Retry controls.
+   base::OneShotTimer timer_;
+@@ -578,7 +585,11 @@ ParallelFetchManager<Request, Response>::ParallelFetch
+ template <typename Request, typename Response>
+ void ParallelFetchManager<Request, Response>::Fetch(
+     const Request& request,
++#if defined(__clang__) && (__clang_major__ >= 15)
+     Fetcher::Callback callback) {
++#else
++    typename Fetcher::Callback callback) {
++#endif
+   CHECK(callback) << "Use base::DoNothing() instead of empty callback.";
+   KeyType key = requests_in_flight_.Add(MakeFetcher(request));
+   requests_in_flight_.Lookup(key)->Start(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h
new file mode 100644
index 000000000000..e84de128d3f5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_proto__fetcher.h
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/supervised_user/core/browser/proto_fetcher.h
+@@ -165,10 +165,18 @@ class ParallelFetchManager {
+ 
+   // Starts the fetch. Underlying fetcher is stored internally, and will be
+   // cleaned up after finish or when this manager is destroyed.
++#if defined(__clang__) && (__clang_major__ >= 15) 
+   void Fetch(const Request& request, Fetcher::Callback callback);
++#else
++  void Fetch(const Request& request, typename Fetcher::Callback callback);
++#endif
+ 
+  private:
++#if defined(__clang__) && (__clang_major__ >= 15) 
+   using KeyType = base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
++#else
++  using KeyType = typename base::IDMap<std::unique_ptr<Fetcher>>::KeyType;
++#endif
+ 
+   // Remove fetcher under key from requests_in_flight_.
+   void Remove(KeyType key);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc
new file mode 100644
index 000000000000..eac3cbdb5091
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_supervised__user_core_browser_supervised__user__service.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/components/supervised_user/core/browser/supervised_user_service.cc
+@@ -206,7 +206,7 @@ FirstTimeInterstitialBannerState SupervisedUserService
+     const FirstTimeInterstitialBannerState original_state) {
+   FirstTimeInterstitialBannerState target_state = original_state;
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_IOS)
++    BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
+   if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) {
+     if (original_state != FirstTimeInterstitialBannerState::kSetupComplete &&
+         can_show_first_time_interstitial_banner_) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc
new file mode 100644
index 000000000000..4c825d79ccdb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/components/sync_device_info/local_device_info_util.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/sync_device_info/local_device_info_util.cc
+@@ -82,7 +82,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na
+ sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
+ #if BUILDFLAG(IS_CHROMEOS)
+   return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
+ #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   switch (ui::GetDeviceFormFactor()) {
+@@ -107,7 +107,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
+   return DeviceInfo::OsType::kChromeOsAsh;
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+   return DeviceInfo::OsType::kChromeOsLacros;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return DeviceInfo::OsType::kLinux;
+ #elif BUILDFLAG(IS_ANDROID)
+   return DeviceInfo::OsType::kAndroid;
+@@ -126,7 +126,7 @@ DeviceInfo::OsType GetLocalDeviceOSType() {
+ 
+ DeviceInfo::FormFactor GetLocalDeviceFormFactor() {
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
+-    BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   return DeviceInfo::FormFactor::kDesktop;
+ #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
+   return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util__linux.cc
new file mode 100644
index 000000000000..7ce16715d205
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_sync__device__info_local__device__info__util__linux.cc
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/components/sync_device_info/local_device_info_util_linux.cc.orig	2022-09-24 10:57:32 UTC
++++ src/3rdparty/chromium/components/sync_device_info/local_device_info_util_linux.cc
+@@ -9,6 +9,11 @@
+ 
+ #include "base/linux_util.h"
+ 
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#define HOST_NAME_MAX MAXHOSTNAMELEN
++#endif
++
+ namespace syncer {
+ 
+ std::string GetPersonalizableDeviceNameInternal() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc
new file mode 100644
index 000000000000..8e39f14d2c90
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/components/update_client/update_query_params.cc
+@@ -42,6 +42,8 @@ const char kOs[] =
+     "fuchsia";
+ #elif BUILDFLAG(IS_OPENBSD)
+     "openbsd";
++#elif defined(OS_FREEBSD)
++    "freebsd";
+ #else
+ #error "unknown os"
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc
index 844f2cc5b7d5..ffe19ad21e15 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_url__formatter_spoof__checks_idn__spoof__checker.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
+@@ -293,7 +293,7 @@ IDNSpoofChecker::IDNSpoofChecker() {
    // The ideal fix would be to change the omnibox font used for Thai. In
    // that case, the Linux-only list should be revisited and potentially
    // removed.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc
new file mode 100644
index 000000000000..bb21c601c3c9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_user__education_views_help__bubble__view.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/user_education/views/help_bubble_view.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/user_education/views/help_bubble_view.cc
+@@ -991,7 +991,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+ void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
+                                               views::Widget* widget) const {
+   BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Help bubbles anchored to menus may be clipped to their anchors' bounds,
+   // resulting in visual errors, unless they use accelerated rendering. See
+   // crbug.com/1445770 for details.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc
new file mode 100644
index 000000000000..3086aa685276
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_google__groups__updater__service.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/variations/service/google_groups_updater_service.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/components/variations/service/google_groups_updater_service.cc
+@@ -15,7 +15,7 @@
+ // information from per-profile data to local-state.
+ BASE_FEATURE(kVariationsGoogleGroupFiltering,
+              "VariationsGoogleGroupFiltering",
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              // TODO(b/286365351): launch on Android, iOS and ChromeOS.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc
new file mode 100644
index 000000000000..7b28e911fd3e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_variations_service_variations__service.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/components/variations/service/variations_service.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/components/variations/service/variations_service.cc
+@@ -95,7 +95,7 @@ std::string GetPlatformString() {
+   return "android";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   return "fuchsia";
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_BSD)
+   // Default BSD and SOLARIS to Linux to not break those builds, although these
+   // platforms are not officially supported by Chrome.
+   return "linux";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc
deleted file mode 100644
index b67426e510f3..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_common_gpu_dawn__context__provider.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/components/viz/common/gpu/dawn_context_provider.cc.orig	2022-02-28 16:54:41 UTC
-+++ src/3rdparty/chromium/components/viz/common/gpu/dawn_context_provider.cc
-@@ -20,7 +20,7 @@ namespace {
- wgpu::BackendType GetDefaultBackendType() {
- #if BUILDFLAG(IS_WIN)
-   return wgpu::BackendType::D3D12;
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return wgpu::BackendType::Vulkan;
- #else
-   NOTREACHED();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc
deleted file mode 100644
index b6ddc3aeb62c..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_host_renderer__settings__creation.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/components/viz/host/renderer_settings_creation.cc.orig	2022-02-28 16:54:41 UTC
-+++ src/3rdparty/chromium/components/viz/host/renderer_settings_creation.cc
-@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() {
-   renderer_settings.partial_swap_enabled =
-       !command_line->HasSwitch(switches::kUIDisablePartialSwap);
- 
--#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Simple frame rate throttling only works on macOS and Linux
-   renderer_settings.apply_simple_frame_rate_throttling =
-       features::IsSimpleFrameRateThrottlingEnabled();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc
index d94d56e6ed9a..fc18626498c3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1259,7 +1259,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1485,7 +1485,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
                                            ->GetDeviceQueue()
                                            ->GetVulkanPhysicalDevice(),
                                        VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
      // Textures that were allocated _on linux_ with ycbcr info came from
      // VaapiVideoDecoder, which exports using DRM format modifiers.
-     return GrBackendFormat::MakeVk(gr_ycbcr_info,
+     return GrBackendFormats::MakeVk(gr_ycbcr_info,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc
new file mode 100644
index 000000000000..edde402f0b2b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display__embedder_skia__output__surface__impl__on__gpu.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
+@@ -1521,7 +1521,12 @@ void SkiaOutputSurfaceImplOnGpu::CopyOutputNV12(
+ 
+       // Issue readbacks from the surfaces:
+       for (size_t i = 0; i < CopyOutputResult::kNV12MaxPlanes; ++i) {
+-        SkISize size{plane_surfaces[i]->width(), plane_surfaces[i]->height()};
++#if defined(__clang__) && (__clang_major__ >= 16)
++        SkISize size(plane_surfaces[i]->width(), plane_surfaces[i]->height());
++#else
++        SkISize s = { plane_surfaces[i]->width(), plane_surfaces[i]->height() };
++        SkISize size(s);
++#endif
+         SkImageInfo dst_info = SkImageInfo::Make(
+             size, (i == 0) ? kAlpha_8_SkColorType : kR8G8_unorm_SkColorType,
+             kUnpremul_SkAlphaType);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc
index 01be933c151f..a82120f17057 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/viz/service/display/skia_renderer.cc
-@@ -1149,7 +1149,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1218,7 +1218,7 @@ void SkiaRenderer::ClearFramebuffer() {
    if (current_frame()->current_render_pass->has_transparent_background) {
      ClearCanvas(SkColors::kTransparent);
    } else {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index e8f179652c9a..d56254e6b6a5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -110,7 +110,7 @@ RootCompositorFrameSinkImpl::Create(
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -9,7 +9,7 @@
    // For X11, we need notify client about swap completion after resizing, so the
    // client can use it for synchronize with X11 WM.
    output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -585,7 +585,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -709,7 +709,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
      display_client_->DidCompleteSwapWithSize(pixel_size);
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 817f9307c9f1..c33ac3839d6f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -200,7 +200,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+@@ -211,7 +211,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc
index 9df54ad2e565..e3db4f3c8780 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/app/content_main.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/app/content_main.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/app/content_main.cc
 @@ -207,7 +207,7 @@ RunContentProcess(ContentMainParams params,
      base::EnableTerminationOnOutOfMemory();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc
index 453c8ae225c4..242f9043efcc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/app/content_main_runner_impl.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/app/content_main_runner_impl.cc
-@@ -139,13 +139,13 @@
+@@ -142,13 +142,13 @@
  #include "content/browser/posix_file_descriptor_info_impl.h"
  #include "content/public/common/content_descriptors.h"
  
@@ -16,21 +16,16 @@
  #include "base/files/file_path_watcher_inotify.h"
  #include "base/native_library.h"
  #include "base/rand_util.h"
-@@ -170,6 +170,11 @@
- #include "content/public/common/content_client.h"
+@@ -183,12 +183,16 @@
+ #include "content/public/common/zygote/zygote_handle.h"
+ #include "content/zygote/zygote_main.h"
+ #include "media/base/media_switches.h"
++#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
+ 
+ #if BUILDFLAG(ENABLE_WEBRTC)
+ #include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
  #endif
- 
-+//XXX
-+#if BUILDFLAG(ENABLE_WEBRTC)
-+#include "third_party/webrtc_overrides/init_webrtc.h"  // nogncheck
-+#endif
-+
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
- #if BUILDFLAG(USE_ZYGOTE)
-@@ -189,6 +194,10 @@
- #endif
- #endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
+-#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
  
 +#if BUILDFLAG(IS_BSD)
 +#include "base/system/sys_info.h"
@@ -39,7 +34,7 @@
  #if BUILDFLAG(IS_ANDROID)
  #include "base/system/sys_info.h"
  #include "content/browser/android/battery_metrics.h"
-@@ -377,7 +386,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -378,7 +382,7 @@ void InitializeZygoteSandboxForBrowserProcess(
  }
  #endif  // BUILDFLAG(USE_ZYGOTE)
  
@@ -48,17 +43,26 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
  // Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -413,15 +422,17 @@ void PreloadLibraryCdms() {
- }
- #endif  // BUILDFLAG(ENABLE_LIBRARY_CDMS)
+@@ -416,7 +420,10 @@ void PreSandboxInit() {
  
--#if BUILDFLAG(USE_ZYGOTE)
-+#if BUILDFLAG(USE_ZYGOTE) || BUILDFLAG(IS_BSD)
  void PreSandboxInit() {
-   // Pre-acquire resources needed by BoringSSL. See
+   // Ensure the /dev/urandom is opened.
++  // we use arc4random
++#if !BUILDFLAG(IS_BSD)
+   base::GetUrandomFD();
++#endif
+ 
+   // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
+   // files.
+@@ -427,9 +434,16 @@ void PreSandboxInit() {
    // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
    CRYPTO_pre_sandbox_init();
  
++#if BUILDFLAG(IS_BSD)
++  // "cache" the amount of physical memory before pledge(2)
++  base::SysInfo::AmountOfPhysicalMemoryMB();
++#endif
++
 +#if !BUILDFLAG(IS_BSD)
    // Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be
    // allowed by the sandbox.
@@ -67,28 +71,7 @@
  
  #if BUILDFLAG(ENABLE_PPAPI)
    // Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -442,6 +453,11 @@ void PreSandboxInit() {
-   }
- #endif
- 
-+#if BUILDFLAG(IS_BSD)
-+  // "cache" the amount of physical memory before pledge(2)
-+  base::SysInfo::AmountOfPhysicalMemoryMB();
-+#endif
-+
-   // Set the android SkFontMgr for blink. We need to ensure this is done
-   // before the sandbox is initialized to allow the font manager to access
-   // font configuration files on disk.
-@@ -629,7 +645,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* 
-   delegate->ZygoteStarting(&zygote_fork_delegates);
-   media::InitializeMediaLibrary();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   PreSandboxInit();
- #endif
- 
-@@ -832,11 +848,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -838,11 +852,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
               kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -102,8 +85,12 @@
  
  #endif  // !BUILDFLAG(IS_WIN)
  
-@@ -1033,6 +1048,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1039,8 +1052,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+       process_type == switches::kZygoteProcess) {
+     PreSandboxInit();
    }
++#elif BUILDFLAG(IS_BSD)
++  PreSandboxInit();
  #endif
  
 +#if BUILDFLAG(IS_BSD)
@@ -119,7 +106,7 @@
    delegate_->SandboxInitialized(process_type);
  
  #if BUILDFLAG(USE_ZYGOTE)
-@@ -1100,7 +1125,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1108,7 +1133,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
            ->ReconfigureAfterFeatureListInit(process_type);
      }
  
@@ -128,7 +115,7 @@
      // If dynamic Mojo Core is being used, ensure that it's loaded very early in
      // the child/zygote process, before any sandbox is initialized. The library
      // is not fully initialized with IPC support until a ChildProcess is later
-@@ -1138,6 +1163,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1143,6 +1168,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
    content_main_params_.reset();
  
    RegisterMainThreadFactories();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn
index cfc7edccc312..5c5ca02fd01c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/content/browser/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/browser/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -2360,6 +2360,13 @@ source_set("browser") {
-     ]
+@@ -2463,6 +2463,13 @@ jumbo_source_set("browser") {
+     deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
    }
  
 +  if (is_bsd) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc
index 0c89457a2238..4519ecdbfe58 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__child__process__host__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/content/browser/browser_child_process_host_impl.cc
-@@ -316,6 +316,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+@@ -321,6 +321,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
        switches::kDisableBestEffortTasks,
        switches::kDisableLogging,
        switches::kEnableLogging,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
index 517ac077bc56..3cba864debd2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/browser_main_loop.cc
-@@ -250,6 +250,12 @@
+@@ -251,6 +251,12 @@
  #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
  #endif
  
@@ -13,7 +13,7 @@
  // One of the linux specific headers defines this as a macro.
  #ifdef DestroyAll
  #undef DestroyAll
-@@ -543,6 +549,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -544,6 +550,12 @@ int BrowserMainLoop::EarlyInitialization() {
    // by now since a thread to start the ServiceManager has been created
    // before the browser main loop starts.
    DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,12 +26,12 @@
  #endif
  
    // GLib's spawning of new processes is buggy, so it's important that at this
-@@ -580,7 +592,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -581,7 +593,7 @@ int BrowserMainLoop::EarlyInitialization() {
    base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
  
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
 -    BUILDFLAG(IS_ANDROID)
 +    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
    // We use quite a few file descriptors for our IPC as well as disk the disk
-   // cache,and the default limit on the Mac is low (256), so bump it up.
+   // cache, and the default limit on Apple is low (256), so bump it up.
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
index 5b1da7855c20..7fee1010940d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher__helper__linux.cc
@@ -1,16 +1,19 @@
---- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/child_process_launcher_helper_linux.cc
-@@ -20,7 +20,9 @@
+@@ -21,8 +21,12 @@
  #include "content/public/common/result_codes.h"
  #include "content/public/common/sandboxed_process_launcher_delegate.h"
  #include "content/public/common/zygote/sandbox_support_linux.h"
 +#if !BUILDFLAG(IS_BSD)
  #include "content/public/common/zygote/zygote_handle.h"
-+#endif
  #include "sandbox/policy/linux/sandbox_linux.h"
++#else
++#include "sandbox/policy/sandbox.h"
++#endif
  
  namespace content {
-@@ -45,14 +47,20 @@ ChildProcessLauncherHelper::GetFilesToMap() {
+ namespace internal {
+@@ -46,14 +50,20 @@ bool ChildProcessLauncherHelper::IsUsingLaunchOptions(
  }
  
  bool ChildProcessLauncherHelper::IsUsingLaunchOptions() {
@@ -31,7 +34,7 @@
      // Convert FD mapping to FileHandleMappingVector
      options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment(
          base::GlobalDescriptors::kBaseDescriptor);
-@@ -64,7 +72,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
+@@ -65,7 +75,9 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche
  
      options->environment = delegate_->GetEnvironment();
    } else {
@@ -41,7 +44,7 @@
      // Environment variables could be supported in the future, but are not
      // currently supported when launching with the zygote.
      DCHECK(delegate_->GetEnvironment().empty());
-@@ -81,6 +91,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -82,6 +94,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
      int* launch_result) {
    *is_synchronous_launch = true;
    Process process;
@@ -49,7 +52,7 @@
    ZygoteCommunication* zygote_handle = GetZygoteForLaunch();
    if (zygote_handle) {
      // TODO(crbug.com/569191): If chrome supported multiple zygotes they could
-@@ -91,7 +102,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -92,7 +105,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          GetProcessType());
      *launch_result = LAUNCH_RESULT_SUCCESS;
  
@@ -57,7 +60,7 @@
      if (handle) {
        // It could be a renderer process or an utility process.
        int oom_score = content::kMiscOomScore;
-@@ -100,15 +110,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -101,15 +113,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
          oom_score = content::kLowestRendererOomScore;
        ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
      }
@@ -76,7 +79,7 @@
  
  #if BUILDFLAG(IS_CHROMEOS)
    if (GetProcessType() == switches::kRendererProcess) {
-@@ -130,10 +142,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -131,10 +145,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
      const ChildProcessLauncherHelper::Process& process,
      bool known_dead) {
    ChildProcessTerminationInfo info;
@@ -91,7 +94,7 @@
      info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
                                                        &info.exit_code);
    } else {
-@@ -157,13 +173,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -160,13 +178,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
    DCHECK(CurrentlyOnProcessLauncherTaskRunner());
    process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
    // On POSIX, we must additionally reap the child.
@@ -108,9 +111,9 @@
 +#endif
  }
  
- void ChildProcessLauncherHelper::SetProcessBackgroundedOnLauncherThread(
-@@ -174,11 +194,13 @@ void ChildProcessLauncherHelper::SetProcessBackgrounde
-     process.SetProcessBackgrounded(is_background);
+ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
+@@ -178,11 +200,13 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnL
+   }
  }
  
 +#if !BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc
index 3d0d2bcbdf8f..82013d2983c7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_viz__process__transport__factory.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/browser/compositor/viz_process_transport_factory.cc
-@@ -116,7 +116,7 @@ class HostDisplayClient : public viz::HostDisplayClien
+@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien
    // viz::HostDisplayClient:
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc
index 47562eb7d940..bc5aeb9a8c03 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc
-@@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
+@@ -49,7 +49,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
  // 1046598, and 1153667.
  // Windows builds need more time -- see Issue 873112 and 1004472.
  // Mac builds need more time - see Issue angleproject:6182.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc
new file mode 100644
index 000000000000..95bcf928750a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_file__system__access_file__system__access__local__path__watcher.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/content/browser/file_system_access/file_system_access_local_path_watcher.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/content/browser/file_system_access/file_system_access_local_path_watcher.cc
+@@ -56,7 +56,7 @@ void FileSystemAccessLocalPathWatcher::Initialize(
+   base::FilePathWatcher::WatchOptions watch_options {
+     .type = scope().IsRecursive() ? base::FilePathWatcher::Type::kRecursive
+                                   : base::FilePathWatcher::Type::kNonRecursive,
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     // Note: `report_modified_path` is also present on Android
+     // and Fuchsia. Update this switch if support for watching
+     // the local file system is added on those platforms.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc
new file mode 100644
index 000000000000..9d9098464fef
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.cc
+@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+   private_->OnDisplayMetricsChanged(display, changed_metrics);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool GpuDataManagerImpl::IsGpuMemoryBufferNV12Supported() {
+   base::AutoLock auto_lock(lock_);
+   return private_->IsGpuMemoryBufferNV12Supported();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h
new file mode 100644
index 000000000000..40e498c97e5f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl.h
+@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+   void OnDisplayMetricsChanged(const display::Display& display,
+                                uint32_t changed_metrics) override;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool IsGpuMemoryBufferNV12Supported();
+   void SetGpuMemoryBufferNV12Supported(bool supported);
+ #endif  // BUILDFLAG(IS_LINUX)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc
new file mode 100644
index 000000000000..1af2cff7314f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc
+@@ -1787,7 +1787,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+   UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool GpuDataManagerImplPrivate::IsGpuMemoryBufferNV12Supported() {
+   return is_gpu_memory_buffer_NV12_supported_;
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h
new file mode 100644
index 000000000000..18bd9de3b825
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h
+@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+   void OnDisplayMetricsChanged(const display::Display& display,
+                                uint32_t changed_metrics);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool IsGpuMemoryBufferNV12Supported();
+   void SetGpuMemoryBufferNV12Supported(bool supported);
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -306,7 +306,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+   bool application_is_visible_ = true;
+ 
+   bool disable_gpu_compositing_ = false;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool is_gpu_memory_buffer_NV12_supported_ = false;
+ #endif  // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
new file mode 100644
index 000000000000..fb3c0191ec87
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
+@@ -53,7 +53,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
+ #endif
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsGpuMemoryBufferNV12Supported() {
+   static bool is_computed = false;
+   static bool supported = false;
+@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
+     SetNativeConfigurations(std::move(configs));
+   }
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Dynamic check whether the NV12 format is supported as it may be
+   // inconsistent between the system GBM (Generic Buffer Management) and
+   // chromium miniGBM.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc
index 7d86c8262770..930a6df857d5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc
-@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = {
+@@ -256,6 +256,7 @@ static const char* const kSwitchNames[] = {
      switches::kEnableBackgroundThreadPool,
      switches::kEnableGpuRasterization,
      switches::kEnableLogging,
@@ -8,7 +8,7 @@
      switches::kDoubleBufferCompositing,
      switches::kHeadless,
      switches::kLoggingLevel,
-@@ -283,7 +284,7 @@ static const char* const kSwitchNames[] = {
+@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = {
      switches::kOzoneDumpFile,
      switches::kDisableBufferBWCompression,
  #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc
deleted file mode 100644
index 6d49b8fe66c9..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_frameless__media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc.orig	2022-08-31 12:19:35 UTC
-+++ src/3rdparty/chromium/content/browser/media/frameless_media_interface_proxy.cc
-@@ -16,7 +16,7 @@
- #include "media/mojo/mojom/renderer_extensions.mojom.h"
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/public/browser/stable_video_decoder_factory.h"
- #include "media/base/media_switches.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -67,7 +67,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder(
- 
-   mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
-       oop_video_decoder;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
-     if (!render_process_host_) {
-       if (!stable_vd_factory_remote_.is_bound()) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc
deleted file mode 100644
index d7025daf2fd0..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc.orig	2022-10-24 13:33:33 UTC
-+++ src/3rdparty/chromium/content/browser/media/media_interface_proxy.cc
-@@ -73,7 +73,7 @@
- #include "media/mojo/services/mojo_renderer_service.h"  // nogncheck
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/public/browser/stable_video_decoder_factory.h"
- #include "media/base/media_switches.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -286,7 +286,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
- 
-   mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
-       oop_video_decoder;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) {
-     render_frame_host().GetProcess()->CreateStableVideoDecoder(
-         oop_video_decoder.InitWithNewPipeAndPassReceiver());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc
index c4ec45daf0d9..ab773b105b71 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__keys__listener__manager__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/content/browser/media/media_keys_listener_manager_impl.cc
-@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
+@@ -234,7 +234,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc
index 3f3775cc4b05..7b48f931d99a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/network_service_instance_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/network_service_instance_impl.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/browser/network_service_instance_impl.cc
-@@ -76,7 +76,7 @@
+@@ -82,7 +82,7 @@
  #include "content/browser/network/network_service_process_tracker_win.h"
  #endif
  
@@ -9,12 +9,21 @@
  #include "content/browser/system_dns_resolution/system_dns_resolver.h"
  #include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
  #endif
-@@ -404,7 +404,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -421,7 +421,7 @@ void CreateInProcessNetworkService(
+ #endif
+ }
+ 
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Runs a self-owned SystemDnsResolverMojoImpl. This is meant to run on a
+ // high-priority thread pool.
+ void RunSystemDnsResolverOnThreadPool(
+@@ -488,7 +488,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
    }
  #endif  // BUILDFLAG(IS_POSIX)
  
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    if (GetContentClient()
            ->browser()
            ->ShouldRunOutOfProcessSystemDnsResolution() &&
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc
deleted file mode 100644
index 80adf88d5161..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_back__forward__cache__impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/content/browser/renderer_host/back_forward_cache_impl.cc.orig	2023-03-09 06:31:50 UTC
-+++ src/3rdparty/chromium/content/browser/renderer_host/back_forward_cache_impl.cc
-@@ -56,7 +56,7 @@ BASE_FEATURE(kBackForwardCacheSize,
- // Sets the BackForwardCache size for desktop.
- // See crbug.com/1291435.
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
--    BUILDFLAG(IS_CHROMEOS)
-+    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-              base::FEATURE_ENABLED_BY_DEFAULT
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc
index db196c7b2f00..bc9b7da1b672 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/delegated_frame_host.cc
-@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -312,7 +312,7 @@ void DelegatedFrameHost::EmbedSurface(
  
    if (!primary_surface_id ||
        primary_surface_id->local_surface_id() != local_surface_id_) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc
new file mode 100644
index 000000000000..fd80eb76142b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_media_service__video__capture__device__launcher.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/content/browser/renderer_host/media/service_video_capture_device_launcher.cc
+@@ -24,7 +24,7 @@
+ #include "media/base/media_switches.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "content/browser/gpu/gpu_data_manager_impl.h"
+ #endif
+ 
+@@ -166,7 +166,7 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAs
+   }
+ #else
+   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // On Linux, additionally check whether the NV12 GPU memory buffer is
+     // supported.
+     if (GpuDataManagerImpl::GetInstance()->IsGpuMemoryBufferNV12Supported())
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
index 7721b63b40fe..c4ce8d2eff8f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
-@@ -212,7 +212,7 @@
+@@ -218,7 +218,7 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include <sys/resource.h>
  
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
-@@ -1148,7 +1148,7 @@ size_t GetPlatformProcessLimit() {
+@@ -955,7 +955,7 @@ size_t GetPlatformProcessLimit() {
  // to indicate failure and std::numeric_limits<size_t>::max() to indicate
  // unlimited.
  size_t GetPlatformProcessLimit() {
@@ -18,7 +18,7 @@
    struct rlimit limit;
    if (getrlimit(RLIMIT_NPROC, &limit) != 0)
      return kUnknownPlatformProcessLimit;
-@@ -1240,7 +1240,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1098,7 +1098,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
          return;
      }
  
@@ -27,7 +27,7 @@
      if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
        ConnectToFontService(std::move(font_receiver));
        return;
-@@ -1329,7 +1329,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1187,7 +1187,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
    std::unique_ptr<service_manager::BinderRegistry> binders_;
    mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
  
@@ -36,29 +36,20 @@
    mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
        video_encode_accelerator_factory_remote_;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -2168,7 +2168,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
- }
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -3287,7 +3287,7 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+             base::TimeTicks::UnixEpoch().since_origin().InMicroseconds()));
+   }
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void RenderProcessHostImpl::CreateStableVideoDecoder(
-     mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) {
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -3356,6 +3356,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Append `kDisableVideoCaptureUseGpuMemoryBuffer` flag if there is no support
+   // for NV12 GPU memory buffer.
+   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled() &&
+@@ -3347,6 +3347,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
      switches::kDisableSpeechAPI,
      switches::kDisableThreadedCompositing,
      switches::kDisableTouchDragDrop,
 +    switches::kDisableUnveil,
-     switches::kDisableUseMojoVideoDecoderForPepper,
      switches::kDisableV8IdleTasks,
      switches::kDisableVideoCaptureUseGpuMemoryBuffer,
-@@ -4847,7 +4848,7 @@ void RenderProcessHostImpl::ResetIPC() {
-   coordinator_connector_receiver_.reset();
-   tracing_registration_.reset();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   stable_video_decoder_factory_remote_.reset();
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
+     switches::kDisableWebGLImageChromium,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h
index 9595b09fccf6..9f56dc81fc8f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.h
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.h
-@@ -85,7 +85,7 @@
- #include "content/public/browser/android/child_process_importance.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -495,7 +495,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -545,7 +545,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
    // Sets this RenderProcessHost to be guest only. For Testing only.
    void SetForGuestsOnlyForTesting();
  
@@ -18,21 +9,3 @@
    // Launch the zygote early in the browser startup.
    static void EarlyZygoteLaunch();
  #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
-@@ -704,7 +704,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
-       mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver)
-       override;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   void CreateStableVideoDecoder(
-       mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver)
-       override;
-@@ -1181,7 +1181,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
-   // RenderProcessHost. This is destroyed early in ResetIPC() method.
-   std::unique_ptr<PermissionServiceContext> permission_service_context_;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   // Connection to the StableVideoDecoderFactory that lives in a utility
-   // process. This is only used for out-of-process video decoding.
-   mojo::Remote<media::stable::mojom::StableVideoDecoderFactory>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc
index cf2fc7e43e27..7d964a964f7e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__view__host__impl.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_view_host_impl.cc
-@@ -250,7 +250,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
    prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
        display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   prefs->system_font_family_name = gfx::Font().GetFontName();
- #elif BUILDFLAG(IS_FUCHSIA)
-   // Make Blink's "focus ring" invisible. The focus ring is a hairline border
+   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+   if (command_line->HasSwitch(switches::kSystemFontFamily)) {
+     prefs->system_font_family_name =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc
index bf643fd9f732..ae80ad304554 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@
  #include "ui/gfx/gdi_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "content/browser/accessibility/browser_accessibility_auralinux.h"
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/linux/linux_ui.h"
-@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -461,7 +461,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
      return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
          ->GetCOM();
  
@@ -18,7 +18,7 @@
    BrowserAccessibilityManager* manager =
        host()->GetOrCreateRootBrowserAccessibilityManager();
    if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1588,7 +1588,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1720,7 +1720,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
    return GetTextInputManager() && GetTextInputManager()->should_do_learning();
  }
  
@@ -27,7 +27,7 @@
  bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
      const gfx::Range& range,
      const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2420,7 +2420,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2565,7 +2565,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
    return NeedsInputGrab();
  #else
    return false;
-@@ -2597,7 +2597,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2748,7 +2748,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
    if (!target_host)
      return;
  
@@ -44,4 +44,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!event.skip_in_browser && linux_ui && event.os_event &&
+   if (!event.skip_if_unhandled && linux_ui && event.os_event &&
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h
index 287bb394b0e3..0322e463770c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -257,7 +257,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 92d32cbb737a..22b15cee0a8c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
    if (event->type() == ui::ET_MOUSE_EXITED) {
      if (mouse_locked || selection_popup)
        return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc
index 6a3e81247fd9..98daadc85c81 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_sandbox__host__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/content/browser/sandbox_host_linux.cc.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/content/browser/sandbox_host_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/browser/sandbox_host_linux.cc
 @@ -45,6 +45,7 @@ void SandboxHostLinux::Init() {
    // Instead, it replies on a temporary socket provided by the caller.
    PCHECK(0 == shutdown(browser_socket, SHUT_WR)) << "shutdown";
  
-+#if !defined(OS_BSD) 
++#if !BUILDFLAG(IS_BSD) 
    int pipefds[2];
    CHECK(0 == pipe(pipefds));
    const int child_lifeline_fd = pipefds[0];
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc
index 5943ba589267..290ad1688b2d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_scheduler_responsiveness_jank__monitor__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/content/browser/scheduler/responsiveness/jank_monitor_impl.cc
-@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
+@@ -340,7 +340,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask
      // in context menus, among others). Simply ignore the mismatches for now.
      // See https://crbug.com/929813 for the details of why the mismatch
      // happens.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc
new file mode 100644
index 000000000000..477a7524b89c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_service__worker_service__worker__context__wrapper.cc
@@ -0,0 +1,15 @@
+--- src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/content/browser/service_worker/service_worker_context_wrapper.cc
+@@ -1409,7 +1409,12 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW
+     return;
+   }
+ 
++#if defined(__clang__) && (__clang_major__ >= 16)
+   auto [document_url, key, callback] = std::move(*request);
++#else
++  auto [d_u, key, callback] = std::move(*request);
++  auto document_url = d_u;
++#endif
+ 
+   DCHECK(document_url.is_valid());
+   TRACE_EVENT1("ServiceWorker",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
new file mode 100644
index 000000000000..82c2bac9c1b1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc
@@ -0,0 +1,56 @@
+--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/content/browser/utility_process_host.cc
+@@ -59,7 +59,7 @@
+ #include "content/browser/v8_snapshot_files.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
+ #include "base/pickle.h"
+@@ -69,7 +69,7 @@
+ #include "media/capture/capture_switches.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "base/task/sequenced_task_runner.h"
+ #include "components/viz/host/gpu_client.h"
+ #include "media/capture/capture_switches.h"
+@@ -80,7 +80,7 @@ namespace {
+ 
+ namespace {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ base::ScopedFD PassNetworkContextParentDirs(
+     std::vector<base::FilePath> network_context_parent_dirs) {
+   base::Pickle pickle;
+@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
+       started_(false),
+       name_(u"utility process"),
+       file_data_(std::make_unique<ChildProcessLauncherFileData>()),
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+       gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
+ #endif
+       client_(std::move(client)) {
+@@ -421,7 +421,7 @@ bool UtilityProcessHost::StartProcess() {
+     file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
+ #endif  // BUILDFLAG(IS_POSIX)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     // The network service should have access to the parent directories
+     // necessary for its usage.
+     if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
+@@ -432,7 +432,7 @@ bool UtilityProcessHost::StartProcess() {
+     }
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Pass `kVideoCaptureUseGpuMemoryBuffer` flag to video capture service only
+     // when the video capture use GPU memory buffer enabled and NV12 GPU memory
+     // buffer supported.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h
new file mode 100644
index 000000000000..aea00e23d172
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/content/browser/utility_process_host.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/content/browser/utility_process_host.h
+@@ -39,7 +39,7 @@ namespace base {
+ class Thread;
+ }  // namespace base
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ namespace viz {
+ class GpuClient;
+ }  // namespace viz
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost
+   std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc
index 314f93bed1bb..d35523053a30 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__receiver__bindings.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/browser/utility_process_host_receiver_bindings.cc
-@@ -10,7 +10,7 @@
+@@ -10,12 +10,12 @@
  #include "content/public/browser/content_browser_client.h"
  #include "content/public/common/content_client.h"
  
@@ -9,7 +9,13 @@
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
  #include "content/browser/font_service.h"  // nogncheck
  #endif
-@@ -19,7 +19,7 @@ namespace content {
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "components/viz/host/gpu_client.h"
+ #include "content/public/browser/gpu_client.h"
+ #endif
+@@ -24,13 +24,13 @@ namespace content {
  
  void UtilityProcessHost::BindHostReceiver(
      mojo::GenericPendingReceiver receiver) {
@@ -18,3 +24,10 @@
    if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
      ConnectToFontService(std::move(font_receiver));
      return;
+   }
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
+     gpu_client_ =
+         content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc
index 1b208bccaa05..7ce84ddd1fc5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__sandbox__delegate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/content/browser/utility_sandbox_delegate.cc
-@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate::
  #if BUILDFLAG(ENABLE_PPAPI)
        sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
  #endif
@@ -17,7 +17,7 @@
        sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -117,10 +117,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
+@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
    // unsandboxed zygote and then apply their actual sandboxes in the forked
    // process upon startup.
    if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc
index d24e69eab48d..7fa4e49ef2cf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/browser/web_contents/web_contents_view_aura.cc
 @@ -178,7 +178,7 @@ class WebDragSourceAura : public content::WebContentsO
    raw_ptr<aura::Window> window_;
@@ -18,7 +18,7 @@
    // We set the file contents before the URL because the URL also sets file
    // contents (to a .URL shortcut).  We want to prefer file content data over
    // a shortcut so we add it first.
-@@ -1371,7 +1371,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1340,7 +1340,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
      // Linux window managers like to handle raise-on-click themselves.  If we
      // raise-on-click manually, this may override user settings that prevent
      // focus-stealing.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc
index ba73c6926ab2..d4e2edce9b70 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/content/browser/webui/web_ui_main_frame_observer.cc
 @@ -13,7 +13,7 @@
  #include "content/public/browser/navigation_handle.h"
@@ -27,7 +27,7 @@
  void WebUIMainFrameObserver::OnDidAddMessageToConsole(
      RenderFrameHost* source_frame,
      blink::mojom::ConsoleMessageLevel log_level,
-@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
+@@ -167,7 +167,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
  
  // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
  // thunking issues. Fix & re-enable.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
index 0ad768406f15..dde0143d78ed 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_browser_zygote__host_zygote__host__impl__linux.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2023-11-20 16:08:07 UTC
+--- src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -20,8 +20,10 @@
+@@ -20,13 +20,19 @@
  #include "build/chromeos_buildflags.h"
  #include "content/common/zygote/zygote_commands_linux.h"
  #include "content/common/zygote/zygote_communication_linux.h"
@@ -11,7 +11,16 @@
  #include "sandbox/linux/services/credentials.h"
  #include "sandbox/linux/services/namespace_sandbox.h"
  #include "sandbox/linux/suid/client/setuid_sandbox_host.h"
-@@ -39,6 +41,7 @@ namespace {
+ #include "sandbox/linux/suid/common/sandbox.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ #include "sandbox/policy/switches.h"
+ 
+ #if BUILDFLAG(IS_CHROMEOS)
+@@ -39,6 +45,7 @@ namespace {
  
  namespace {
  
@@ -19,7 +28,7 @@
  // Receive a fixed message on fd and return the sender's PID.
  // Returns true if the message received matches the expected message.
  bool ReceiveFixedMessage(int fd,
-@@ -60,6 +63,7 @@ bool ReceiveFixedMessage(int fd,
+@@ -60,6 +67,7 @@ bool ReceiveFixedMessage(int fd,
      return false;
    return true;
  }
@@ -27,7 +36,7 @@
  
  }  // namespace
  
-@@ -69,9 +73,13 @@ ZygoteHostImpl::ZygoteHostImpl()
+@@ -69,9 +77,13 @@ ZygoteHostImpl::ZygoteHostImpl()
  }
  
  ZygoteHostImpl::ZygoteHostImpl()
@@ -41,7 +50,7 @@
        sandbox_binary_(),
        zygote_pids_lock_(),
        zygote_pids_() {}
-@@ -84,6 +92,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+@@ -84,6 +96,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
  }
  
  void ZygoteHostImpl::Init(const base::CommandLine& command_line) {
@@ -49,7 +58,7 @@
    if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) {
      return;
    }
-@@ -134,6 +143,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
+@@ -134,6 +147,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com
             "you can try using --"
          << sandbox::policy::switches::kNoSandbox << ".";
    }
@@ -57,7 +66,7 @@
  }
  
  void ZygoteHostImpl::AddZygotePid(pid_t pid) {
-@@ -158,6 +168,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -158,6 +172,7 @@ pid_t ZygoteHostImpl::LaunchZygote(
      base::CommandLine* cmd_line,
      base::ScopedFD* control_fd,
      base::FileHandleMappingVector additional_remapped_fds) {
@@ -65,7 +74,7 @@
    int fds[2];
  #if !defined(TOOLKIT_QT)
    CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds));
-@@ -232,9 +243,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
+@@ -232,9 +247,12 @@ pid_t ZygoteHostImpl::LaunchZygote(
  
    AddZygotePid(pid);
    return pid;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc
index 39e9f408b7dc..5e6ce6e52391 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_child_child__process.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/content/child/child_process.cc.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/content/child/child_process.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/child/child_process.cc
-@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
-   DCHECK(!g_lazy_child_process_tls.Pointer()->Get());
-   g_lazy_child_process_tls.Pointer()->Set(this);
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -70,7 +70,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
+       io_thread_(std::make_unique<ChildIOThread>()) {
    const base::CommandLine& command_line =
        *base::CommandLine::ForCurrentProcess();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    const bool is_embedded_in_browser_process =
+       !command_line.HasSwitch(switches::kProcessType);
+   if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn
index 22c49257a7b5..2c3e5ed10695 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/common/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/common/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/common/BUILD.gn
-@@ -449,6 +449,9 @@ if (is_linux || is_chromeos) {
+@@ -452,6 +452,9 @@ if (is_linux || is_chromeos) {
      public = [ "set_process_title_linux.h" ]
      sources = [ "set_process_title_linux.cc" ]
      deps = [ "//base" ]
@@ -10,7 +10,7 @@
    }
  }
  
-@@ -497,7 +500,7 @@ mojom("mojo_bindings") {
+@@ -498,7 +501,7 @@ mojom("mojo_bindings") {
    if (enable_ipc_logging) {
      enabled_features += [ "ipc_logging" ]
    }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc
new file mode 100644
index 000000000000..068d9a30097e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_common_zygote_sandbox__support__linux.cc
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/content/common/zygote/sandbox_support_linux.cc
+@@ -8,7 +8,11 @@
+ #include "base/posix/global_descriptors.h"
+ #include "base/posix/unix_domain_socket.h"
+ #include "content/public/common/content_descriptors.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
++#else
+ #include "sandbox/policy/linux/sandbox_linux.h"
++#endif
+ 
+ namespace content {
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn
new file mode 100644
index 000000000000..c28dadfad11f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/content/gpu/BUILD.gn.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/content/gpu/BUILD.gn
+@@ -107,6 +107,17 @@ target(link_target_type, "gpu_sources") {
+     }
+   }
+ 
++  if (is_bsd) {
++    sources -= [
++      "gpu_sandbox_hook_linux.cc",
++      "gpu_sandbox_hook_linux.h",
++    ]
++    sources += [
++      "gpu_sandbox_hook_bsd.cc",
++      "gpu_sandbox_hook_bsd.h",
++    ]
++  }
++
+   if (is_chromeos_ash) {
+     deps += [
+       "//components/services/font/public/cpp",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
index f50f4c5dfade..e0b2facb3e42 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc
@@ -1,15 +1,19 @@
---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/gpu/gpu_main.cc
-@@ -89,7 +89,7 @@
- #include "sandbox/win/src/sandbox.h"
+@@ -96,6 +96,12 @@
+ #include "sandbox/policy/sandbox_type.h"
  #endif
  
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/gpu/gpu_sandbox_hook_linux.h"
- #include "sandbox/policy/linux/sandbox_linux.h"
- #include "sandbox/policy/sandbox_type.h"
-@@ -110,7 +110,7 @@ namespace content {
++#if BUILDFLAG(IS_BSD)
++#include "content/gpu/gpu_sandbox_hook_bsd.h"
++#include "sandbox/policy/sandbox.h"
++#include "sandbox/policy/sandbox_type.h"
++#endif
++
+ #if BUILDFLAG(IS_MAC)
+ #include "base/message_loop/message_pump_apple.h"
+ #include "components/metal_util/device_removal.h"
+@@ -112,7 +118,7 @@ namespace {
  
  namespace {
  
@@ -18,7 +22,7 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread*,
                         const gpu::GPUInfo*,
                         const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -177,7 +183,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
    bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
                                  const gpu::GPUInfo* gpu_info,
                                  const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +31,7 @@
      return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
  #elif BUILDFLAG(IS_WIN)
      return StartSandboxWindows(sandbox_info_);
-@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -287,7 +293,7 @@ int GpuMain(MainFunctionParams parameters) {
            std::make_unique<base::SingleThreadTaskExecutor>(
                gpu_preferences.message_pump_type);
      }
@@ -36,7 +40,7 @@
  #error "Unsupported Linux platform."
  #elif BUILDFLAG(IS_MAC)
      // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -405,7 +405,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -422,7 +428,7 @@ namespace {
  
  namespace {
  
@@ -45,3 +49,12 @@
  bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
                         const gpu::GPUInfo* gpu_info,
                         const gpu::GpuPreferences& gpu_prefs) {
+@@ -462,7 +468,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+   sandbox_options.accelerated_video_encode_enabled =
+       !gpu_prefs.disable_accelerated_video_encode;
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Video decoding of many video streams can use thousands of FDs as well as
+   // Exo clients like Lacros.
+   // See https://crbug.com/1417237
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc
new file mode 100644
index 000000000000..0ec98f987d6d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.cc
@@ -0,0 +1,72 @@
+--- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.cc.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.cc
+@@ -0,0 +1,69 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "content/gpu/gpu_sandbox_hook_bsd.h"
++
++#include <dlfcn.h>
++#include <errno.h>
++#include <sys/stat.h>
++
++#include <memory>
++#include <sstream>
++#include <utility>
++#include <vector>
++
++#include "base/base_paths.h"
++#include "base/files/file_enumerator.h"
++#include "base/files/file_path.h"
++#include "base/files/scoped_file.h"
++#include "base/functional/bind.h"
++#include "base/logging.h"
++#include "base/path_service.h"
++#include "base/strings/stringprintf.h"
++#include "build/build_config.h"
++#include "build/buildflag.h"
++#include "build/chromeos_buildflags.h"
++#include "content/common/set_process_title.h"
++#include "content/public/common/content_switches.h"
++#include "media/gpu/buildflags.h"
++
++namespace content {
++namespace {
++
++constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
++
++void LoadVulkanLibraries() {
++  // Try to preload Vulkan libraries. Failure is not an error as not all may be
++  // present.
++  const char* kLibraries[] = {
++      "libvulkan.so",
++      "libvulkan_intel.so",
++      "libvulkan_intel_hasvk.so",
++      "libvulkan_radeon.so",
++  };
++  for (const auto* library : kLibraries) {
++    dlopen(library, dlopen_flag);
++  }
++}
++
++bool LoadLibrariesForGpu(
++    const sandbox::policy::SandboxSeccompBPF::Options& options) {
++  LoadVulkanLibraries();
++
++  return true;
++}
++
++}  // namespace
++
++bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
++  if (!LoadLibrariesForGpu(options))
++    return false;
++
++  // TODO(tsepez): enable namspace sandbox here once crashes are understood.
++
++  errno = 0;
++  return true;
++}
++
++}  // namespace content
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h
new file mode 100644
index 000000000000..128ed7a19949
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__bsd.h
@@ -0,0 +1,19 @@
+--- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_bsd.h
+@@ -0,0 +1,16 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
++#define CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
++
++#include "sandbox/policy/sandbox.h"
++
++namespace content {
++
++bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options);
++
++}  // namespace content
++
++#endif  // CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc
deleted file mode 100644
index 6920209bd382..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/content/gpu/gpu_sandbox_hook_linux.cc
-@@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions(
-   }
- }
- 
-+#if !defined(OS_BSD)
- void AddV4L2GpuPermissions(
-     std::vector<BrokerFilePermission>* permissions,
-     const sandbox::policy::SandboxSeccompBPF::Options& options) {
-@@ -484,8 +485,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
-   AddStandardGpuPermissions(&permissions);
-   return permissions;
- }
-+#endif
- 
- void LoadArmGpuLibraries() {
-+#if !defined(OS_BSD)
-   // Preload the Mali library.
-   if (UseChromecastSandboxAllowlist()) {
-     for (const char* path : kAllowedChromecastPaths) {
-@@ -530,6 +533,7 @@ void LoadArmGpuLibraries() {
-         dlopen(driver_paths[i], dlopen_flag);
-     }
-   }
-+#endif
- }
- 
- bool LoadAmdGpuLibraries() {
-@@ -597,12 +601,14 @@ void LoadV4L2Libraries(
- }
- 
- void LoadChromecastV4L2Libraries() {
-+#if !defined(OS_BSD)
-   for (const char* path : kAllowedChromecastPaths) {
-     const std::string library_path(std::string(path) +
-                                    std::string("libvpcodec.so"));
-     if (dlopen(library_path.c_str(), dlopen_flag))
-       break;
-   }
-+#endif
- }
- 
- bool LoadLibrariesForGpu(
-@@ -629,6 +635,7 @@ bool LoadLibrariesForGpu(
-   return true;
- }
- 
-+#if !defined(OS_BSD)
- sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
-     const sandbox::policy::SandboxLinux::Options& options) {
-   sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -652,13 +659,17 @@ bool BrokerProcessPreSandboxHook(
-   SetProcessTitleFromCommandLine(nullptr);
-   return true;
- }
-+#endif
- 
- }  // namespace
- 
- bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+  NOTIMPLEMENTED();
-+#if !defined(OS_BSD)
-   sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
-       CommandSetForGPU(options), FilePermissionsForGpu(options),
-       base::BindOnce(BrokerProcessPreSandboxHook), options);
-+#endif
- 
-   if (!LoadLibrariesForGpu(options))
-     return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
index d5e6a99f12c2..f863f26662e2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc
 @@ -20,7 +20,7 @@
  
@@ -18,7 +18,7 @@
    mojo::PendingRemote<font_service::mojom::FontService> font_service;
    ChildThread::Get()->BindHostReceiver(
        font_service.InitWithNewPipeAndPassReceiver());
-@@ -53,7 +53,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
  void PpapiBlinkPlatformImpl::Shutdown() {}
  
  blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h
index de15ece47ec6..f5eb17471071 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2022-07-22 17:30:31 UTC
+--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -12,7 +12,7 @@
- #include "build/build_config.h"
- #include "content/child/blink_platform_impl.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"
- #include "third_party/skia/include/core/SkRefCnt.h"
- #endif
-@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
    blink::WebString DefaultLocale() override;
  
   private:
@@ -17,9 +8,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   sk_sp<font_service::FontLoader> font_loader_;
- #endif
  };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc
index 58b3d3f9e158..e70ef9f3685c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__plugin__main.cc
@@ -1,18 +1,18 @@
---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_plugin_main.cc
 @@ -54,6 +54,11 @@
  #include "gin/v8_initializer.h"
  #endif
  
-+#if BUILDFLAG(IS_OPENBSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
 +#include "sandbox/policy/sandbox_type.h"
 +#endif
 +
  #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
  #include <stdlib.h>
  #endif
-@@ -148,7 +153,7 @@ int PpapiPluginMain(MainFunctionParams parameters) {
+@@ -150,7 +155,7 @@ int PpapiPluginMain(MainFunctionParams parameters) {
    gin::V8Initializer::LoadV8Snapshot();
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h
deleted file mode 100644
index cf9b4383ff71..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_browser_render__process__host.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/3rdparty/chromium/content/public/browser/render_process_host.h.orig	2023-08-16 19:50:41 UTC
-+++ src/3rdparty/chromium/content/public/browser/render_process_host.h
-@@ -53,7 +53,7 @@
- #include "content/public/browser/android/child_process_importance.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h"
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- 
-@@ -643,7 +643,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S
-       const blink::StorageKey& storage_key,
-       mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   virtual void CreateStableVideoDecoder(
-       mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder>
-           receiver) = 0;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h
deleted file mode 100644
index 37d5f65f805d..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
-@@ -113,7 +113,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences)
-   IPC_STRUCT_TRAITS_MEMBER(accept_languages)
-   IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
-   IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
- #endif
- #if BUILDFLAG(IS_WIN)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
index d592aeeaf729..3084de3ef633 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/public/common/content_features.cc
-@@ -39,7 +39,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces
+@@ -53,7 +53,7 @@ CONSTINIT const base::Feature kAudioServiceOutOfProces
               "AudioServiceOutOfProcess",
  // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being
  // built with OS_CHROMEOS instead of OS_LINUX.
@@ -9,7 +9,7 @@
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
-@@ -51,7 +51,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox(
+@@ -65,7 +65,7 @@ CONSTINIT const base::Feature kAudioServiceSandbox(
  // kAudioServiceOutOfProcess feature is enabled.
  CONSTINIT const base::Feature kAudioServiceSandbox(
               "AudioServiceSandbox",
@@ -18,7 +18,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -547,7 +547,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_
+@@ -553,7 +553,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_
  // (activated by kUserAgentClientHint)
  BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -27,7 +27,7 @@
  // Supports proxying thread type changes of renderer processes to browser
  // process and having browser process handle adjusting thread properties (nice
  // value, c-group, latency sensitivity...) for renderers which have sandbox
-@@ -1367,7 +1367,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler(
+@@ -1463,7 +1463,7 @@ CONSTINIT const base::Feature kWebAssemblyTrapHandler(
  CONSTINIT const base::Feature kWebAssemblyTrapHandler(
               "WebAssemblyTrapHandler",
  #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -36,7 +36,7 @@
       defined(ARCH_CPU_X86_64)) ||                                           \
      (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1425,7 +1425,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1515,7 +1515,11 @@ BASE_FEATURE(kWebUICodeCache,
  
  // Controls whether the WebUSB API is enabled:
  // https://wicg.github.io/webusb
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h
index de357c63ced2..d7ee045c1029 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.h
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/content/public/common/content_features.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/public/common/content_features.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/public/common/content_features.h
-@@ -115,7 +115,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens);
+@@ -120,7 +120,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
+     kFledgeLimitNumAuctionsParam;
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets);
  CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH);
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc
index 535f44c60e96..99948ec551ee 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/public/common/content_switches.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/public/common/content_switches.cc
-@@ -368,6 +368,8 @@ const char kEnableLogging[]                 = "enable-
+@@ -367,6 +367,8 @@ const char kEnableLogging[]                 = "enable-
  // builds.
  const char kEnableLogging[]                 = "enable-logging";
  
@@ -9,7 +9,7 @@
  // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
  // triggering of change attribute of the NetInfo API when there is a change in
  // the connection type.
-@@ -997,7 +999,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -994,7 +996,7 @@ const char kEnableAutomation[] = "enable-automation";
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h
index ba30c2a1a589..ce4c47018ec3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/public/common/content_switches.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/public/common/content_switches.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/public/common/content_switches.h
-@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableLogging[];
+@@ -116,6 +116,7 @@ CONTENT_EXPORT extern const char kEnableLogging[];
  CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
  CONTENT_EXPORT extern const char kEnableLCDText[];
  CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,12 +8,12 @@
  CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
  CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
  CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -269,7 +270,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -267,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
+ CONTENT_EXPORT extern const char kLLVMProfileFile[];
  #endif
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn
index 4410e83b82ca..bf4e7b20e0a2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/renderer/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/renderer/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/renderer/BUILD.gn
-@@ -201,6 +201,13 @@ target(link_target_type, "renderer") {
+@@ -202,6 +202,13 @@ target(link_target_type, "renderer") {
      ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc
index 14d4ad1a1c8d..af37d4bcacc1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/content/renderer/render_process_impl.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/content/renderer/render_process_impl.cc
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
  #if BUILDFLAG(IS_WIN)
  #include "base/win/win_util.h"
  #endif
@@ -9,9 +9,9 @@
  #include "v8/include/v8-wasm-trap-handler-posix.h"
  #endif
  
-@@ -223,7 +223,7 @@ RenderProcessImpl::RenderProcessImpl()
-   SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
-                         "--no-wasm-dynamic-tiering");
+@@ -211,7 +211,7 @@ RenderProcessImpl::RenderProcessImpl()
+     v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
+   }
  
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
index ffa541d18f0a..26b8b530e9d3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
-@@ -201,6 +201,8 @@
+@@ -204,6 +204,8 @@
  
  #if BUILDFLAG(IS_APPLE)
  #include <malloc/malloc.h>
@@ -9,8 +9,8 @@
  #else
  #include <malloc.h>
  #endif
-@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
-           kGpuStreamPriorityMedia);
+@@ -1054,7 +1056,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+                              kGpuStreamIdMedia, kGpuStreamPriorityMedia);
  
    const bool enable_video_decode_accelerator =
 -#if BUILDFLAG(IS_LINUX)
@@ -18,7 +18,7 @@
        base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
  #endif  // BUILDFLAG(IS_LINUX)
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1063,7 +1065,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
         gpu::kGpuFeatureStatusEnabled);
  
    const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
        base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
  #else
        !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1863,7 +1865,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1835,7 +1837,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
      bool enable_video_encode_accelerator) {
    mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
        vea_provider;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
index 3bfa097f2559..060686c4c243 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc
-@@ -111,7 +111,7 @@
+@@ -114,7 +114,7 @@
  
  #if BUILDFLAG(IS_MAC)
  #include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,8 +9,15 @@
  #include "content/child/child_process_sandbox_support_impl_linux.h"
  #endif
  
-@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -182,13 +182,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+       sudden_termination_disables_(0),
+       is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   sk_sp<font_service::FontLoader> font_loader;
+ #endif
+ 
    // RenderThread may not exist in some tests.
    if (RenderThreadImpl::current()) {
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +25,7 @@
      mojo::PendingRemote<font_service::mojom::FontService> font_service;
      RenderThreadImpl::current()->BindHostReceiver(
          font_service.InitWithNewPipeAndPassReceiver());
-@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -197,7 +197,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
  #endif
    }
  
@@ -27,7 +34,7 @@
    if (sandboxEnabled()) {
  #if BUILDFLAG(IS_MAC)
      sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -245,7 +245,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -255,7 +255,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
  #endif
  
  blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
index 2789c4d5a798..dcb3e128fd14 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h
-@@ -32,7 +32,7 @@
- #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
- #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
- #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
- #endif
-@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
    void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
                                     const gpu::GPUInfo& gpu_info) const;
  
@@ -18,12 +9,3 @@
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
  
-@@ -265,7 +265,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
-   mutable base::WaitableEvent io_thread_id_ready_event_;
-   base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   sk_sp<font_service::FontLoader> font_loader_;
- #endif
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc
index 1ebfc9a23937..b85856e382f0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc
 @@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() {
    // any renderer has been started.
    // Here, we test that the status of SeccompBpf in the renderer is consistent
    // with what SandboxLinux::GetStatus() said we would do.
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
    auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
    if (linux_sandbox->GetStatus() & sandbox::policy::SandboxLinux::kSeccompBPF) {
      CHECK(linux_sandbox->seccomp_bpf_started());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn
index a7caeb229c6f..f359dfb9b3cf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/shell/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/shell/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/shell/BUILD.gn
-@@ -968,7 +968,7 @@ group("content_shell_crash_test") {
+@@ -1029,7 +1029,7 @@ group("content_shell_crash_test") {
    if (is_win) {
      data_deps += [ "//build/win:copy_cdb_to_output" ]
    }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc
index 228b6a2a1272..e486515dc0f5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_shell_app_shell__main__delegate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/content/shell/app/shell_main_delegate.cc
-@@ -221,7 +221,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -223,7 +223,7 @@ void ShellMainDelegate::PreSandboxStartup() {
      // Reporting for sub-processes will be initialized in ZygoteForked.
      if (process_type != switches::kZygoteProcess) {
        crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn
index d395863a26de..3ab8bdf4ba9f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/content/test/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/test/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/test/BUILD.gn
-@@ -2129,7 +2129,7 @@ static_library("run_all_unittests") {
+@@ -2235,7 +2235,7 @@ static_library("run_all_unittests") {
      ":test_support",
      "//base/test:test_support",
    ]
@@ -9,7 +9,7 @@
      deps += [ "//content/common:set_process_title_linux" ]
    }
  }
-@@ -3162,7 +3162,7 @@ test("content_unittests") {
+@@ -3304,7 +3304,7 @@ test("content_unittests") {
      deps += [ "//third_party/boringssl" ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc
index 3466a1eababe..b9c83c39cd00 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_services.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/utility/services.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/content/utility/services.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/utility/services.cc
 @@ -64,7 +64,7 @@
  extern sandbox::TargetServices* g_utility_target_services;
@@ -18,7 +18,16 @@
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  #include "media/mojo/services/stable_video_decoder_factory_process_service.h"  // nogncheck
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
-@@ -215,7 +215,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+@@ -109,7 +109,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+ #include "ui/accessibility/accessibility_features.h"
+ #endif  // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+@@ -226,7 +226,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
        << "task_policy_set TASK_QOS_POLICY";
  #endif
  
@@ -27,7 +36,16 @@
    auto* command_line = base::CommandLine::ForCurrentProcess();
    if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
        sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -319,7 +319,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+@@ -308,7 +308,7 @@ auto RunVideoCapture(
+     mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
+   auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
+       std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+     mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
+     content::UtilityThread::Get()->BindHostReceiver(
+@@ -340,7 +340,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
@@ -36,7 +54,7 @@
      (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  auto RunStableVideoDecoderFactoryProcessService(
      mojo::PendingReceiver<
-@@ -330,7 +330,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -351,7 +351,7 @@ auto RunStableVideoDecoderFactoryProcessService(
  #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
          // (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
  
@@ -45,7 +63,7 @@
  auto RunVideoEncodeAcceleratorProviderFactory(
      mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
          receiver) {
-@@ -388,13 +388,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
+@@ -415,13 +415,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory& 
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
          // BUILDFLAG(USE_V4L2_CODEC))
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h
index 47ea1e2db86d..2318cee151ab 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_speech_speech__recognition__sandbox__hook__linux.h
@@ -1,11 +1,13 @@
---- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/utility/speech/speech_recognition_sandbox_hook_linux.h
-@@ -5,7 +5,11 @@
+@@ -5,7 +5,13 @@
  #ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
  #define CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
  
-+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "build/build_config.h"
++
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index 6d1f254912d1..74a53a4cf400 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc
 @@ -9,7 +9,7 @@
  
@@ -18,7 +18,7 @@
    mojo::PendingRemote<font_service::mojom::FontService> font_service;
    UtilityThread::Get()->BindHostReceiver(
        font_service.InitWithNewPipeAndPassReceiver());
-@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
+@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
  
  blink::WebSandboxSupport*
  UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h
index 2f75ecf9db8d..6d6a2dd0654e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.h
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- #include "third_party/blink/public/platform/platform.h"
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
- #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
- #endif
-@@ -38,10 +38,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
+@@ -33,7 +33,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
    blink::WebSandboxSupport* GetSandboxSupport() override;
  
   private:
@@ -17,8 +8,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
    std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
  #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   sk_sp<font_service::FontLoader> font_loader_;
- #endif
  };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc
index ec6534574ccd..686fe2e4cc1b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__main.cc
@@ -1,23 +1,26 @@
---- src/3rdparty/chromium/content/utility/utility_main.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/utility/utility_main.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/utility/utility_main.cc
-@@ -31,7 +31,7 @@
+@@ -34,7 +34,7 @@
  #include "third_party/icu/source/common/unicode/unistr.h"
  #include "third_party/icu/source/i18n/unicode/timezone.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/file_descriptor_store.h"
+ #include "base/files/file_util.h"
+ #include "base/pickle.h"
+@@ -42,7 +42,9 @@
  #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
  #include "gpu/config/gpu_info_collector.h"
  #include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
-@@ -42,15 +42,21 @@
- #if BUILDFLAG(ENABLE_PRINTING)
- #include "printing/sandbox/print_backend_sandbox_hook_linux.h"
- #endif
 +#if !BUILDFLAG(IS_BSD)
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
  #include "services/audio/audio_sandbox_hook_linux.h"
  #include "services/network/network_sandbox_hook_linux.h"
+ // gn check is not smart enough to realize that this include only applies to
+@@ -54,10 +56,14 @@
+ #endif
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -26,13 +29,13 @@
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
  
 +#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#endif
 +
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "chromeos/ash/components/assistant/buildflags.h"
  #include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -62,7 +68,7 @@
+@@ -69,7 +75,7 @@
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
  #if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
@@ -41,12 +44,17 @@
  #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"  // nogncheck
  #endif
  
-@@ -83,10 +89,10 @@ namespace {
+@@ -95,7 +101,7 @@ namespace {
  
  namespace {
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ std::vector<std::string> GetNetworkContextsParentDirectories() {
+   base::MemoryMappedFile::Region region;
+   base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
+@@ -123,7 +129,7 @@ bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox san
+ 
  bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
    const bool obtain_gpu_info =
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -54,7 +62,7 @@
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
        sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -168,7 +174,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -239,7 +245,7 @@ int UtilityMain(MainFunctionParams parameters) {
      }
    }
  
@@ -63,7 +71,7 @@
    // Initializes the sandbox before any threads are created.
    // TODO(jorgelo): move this after GTK initialization when we enable a strict
    // Seccomp-BPF policy.
-@@ -200,7 +206,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -272,7 +278,7 @@ int UtilityMain(MainFunctionParams parameters) {
  #endif
        break;
  #endif
@@ -72,7 +80,7 @@
      case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
        pre_sandbox_hook =
            base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -227,6 +233,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -299,6 +305,7 @@ int UtilityMain(MainFunctionParams parameters) {
      default:
        break;
    }
@@ -80,7 +88,7 @@
    if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
        (parameters.zygote_child || !pre_sandbox_hook.is_null())) {
      sandbox::policy::SandboxLinux::Options sandbox_options;
-@@ -235,6 +242,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -307,6 +314,11 @@ int UtilityMain(MainFunctionParams parameters) {
      sandbox::policy::Sandbox::Initialize(
          sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
    }
@@ -89,6 +97,6 @@
 +      sandbox_type, std::move(pre_sandbox_hook),
 +      sandbox::policy::SandboxLinux::Options());
 +#endif
- #elif BUILDFLAG(IS_WIN)
-   g_utility_target_services = parameters.sandbox_info->target_services;
- #endif
+ 
+   // Start the HangWatcher now that the sandbox is engaged, if it hasn't
+   // already been started.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc
index 89dbfd1880d8..ef586f15e77a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__linux.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/content/zygote/zygote_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/content/zygote/zygote_linux.cc
 @@ -1,6 +1,7 @@
  // Copyright 2012 The Chromium Authors
@@ -8,7 +8,7 @@
  
  #include "content/zygote/zygote_linux.h"
  
-@@ -706,3 +707,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
+@@ -707,3 +708,4 @@ void Zygote::HandleReinitializeLoggingRequest(base::Pi
  }
  
  }  // namespace content
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc
index c3951e0b9545..ec201757b5e7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_content_zygote_zygote__main__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/content/zygote/zygote_main_linux.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/content/zygote/zygote_main_linux.cc
 @@ -11,7 +11,9 @@
  #include <stddef.h>
  #include <stdint.h>
  #include <string.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  #include <sys/prctl.h>
 +#endif
  #include <sys/socket.h>
@@ -14,33 +14,27 @@
  #include "sandbox/linux/services/thread_helpers.h"
  #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
  #include "sandbox/policy/linux/sandbox_debug_handling_linux.h"
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
  #include "sandbox/policy/sandbox.h"
  #include "sandbox/policy/switches.h"
  #include "third_party/icu/source/i18n/unicode/timezone.h"
-@@ -50,6 +54,7 @@ namespace {
+@@ -50,11 +54,13 @@ namespace {
  
  namespace {
  
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  void CloseFds(const std::vector<int>& fds) {
    for (const auto& it : fds) {
      PCHECK(0 == IGNORE_EINTR(close(it)));
-@@ -67,9 +72,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo
-       },
-       std::move(one), std::move(two));
+   }
  }
 +#endif
  
- }  // namespace
- 
-+#if !defined(OS_BSD)
- // This function triggers the static and lazy construction of objects that need
- // to be created before imposing the sandbox.
- static void ZygotePreSandboxInit() {
-@@ -176,9 +183,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
+ base::OnceClosure ClosureFromTwoClosures(base::OnceClosure one,
+                                          base::OnceClosure two) {
+@@ -159,9 +165,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
      CHECK(!using_layer1_sandbox);
    }
  }
@@ -48,11 +42,11 @@
  
  bool ZygoteMain(
      std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) {
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
    sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
  
    auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
-@@ -244,6 +253,9 @@ bool ZygoteMain(
+@@ -227,6 +235,9 @@ bool ZygoteMain(
  
    // This function call can return multiple times, once per fork().
    return zygote.ProcessRequests();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc
index 55b7424dad44..852ac4023dd0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_bluetooth__adapter.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc.orig	2022-07-28 06:05:58 UTC
+--- src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/device/bluetooth/bluetooth_adapter.cc
-@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::ServiceOptions() = d
+@@ -31,7 +31,7 @@ namespace device {
+ BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
  BluetoothAdapter::ServiceOptions::~ServiceOptions() = default;
  
- #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_MAC) && \
--    !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
-+    !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && \
++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) && \
+     !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
  // static
  scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() {
-   return nullptr;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc
index 0bf6af43124a..bc444409da16 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/extensions/browser/api/api_browser_context_keyed_service_factories.cc
-@@ -108,7 +108,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -118,7 +118,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
    MessageService::GetFactoryInstance();
    MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc
index 572556abc8fb..bfbb3c283998 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_messaging_message__service.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/extensions/browser/api/messaging/message_service.cc
-@@ -70,7 +70,7 @@ const char kReceivingEndDoesntExistError[] =
+@@ -71,7 +71,7 @@ const char kReceivingEndDoesntExistError[] =
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -468,7 +468,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -490,7 +490,7 @@ void MessageService::OpenChannelToNativeApp(
      return;
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index 15803e1f8aa5..49a77a57e9d3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_delegate_factory.cc
 @@ -14,7 +14,7 @@
  #include "extensions/browser/api/networking_private/networking_private_chromeos.h"
@@ -9,12 +9,12 @@
  #include "extensions/browser/api/networking_private/networking_private_linux.h"
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
  #include "components/wifi/wifi_service.h"
-@@ -68,7 +68,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
-   delegate = new NetworkingPrivateChromeOS(browser_context);
+@@ -67,7 +67,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstance
+   delegate = std::make_unique<NetworkingPrivateChromeOS>(browser_context);
  #elif BUILDFLAG(IS_CHROMEOS_LACROS)
-   delegate = new NetworkingPrivateLacros(browser_context);
+   delegate = std::make_unique<NetworkingPrivateLacros>(browser_context);
 -#elif BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   delegate = new NetworkingPrivateLinux();
+   delegate = std::make_unique<NetworkingPrivateLinux>();
  #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
    std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc
deleted file mode 100644
index 07b7480a08cf..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_extension__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/extensions/browser/extension_prefs.cc.orig	2023-08-16 19:50:41 UTC
-+++ src/3rdparty/chromium/extensions/browser/extension_prefs.cc
-@@ -2230,7 +2230,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
-   registry->RegisterListPref(
-       pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false);
- #endif
-   registry->RegisterBooleanPref(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc
deleted file mode 100644
index 9bd3fbe3ec8d..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/extensions/browser/pref_names.cc.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/extensions/browser/pref_names.cc
-@@ -53,7 +53,7 @@ const char kManifestV2Availability[] = "extensions.man
- const char kPinnedExtensions[] = "extensions.pinned_extensions";
- const char kStorageGarbageCollect[] = "extensions.storage.garbagecollect";
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled";
- #endif
- const char kChromeAppsWebViewPermissiveBehaviorAllowed[] =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h
deleted file mode 100644
index 8d538f1e7198..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_browser_pref__names.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/extensions/browser/pref_names.h.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/extensions/browser/pref_names.h
-@@ -114,7 +114,7 @@ extern const char kPinnedExtensions[];
- extern const char kStorageGarbageCollect[];
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- // A preference for whether Chrome Apps should be allowed. The default depends
- // on the ChromeAppsDeprecation feature flag, and this pref can extend support
- // for Chrome Apps by enterprise policy.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json
index 6666f58735d2..8b64105a88f3 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api___permission__features.json
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/extensions/common/api/_permission_features.json.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/extensions/common/api/_permission_features.json
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
      {
        "channel": "stable",
        "extension_types": ["platform_app"],
--      "platforms": ["chromeos", "win", "mac", "linux"],
-+      "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"],
+-      "platforms": ["chromeos", "lacros", "win", "mac", "linux"],
++      "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd"],
        "allowlist": [
          "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/387169
          "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/387169
-@@ -427,7 +427,7 @@
+@@ -432,7 +432,7 @@
    }, {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -18,7 +18,7 @@
      "allowlist": [
        "0DE0F05680A4A056BCEC864ED8DDA84296F82B40",  // http://crbug.com/434651
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/293683
-@@ -469,7 +469,7 @@
+@@ -474,7 +474,7 @@
    "networkingPrivate": {
      "channel": "stable",
      "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json
index a2bd4cf5a954..60c4d4bfbe25 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_api_runtime.json
@@ -1,12 +1,10 @@
---- src/3rdparty/chromium/extensions/common/api/runtime.json.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/extensions/common/api/runtime.json.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/extensions/common/api/runtime.json
-@@ -86,7 +86,8 @@
-           "cros",
-           "linux",
-           "openbsd",
--          "fuchsia"
-+          "fuchsia",
-+          "freebsd"
+@@ -89,6 +89,7 @@
+             {"name": "cros", "description": "Specifies the Chrome operating system."},
+             {"name": "linux", "description": "Specifies the Linux operating system."},
+             {"name": "openbsd", "description": "Specifies the OpenBSD operating system."},
++            {"name": "freebsd", "description": "Specifies the FreeBSD operating system."},
+             {"name": "fuchsia", "description": "Specifies the Fuchsia operating system."}
          ]
        },
-       {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc
index cd2f112b6bbb..ba234ebaf7f5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_command.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/extensions/common/command.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/extensions/common/command.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/extensions/common/command.cc
-@@ -280,7 +280,7 @@ std::string Command::CommandPlatform() {
+@@ -282,7 +282,7 @@ std::string Command::CommandPlatform() {
    return values::kKeybindingPlatformMac;
  #elif BUILDFLAG(IS_CHROMEOS)
    return values::kKeybindingPlatformChromeOs;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc
index 4711f762b9c2..14a43d6eddf2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_common_features_feature.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/extensions/common/features/feature.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/extensions/common/features/feature.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/extensions/common/features/feature.cc
 @@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() {
    return WIN_PLATFORM;
  #elif BUILDFLAG(IS_FUCHSIA)
    return FUCHSIA_PLATFORM;
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
 +  return LINUX_PLATFORM;
  #else
    return UNSPECIFIED_PLATFORM;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index 20c2b082fae7..478bd8df8e65 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
 @@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
  bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-   info->os = api::runtime::PLATFORM_OS_CROS;
+   info->os = api::runtime::PlatformOs::kCros;
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   info->os = api::runtime::PLATFORM_OS_LINUX;
+   info->os = api::runtime::PlatformOs::kLinux;
  #endif
    return true;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc
index 534926c686b0..abd723e1e979 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/google_apis/gcm/engine/heartbeat_manager.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/google_apis/gcm/engine/heartbeat_manager.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/google_apis/gcm/engine/heartbeat_manager.cc
-@@ -33,7 +33,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;  
+@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;  
  // Minimum time spent sleeping before we force a new heartbeat.
  const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
  
@@ -9,7 +9,7 @@
  // The period at which to check if the heartbeat time has passed. Used to
  // protect against platforms where the timer is delayed by the system being
  // suspended.  Only needed on linux because the other OSes provide a standard
-@@ -193,7 +193,7 @@ void HeartbeatManager::RestartTimer() {
+@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() {
        base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
                            weak_ptr_factory_.GetWeakPtr()));
  
@@ -18,7 +18,7 @@
    // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
    // when the system is suspending or resuming.  The only one that does not is
    // Linux so we need to poll to check for missed heartbeats.
-@@ -218,7 +218,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
+@@ -214,7 +214,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
      return;
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc
index 773d8d038c0b..12e6456454a5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/common/gpu_memory_buffer_support.cc
-@@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() {
+@@ -182,7 +182,7 @@ uint32_t GetPlatformSpecificTextureTarget() {
  #if BUILDFLAG(IS_MAC)
    return macos_specific_texture_target;
  #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
    return GL_TEXTURE_EXTERNAL_OES;
  #elif BUILDFLAG(IS_IOS)
    return GL_TEXTURE_2D;
-@@ -208,7 +208,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
+@@ -217,7 +217,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
      gfx::BufferFormat format,
      gfx::BufferPlane plane) {
  #if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc
new file mode 100644
index 000000000000..df5720390dd5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_dawn__context__provider.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/gpu/command_buffer/service/dawn_context_provider.cc
+@@ -145,7 +145,7 @@ wgpu::BackendType DawnContextProvider::GetDefaultBacke
+   return base::FeatureList::IsEnabled(features::kSkiaGraphiteDawnUseD3D12)
+              ? wgpu::BackendType::D3D12
+              : wgpu::BackendType::D3D11;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return wgpu::BackendType::Vulkan;
+ #elif BUILDFLAG(IS_APPLE)
+   return wgpu::BackendType::Metal;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc
index 738ed7fdf341..c71dfc2e8b62 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2023-09-11 15:16:04 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -3462,7 +3462,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -2982,7 +2982,7 @@ GLES2Decoder* GLES2Decoder::Create(
  // Fix for Qt WebEngine Crash when QSG_RHI_BACKEND=opengl
  // Allow linux to run fuzzers.
  #if BUILDFLAG(ENABLE_VALIDATING_COMMAND_DECODER) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index bbacacb8268a..e7b1efc2ebbd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
-@@ -20,7 +20,7 @@ namespace {
+@@ -21,7 +21,7 @@ namespace {
  // TODO(penghuang): verify the scanout is the right usage for video playback.
  // crbug.com/1280798
  constexpr uint32_t kSupportedUsage =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
index 8182d2c3594c..46fe9b90ef76 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing.cc
@@ -1,20 +1,20 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -36,7 +36,7 @@
+@@ -47,7 +47,7 @@
  #include "ui/gl/gl_version_info.h"
  #include "ui/gl/scoped_binders.h"
  
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
  #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
  #endif
  
-@@ -534,7 +534,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
-     WGPUDevice wgpuDevice,
-     WGPUBackendType backend_type,
-     std::vector<WGPUTextureFormat> view_formats) {
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
-   auto wgpu_format = ToWGPUFormat(format());
+@@ -673,7 +673,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+     const wgpu::Device& wgpuDevice,
+     wgpu::BackendType backend_type,
+     std::vector<wgpu::TextureFormat> view_formats) {
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
+   auto wgpu_format = ToDawnFormat(format());
  
-   if (wgpu_format == WGPUTextureFormat_Undefined) {
+   if (wgpu_format == wgpu::TextureFormat::Undefined) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
new file mode 100644
index 000000000000..7e0e594df65b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
+@@ -89,7 +89,7 @@ constexpr uint32_t kSupportedUsage =
+ }  // namespace
+ 
+ constexpr uint32_t kSupportedUsage =
+-#if BUILDFLAG(IS_LINUX) && BUILDFLAG(USE_DAWN)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN)
+     SHARED_IMAGE_USAGE_WEBGPU | SHARED_IMAGE_USAGE_WEBGPU_SWAP_CHAIN_TEXTURE |
+     SHARED_IMAGE_USAGE_WEBGPU_STORAGE_TEXTURE |
+ #endif
+@@ -258,7 +258,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+     return false;
+   }
+ 
+-#if BUILDFLAG(IS_LINUX) && !defined(TOOLKIT_QT)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(TOOLKIT_QT)
+   if (format.IsLegacyMultiplanar()) {
+     // ExternalVkImageBacking doesn't work properly with external sampler
+     // multi-planar formats on Linux, see https://crbug.com/1394888.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc
new file mode 100644
index 000000000000..beaf9fc60a42
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__factory.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_factory.cc
+@@ -142,7 +142,7 @@ gfx::GpuMemoryBufferType GetNativeBufferType() {
+   return gfx::GpuMemoryBufferType::IO_SURFACE_BUFFER;
+ #elif BUILDFLAG(IS_ANDROID)
+   return gfx::GpuMemoryBufferType::ANDROID_HARDWARE_BUFFER;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   return gfx::GpuMemoryBufferType::NATIVE_PIXMAP;
+ #elif BUILDFLAG(IS_WIN)
+   return gfx::GpuMemoryBufferType::DXGI_SHARED_HANDLE;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc
index c27a0d5a303c..ff053561c04e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -481,7 +481,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -507,7 +507,7 @@ bool SharedImageManager::SupportsScanoutImages() {
    return true;
  #elif BUILDFLAG(IS_ANDROID)
    return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
index e5577a041f70..bb5a1de33a97 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,9 +1,9 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -181,7 +181,7 @@ bool WrappedSkImageBacking::Initialize() {
-   for (int plane = 0; plane < num_planes; ++plane) {
-     auto& texture = textures_[plane];
-     gfx::Size plane_size = format().GetPlaneSize(plane, size());
+@@ -211,7 +211,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
+ 
+     constexpr GrRenderable is_renderable = GrRenderable::kYes;
+     constexpr GrProtected is_protected = GrProtected::kNo;
 -#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
 +#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
      // Blue for single-planar and magenta-ish for multi-planar.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc
index 26146461e135..118c8c18e993 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,11 +1,20 @@
---- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1225,7 +1225,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1194,7 +1194,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+     force_fallback_adapter = true;
+   }
  
-   if (gr_context_type_ != GrContextType::kVulkan &&
-       use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     callback(WGPURequestAdapterStatus_Unavailable, nullptr,
-              "WebGPU on Linux requires command-line flag "
-              "--enable-features=Vulkan",
+   if (!shared_context_state_->GrContextIsVulkan() &&
+       !shared_context_state_->IsGraphiteDawnVulkan() &&
+       use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
+@@ -1849,7 +1849,7 @@ WebGPUDecoderImpl::AssociateMailboxDawn(
+   }
+ 
+ #if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \
+-    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX)
++    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   if (usage & wgpu::TextureUsage::StorageBinding) {
+     LOG(ERROR) << "AssociateMailbox: wgpu::TextureUsage::StorageBinding is NOT "
+                   "supported yet on this platform.";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc
index 4389712ef599..0aa02325b5b0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/gpu/config/gpu_control_list.cc
-@@ -302,7 +302,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
+@@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
  GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
  #if BUILDFLAG(IS_CHROMEOS)
    return kGLTypeGL;
@@ -9,7 +9,7 @@
    return kGLTypeGL;
  #elif BUILDFLAG(IS_MAC)
    return kGLTypeGL;
-@@ -844,7 +844,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -817,7 +817,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
    return kOsAndroid;
  #elif BUILDFLAG(IS_FUCHSIA)
    return kOsFuchsia;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc
index 614aa738dd8e..5d0e01de4b5b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__finch__features.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/gpu/config/gpu_finch_features.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/gpu/config/gpu_finch_features.cc
-@@ -57,7 +57,7 @@ CONSTINIT const base::Feature kUseGles2ForOopR(
+@@ -58,7 +58,7 @@ CONSTINIT const base::Feature kUseGles2ForOopR(
  CONSTINIT const base::Feature kUseGles2ForOopR(
               "UseGles2ForOopR",
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -9,7 +9,7 @@
               base::FEATURE_DISABLED_BY_DEFAULT
  #else
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -135,7 +135,8 @@ CONSTINIT const base::Feature kDefaultEnableGpuRasteri
+@@ -142,7 +142,8 @@ CONSTINIT const base::Feature kDefaultEnableGpuRasteri
  CONSTINIT const base::Feature kDefaultEnableGpuRasterization(
               "DefaultEnableGpuRasterization",
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
index 2fd265e348df..4b96fd768921 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc
-@@ -21,7 +21,7 @@
+@@ -26,7 +26,7 @@
  #include "ui/ozone/public/ozone_platform.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
  #endif
  
-@@ -50,7 +50,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
+@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
    return gfx::IO_SURFACE_BUFFER;
  #elif BUILDFLAG(IS_ANDROID)
    return gfx::ANDROID_HARDWARE_BUFFER;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h
index b72358947503..9744deb2ad0b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.h
-@@ -18,7 +18,7 @@
+@@ -21,7 +21,7 @@
  #include "ui/gfx/geometry/size.h"
  #include "ui/gfx/gpu_memory_buffer.h"
  
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
  namespace gfx {
  class ClientNativePixmapFactory;
- }
+ }  // namespace gfx
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
index 735eb8c1d624..1e31e8949854 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc
-@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -363,7 +363,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    enable_watchdog = false;
  #endif
  
@@ -9,7 +9,7 @@
    bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early;
  #else   // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
    // For some reasons MacOSX's VideoToolbox might crash when called after
-@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -400,7 +400,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
    }
  
    bool attempted_startsandbox = false;
@@ -18,16 +18,7 @@
    // On Chrome OS ARM Mali, GPU driver userspace creates threads when
    // initializing a GL context, so start the sandbox early.
    // TODO(zmo): Need to collect OS version before this.
-@@ -442,7 +442,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
- 
-   if (gl_initialized && gl_use_swiftshader_ &&
-       !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
-             << "on Linux";
-     return false;
-@@ -493,7 +493,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -457,7 +457,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
      }
    }
  
@@ -36,7 +27,7 @@
    // The ContentSandboxHelper is currently the only one implementation of
    // GpuSandboxHelper and it has no dependency. Except on Linux where
    // VaapiWrapper checks the GL implementation to determine which display
-@@ -579,7 +579,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -539,7 +539,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
            command_line, gpu_feature_info_,
            gpu_preferences_.disable_software_rasterizer, false);
        if (gl_use_swiftshader_) {
@@ -45,7 +36,7 @@
          VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
                  << "on Linux";
          return false;
-@@ -707,7 +707,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -692,7 +692,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
  
    InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
  
@@ -54,8 +45,8 @@
    // Driver may create a compatibility profile context when collect graphics
    // information on Linux platform. Try to collect graphics information
    // based on core profile context after disabling platform extensions.
-@@ -759,7 +759,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
-       gl_use_swiftshader_ = true;
+@@ -746,7 +746,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+       }
      }
    }
 -#if BUILDFLAG(IS_LINUX) || \
@@ -63,7 +54,7 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -903,7 +903,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -900,7 +900,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
    }
    bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
  
@@ -72,9 +63,9 @@
      (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
    if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
      // https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -973,7 +973,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
- 
-   InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
+@@ -976,7 +976,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+     }
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py
index 76b73961ae24..3fc4935c7a65 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_generate__bindings.py
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/gpu/vulkan/generate_bindings.py.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/generate_bindings.py
-@@ -259,7 +259,7 @@ VULKAN_DEVICE_FUNCTIONS = [
+@@ -260,7 +260,7 @@ VULKAN_DEVICE_FUNCTIONS = [
      ]
    },
    {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc
new file mode 100644
index 000000000000..a7b61ad210ab
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_semaphore__handle.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/gpu/vulkan/semaphore_handle.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/gpu/vulkan/semaphore_handle.cc
+@@ -39,7 +39,7 @@ SemaphoreHandle::SemaphoreHandle(gfx::GpuFenceHandle f
+   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
+   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_ZIRCON_EVENT_BIT_FUCHSIA,
+        std::move(fence_handle.owned_event));
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   Init(VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR,
+        std::move(fence_handle.owned_fd));
+ #elif BUILDFLAG(IS_POSIX)
+@@ -64,7 +64,7 @@ gfx::GpuFenceHandle SemaphoreHandle::ToGpuFenceHandle(
+   // VkSemaphore, which can then be used to submit present work, see
+   // https://fuchsia.dev/reference/fidl/fuchsia.ui.scenic.
+   fence_handle.owned_event = TakeHandle();
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   if (type_ == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) {
+     fence_handle.owned_fd = TakeHandle();
+   } else {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc
index 1755a836be13..d67111ec0331 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.cc
-@@ -89,7 +89,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -121,7 +121,7 @@ bool VulkanDeviceQueue::Initialize(
  
        // In dual-CPU cases, we cannot detect the active GPU correctly on Linux,
        // so don't select GPU device based on the |gpu_info|.
@@ -9,12 +9,12 @@
      // If gpu_info is provided, the device should match it.
      if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id ||
                       device_properties.deviceID != gpu_info->gpu.device_id)) {
-@@ -229,7 +229,7 @@ bool VulkanDeviceQueue::Initialize(
-   enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2};
- 
-   // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support.
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+@@ -263,7 +263,7 @@ bool VulkanDeviceQueue::Initialize(
+   // Android, Fuchsia, Linux, and CrOS (VaapiVideoDecoder) need YCbCr sampler
+   // support.
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    if (!physical_device_info.feature_sampler_ycbcr_conversion) {
      LOG(ERROR) << "samplerYcbcrConversion is not supported.";
      return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h
index d3f545db878e..bc33c334dbab 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__device__queue.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/vulkan_device_queue.h
-@@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue {
- 
+@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue
    bool allow_protected_memory_ = false;
  
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_CHROMEOS)
++    BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    VkPhysicalDeviceSamplerYcbcrConversionFeatures
        sampler_ycbcr_conversion_features_{
            VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES};
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc
index bdc303a1f776..cfa5f590ebf5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.cc
-@@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
+@@ -1161,7 +1161,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
      }
    }
  
@@ -9,3 +9,12 @@
    if (gfx::HasExtension(enabled_extensions,
                          VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
      vkGetImageDrmFormatModifierPropertiesEXT =
+@@ -1350,7 +1350,7 @@ void VulkanFunctionPointers::ResetForTesting() {
+   vkGetSwapchainImagesKHR = nullptr;
+   vkQueuePresentKHR = nullptr;
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   vkGetImageDrmFormatModifierPropertiesEXT = nullptr;
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
index 4e7be2fb3567..8c52f65fe0a8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
-@@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -311,7 +311,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
    VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
    VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
  
@@ -9,7 +9,7 @@
    VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
        vkGetImageDrmFormatModifierPropertiesEXT;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1212,7 +1212,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1235,7 +1235,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
                                                               pPresentInfo);
  }
  
@@ -18,7 +18,7 @@
  ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
      VkDevice device,
      VkImage image,
-@@ -1222,4 +1222,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1245,4 +1245,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
  }
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc
deleted file mode 100644
index d00fc83963f5..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__image.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_image.cc.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/gpu/vulkan/vulkan_image.cc
-@@ -392,7 +392,7 @@ bool VulkanImage::InitializeWithExternalMemory(
- 
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   VkPhysicalDeviceImageDrmFormatModifierInfoEXT modifier_info = {
-       .sType =
-           VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc
index 8ff623025c71..16b86dba4c0b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__util.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig	2022-07-22 17:30:31 UTC
+--- src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/gpu/vulkan/vulkan_util.cc
-@@ -199,7 +199,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan
+@@ -343,7 +343,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan
      }
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc
index fc98746712ee..2579ca453b33 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__browser__main__parts__posix.cc
@@ -1,14 +1,14 @@
---- src/3rdparty/chromium/headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/headless/lib/browser/headless_browser_main_parts_posix.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/headless/lib/browser/headless_browser_main_parts_posix.cc
-@@ -19,13 +19,13 @@
+@@ -21,13 +21,13 @@
  #include "content/public/browser/browser_thread.h"
  #include "headless/lib/browser/headless_browser_impl.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/command_line.h"
- #include "components/os_crypt/key_storage_config_linux.h"
- #include "components/os_crypt/os_crypt.h"
+ #include "components/os_crypt/sync/key_storage_config_linux.h"
+ #include "components/os_crypt/sync/os_crypt.h"
  #include "headless/public/switches.h"
  
 -#if defined(USE_DBUS)
@@ -16,7 +16,7 @@
  #include "device/bluetooth/dbus/bluez_dbus_manager.h"
  #endif
  
-@@ -120,7 +120,7 @@ class BrowserShutdownHandler {
+@@ -161,7 +161,7 @@ class BrowserShutdownHandler {
  
  }  // namespace
  
@@ -25,9 +25,9 @@
  constexpr char kProductName[] = "HeadlessChrome";
  #endif
  
-@@ -128,9 +128,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
-   BrowserShutdownHandler::Install(
-       base::BindOnce(&HeadlessBrowserImpl::Shutdown, browser_->GetWeakPtr()));
+@@ -169,9 +169,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
+   BrowserShutdownHandler::Install(base::BindOnce(
+       &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr()));
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc
index 00c2637191db..d3dd85b56342 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_browser_headless__web__contents__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/headless/lib/browser/headless_web_contents_impl.cc
-@@ -61,7 +61,7 @@ namespace headless {
+@@ -60,7 +60,7 @@ namespace headless {
  namespace {
  
  void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc
index 8205206723ff..85f9b3d5814d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_headless_lib_headless__content__main__delegate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/headless/lib/headless_content_main_delegate.cc
-@@ -327,7 +327,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
+@@ -344,7 +344,7 @@ void HeadlessContentMainDelegate::InitCrashReporter(
    if (process_type != ::switches::kZygoteProcess) {
      g_headless_crash_client.Pointer()->set_crash_dumps_dir(
          command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc
index 36e6fd9f3df8..0b4fb6c20bac 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig	2022-05-19 14:06:27 UTC
+--- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ipc/ipc_message_utils.cc
-@@ -359,7 +359,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
+@@ -393,7 +393,7 @@ void ParamTraits<unsigned int>::Log(const param_type& 
  }
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn
index b74a242be8ae..196ee0c0a3c4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_BUILD.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/media/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/media/BUILD.gn
 @@ -96,6 +96,9 @@ config("media_config") {
        defines += [ "DLOPEN_PULSEAUDIO" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn
index 0aa9a075cc2d..db6fd122165c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/audio/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/media/audio/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/media/audio/BUILD.gn
-@@ -264,9 +264,20 @@ source_set("audio") {
+@@ -278,9 +278,20 @@ jumbo_source_set("audio") {
      ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc
index 7763c850bf22..5ca79c181554 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__input__device.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/media/audio/audio_input_device.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/media/audio/audio_input_device.cc
-@@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated(
  // here. See comments in AliveChecker and PowerObserverHelper for details and
  // todos.
    if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc
index bb502dad81a3..f6da297f1cb2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/audio/sndio/sndio_input.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/media/audio/sndio/sndio_input.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/media/audio/sndio/sndio_input.cc
 @@ -0,0 +1,200 @@
 +// Copyright 2013 The Chromium Authors. All rights reserved.
@@ -13,7 +13,7 @@
 +
 +namespace media {
 +
-+static const SampleFormat kSampleFormat = kSampleFormatS16;
++static const SampleFormat kSampleFormatAI = kSampleFormatS16;
 +
 +void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
 +{
@@ -59,7 +59,7 @@
 +  sio_initpar(&par);
 +  par.rate = params.sample_rate();
 +  par.rchan = params.channels();
-+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormatAI);
 +  par.bps = par.bits / 8;
 +  par.sig = sig = par.bits != 8 ? 1 : 0;
 +  par.le = SIO_LE_NATIVE;
@@ -79,7 +79,7 @@
 +
 +  if (par.rate  != (unsigned int)params.sample_rate() ||
 +      par.rchan != (unsigned int)params.channels() ||
-+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAI) ||
 +      par.sig   != (unsigned int)sig ||
 +      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
 +      (par.bits != par.bps * 8)) {
@@ -87,7 +87,7 @@
 +    goto bad_close;
 +  }
 +  state = kStopped;
-+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAI)];
 +  sio_onmove(hdl, &OnMoveCallback, this);
 +  return OpenOutcome::kSuccess;
 +bad_close:
@@ -176,7 +176,7 @@
 +    GetAgcVolume(&normalized_volume);
 +
 +    // read one block
-+    todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++    todo = nframes * params.GetBytesPerFrame(kSampleFormatAI);
 +    data = buffer;
 +    while (todo > 0) {
 +      n = sio_read(hdl, data, todo);
@@ -196,7 +196,7 @@
 +
 +
 +    // invoke callback
-+    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++    callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1., {});
 +  }
 +}
 +
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc
index 5ee661707307..363cb11cbb93 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc
@@ -14,7 +14,7 @@
 +
 +namespace media {
 +
-+static const SampleFormat kSampleFormat = kSampleFormatS16;
++static const SampleFormat kSampleFormatAO = kSampleFormatS16;
 +
 +void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
 +  SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
@@ -58,7 +58,7 @@
 +  state = kStopped;
 +  volpending = 0;
 +  vol = SIO_MAXVOL;
-+  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++  buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAO)];
 +  return true;
 +}
 +
@@ -80,7 +80,7 @@
 +  sio_initpar(&par);
 +  par.rate = params.sample_rate();
 +  par.pchan = params.channels();
-+  par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++  par.bits = SampleFormatToBitsPerChannel(kSampleFormatAO);
 +  par.bps = par.bits / 8;
 +  par.sig = sig = par.bits != 8 ? 1 : 0;
 +  par.le = SIO_LE_NATIVE;
@@ -98,7 +98,7 @@
 +  }
 +  if (par.rate  != (unsigned int)params.sample_rate() ||
 +      par.pchan != (unsigned int)params.channels() ||
-+      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++      par.bits  != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAO) ||
 +      par.sig   != (unsigned int)sig ||
 +      (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
 +      (par.bits != par.bps * 8)) {
@@ -170,12 +170,12 @@
 +    if (count == 0) {
 +      // We have to submit something to the device
 +      count = audio_bus->frames();
-+      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++      memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormatAO));
 +      LOG(WARNING) << "No data to play, running empty cycle.";
 +    }
 +
 +    // Submit data to the device
-+    avail = count * params.GetBytesPerFrame(kSampleFormat);
++    avail = count * params.GetBytesPerFrame(kSampleFormatAO);
 +    result = sio_write(hdl, buffer, avail);
 +    if (result == 0) {
 +      LOG(WARNING) << "Audio device disconnected.";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc
new file mode 100644
index 000000000000..8661d571c150
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_cdm__promise__adapter.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/media/base/cdm_promise_adapter.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/media/base/cdm_promise_adapter.cc
+@@ -94,7 +94,13 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+   // Reject all outstanding promises.
+   DCHECK(thread_checker_.CalledOnValidThread());
++#if defined(__clang__) && (__clang_major__ >= 16)
+   for (auto& [promise_id, promise] : promises_) {
++#else
++  for (auto& [p_i, p_e] : promises_) {
++    auto& promise_id = p_i;
++    auto& promise = p_e;
++#endif
+     TRACE_EVENT_NESTABLE_ASYNC_END1(
+         "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+         "status", "cleared");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc
index 82fd131702ba..5cfee7ed784c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.cc
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/media/base/media_switches.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/media/base/media_switches.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/media/base/media_switches.cc
-@@ -12,7 +12,7 @@
- #include "components/system_media_controls/linux/buildflags/buildflags.h"
- #include "media/media_buildflags.h"
+@@ -17,7 +17,7 @@
+ #include "ui/gl/gl_features.h"
+ #include "ui/gl/gl_utils.h"
  
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "base/cpu.h"
  #endif
  
-@@ -586,7 +586,7 @@ CONSTINIT const base::Feature kGlobalMediaControls(
+@@ -673,7 +673,7 @@ CONSTINIT const base::Feature kGlobalMediaControls(
  // Show toolbar button that opens dialog for controlling media sessions.
  CONSTINIT const base::Feature kGlobalMediaControls(
               "GlobalMediaControls",
@@ -18,7 +18,16 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -634,7 +634,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict
+@@ -696,7 +696,7 @@ CONSTINIT const base::Feature kMediaRemotingWithoutFul
+ // If enabled, users can request Media Remoting without fullscreen-in-tab.
+ CONSTINIT const base::Feature kMediaRemotingWithoutFullscreen(
+              "MediaRemotingWithoutFullscreen",
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
+@@ -708,7 +708,7 @@ CONSTINIT const base::Feature kGlobalMediaControlsPict
  CONSTINIT const base::Feature kGlobalMediaControlsPictureInPicture(
               "GlobalMediaControlsPictureInPicture",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +36,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -678,7 +678,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -752,7 +752,7 @@ BASE_FEATURE(kUnifiedAutoplay,
               "UnifiedAutoplay",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -36,17 +45,18 @@
  // Enable vaapi video decoding on linux. This is already enabled by default on
  // chromeos, but needs an experiment on linux.
  BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -1198,14 +1198,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Spawn utility processes to perform hardware decode acceleration instead of
- // using the GPU process.
- const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{
-     "UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -832,7 +832,7 @@ BASE_FEATURE(kVaapiVp9kSVCHWEncoding,
+              "VaapiVp9kSVCHWEncoding",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder.
+ BASE_FEATURE(kV4L2FlatStatelessVideoDecoder,
+              "V4L2FlatStatelessVideoDecoder",
+@@ -1348,7 +1348,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
+ };
+ #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h
index a9a8002374ce..7bf6a2138bd1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_media__switches.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/base/media_switches.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/base/media_switches.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/base/media_switches.h
-@@ -277,7 +277,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
+@@ -305,7 +305,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseElementInsteadOf
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture);
@@ -9,14 +9,18 @@
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -396,11 +396,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(
-     kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled);
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -323,7 +323,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiH264TemporalLa
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);
+ #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatelessVideoDecoder);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kV4L2FlatStatefulVideoDecoder);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+@@ -443,7 +443,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
  MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
index f5821433164b..347d8ca3beab 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/base/video_frame.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/base/video_frame.cc
 @@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
        return "OWNED_MEMORY";
@@ -18,7 +18,7 @@
        // This is not strictly needed but makes explicit that, at VideoFrame
        // level, DmaBufs are not mappable from userspace.
        storage_type != VideoFrame::STORAGE_DMABUFS &&
-@@ -307,7 +307,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
+@@ -306,7 +306,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
    return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
  }
  
@@ -27,7 +27,7 @@
  // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
  // thus to have several VideoFrames share the same set of DMABUF FDs.
  class VideoFrame::DmabufHolder
-@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -635,7 +635,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    for (size_t i = 0; i < num_planes; ++i)
      planes[i].stride = gpu_memory_buffer->stride(i);
    uint64_t modifier = gfx::NativePixmapHandle::kNoModifier;
@@ -36,7 +36,7 @@
    if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) {
      const auto gmb_handle = gpu_memory_buffer->CloneHandle();
      if (gmb_handle.is_null() ||
-@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -681,7 +681,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
    return frame;
  }
  
@@ -54,7 +54,7 @@
    DCHECK(frame->dmabuf_fds_);
    // If there are any |dmabuf_fds_| plugged in, we should refer them too.
    wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
-@@ -1302,7 +1302,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1310,7 +1310,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
                          : mailbox_holders_[texture_index];
  }
  
@@ -63,7 +63,7 @@
  const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
    DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
  
-@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1423,7 +1423,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
        storage_type_(storage_type),
        visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
        natural_size_(natural_size),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
index d764548e57fc..537115395142 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/media/base/video_frame.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/base/video_frame.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/base/video_frame.h
 @@ -44,7 +44,7 @@
- #include "base/mac/scoped_cftyperef.h"
- #endif  // BUILDFLAG(IS_MAC)
+ #include "base/apple/scoped_cftyperef.h"
+ #endif  // BUILDFLAG(IS_APPLE)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "base/files/scoped_file.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -113,7 +113,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -110,7 +110,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
      STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
      STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
      STORAGE_SHMEM = 4,         // Backed by read-only shared memory.
@@ -18,7 +18,7 @@
      // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
      // based on the idea of using this same enum value for both DMA
      // buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -308,7 +308,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -313,7 +313,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
        ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
        base::TimeDelta timestamp);
  
@@ -27,7 +27,7 @@
    // Wraps provided dmabufs
    // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
    // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
-@@ -596,7 +596,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -593,7 +593,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // mailbox, the caller must wait for the included sync point.
    const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
  
@@ -36,7 +36,7 @@
    // Returns a vector containing the backing DmaBufs for this frame. The number
    // of returned DmaBufs will be equal or less than the number of planes of
    // the frame. If there are less, this means that the last FD contains the
-@@ -809,7 +809,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -811,7 +811,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
    // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
    std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc
index 3a78d3db1cd3..286f02368daf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc
-@@ -213,7 +213,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
+@@ -229,7 +229,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo(
    int entry_index = 0;
    for (const auto& entry : devices_config_) {
      VideoCaptureApi api =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc
index caba3e655650..d5c23f1e1c31 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.cc
-@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -560,7 +560,7 @@ int FakeV4L2Impl::close(int fd) {
    return kSuccessReturnValue;
  }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h
index 62da82dbf905..08dd4ff954b9 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_fake__v4l2__impl.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h.orig	2022-03-01 11:59:41 UTC
+--- src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/media/capture/video/linux/fake_v4l2_impl.h
 @@ -8,7 +8,13 @@
  #include <map>
@@ -14,7 +14,7 @@
  
  #include "base/synchronization/lock.h"
  #include "media/capture/capture_export.h"
-@@ -36,7 +42,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture
+@@ -38,7 +44,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture
    // Implementation of V4L2CaptureDevice interface:
    int open(const char* device_name, int flags) override;
    int close(int fd) override;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc
index a67fe37b61e0..2bbd51b2e2c5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc
@@ -1,30 +1,80 @@
---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc
 @@ -4,8 +4,10 @@
  
  #include "media/capture/video/linux/v4l2_capture_delegate.h"
  
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  #include <linux/version.h>
  #include <linux/videodev2.h>
 +#endif
  #include <poll.h>
  #include <sys/fcntl.h>
  #include <sys/ioctl.h>
-@@ -29,10 +31,10 @@
+@@ -26,17 +28,19 @@
+ #include "media/capture/video/blob_utils.h"
+ #include "media/capture/video/linux/video_capture_device_linux.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "media/capture/video/linux/v4l2_capture_delegate_gpu_helper.h"
+ #endif  // BUILDFLAG(IS_LINUX)
  
  using media::mojom::MeteringMode;
  
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
-+// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
++#if !BUILDFLAG(IS_BSD)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
  // 16 bit depth, Realsense F200.
  #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ')
--#endif
-+// #endif
+ #endif
++#endif
  
  // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
  // format is introduced to kernel.
-@@ -728,7 +730,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
+@@ -46,6 +50,14 @@ using media::mojom::MeteringMode;
+ #define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z')
+ #endif
+ 
++#ifndef V4L2_COLORSPACE_OPRGB
++#define V4L2_COLORSPACE_OPRGB V4L2_COLORSPACE_ADOBERGB
++#endif
++
++#ifndef V4L2_XFER_FUNC_OPRGB
++#define V4L2_XFER_FUNC_OPRGB V4L2_XFER_FUNC_ADOBERGB
++#endif
++
+ namespace media {
+ 
+ namespace {
+@@ -260,7 +272,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
+ // static
+ bool V4L2CaptureDelegate::IsControllableControl(
+     int control_id,
+-    const base::RepeatingCallback<int(int, void*)>& do_ioctl) {
++    const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl) {
+   const int special_control_id = GetControllingSpecialControl(control_id);
+   if (!special_control_id) {
+     // The control is not controlled by a special control thus the control is
+@@ -316,7 +328,7 @@ V4L2CaptureDelegate::V4L2CaptureDelegate(
+       is_capturing_(false),
+       timeout_count_(0),
+       rotation_(rotation) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   use_gpu_buffer_ = switches::IsVideoCaptureUseGpuMemoryBufferEnabled();
+ #endif  // BUILDFLAG(IS_LINUX)
+ }
+@@ -443,7 +455,7 @@ void V4L2CaptureDelegate::AllocateAndStart(
+ 
+   client_->OnStarted();
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (use_gpu_buffer_) {
+     v4l2_gpu_helper_ = std::make_unique<V4L2CaptureDelegateGpuHelper>(
+         std::move(gmb_support_test_));
+@@ -793,7 +805,7 @@ void V4L2CaptureDelegate::SetGPUEnvironmentForTesting(
  
  V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
  
@@ -33,7 +83,7 @@
    int num_retries = 0;
    for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
         ++num_retries) {
-@@ -738,7 +740,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* 
+@@ -803,7 +815,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* 
    return num_retries != kMaxIOCtrlRetries;
  }
  
@@ -42,18 +92,15 @@
    return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
  }
  
-@@ -778,6 +780,10 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
+@@ -814,6 +826,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
  }
  
  void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
-+// these ioctls are not implemented on *BSDs
-+#if BUILDFLAG(IS_BSD)
-+  NOTIMPLEMENTED();
-+#else
++#if !BUILDFLAG(IS_BSD)
    constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
                                        V4L2_CID_AUTO_WHITE_BALANCE,
                                        V4L2_CID_BRIGHTNESS,
-@@ -805,6 +811,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
+@@ -841,6 +854,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
                    << ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
      }
    }
@@ -61,3 +108,49 @@
  }
  
  mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
+@@ -1021,7 +1035,11 @@ void V4L2CaptureDelegate::DoCapture() {
+ 
+   pollfd device_pfd = {};
+   device_pfd.fd = device_fd_.get();
++#if !BUILDFLAG(IS_BSD)
+   device_pfd.events = POLLIN | POLLPRI;
++#else
++  device_pfd.events = POLLIN;
++#endif
+ 
+   const int result =
+       HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
+@@ -1059,6 +1077,7 @@ void V4L2CaptureDelegate::DoCapture() {
+     timeout_count_ = 0;
+   }
+ 
++#if !BUILDFLAG(IS_BSD)
+   // Dequeue events if the driver has filled in some.
+   if (device_pfd.revents & POLLPRI) {
+     bool controls_changed = false;
+@@ -1093,6 +1112,7 @@ void V4L2CaptureDelegate::DoCapture() {
+       client_->OnCaptureConfigurationChanged();
+     }
+   }
++#endif
+ 
+   // Deenqueue, send and reenqueue a buffer if the driver has filled one in.
+   if (device_pfd.revents & POLLIN) {
+@@ -1146,7 +1166,7 @@ void V4L2CaptureDelegate::DoCapture() {
+       // workable on Linux.
+ 
+       // See http://crbug.com/959919.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       if (use_gpu_buffer_) {
+         v4l2_gpu_helper_->OnIncomingCapturedData(
+             client_.get(), buffer_tracker->start(),
+@@ -1219,7 +1239,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureEr
+   client_->OnError(error, from_here, reason);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() {
+   v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace;
+   v4l2_quantization v4l2_range =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h
index 725ca9301f3b..543d9fb3ec80 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.h
@@ -1,6 +1,24 @@
---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.h
-@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+@@ -35,7 +35,7 @@ class Location;
+ 
+ namespace media {
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class V4L2CaptureDelegateGpuHelper;
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
+@@ -86,7 +86,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+   static bool IsBlockedControl(int control_id);
+   static bool IsControllableControl(
+       int control_id,
+-      const base::RepeatingCallback<int(int, void*)>& do_ioctl);
++      const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl);
+ 
+   void SetGPUEnvironmentForTesting(
+       std::unique_ptr<gpu::GpuMemoryBufferSupport> gmb_support);
+@@ -100,10 +100,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
    // device file descriptor or (re)starting streaming, can fail but works after
    // retrying (https://crbug.com/670262). Returns false if the |request| ioctl
    // fails too many times.
@@ -13,3 +31,21 @@
  
    // Check whether the control is controllable (and not changed automatically).
    bool IsControllableControl(int control_id);
+@@ -133,7 +133,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+                      const base::Location& from_here,
+                      const std::string& reason);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Systems which describe a "color space" usually map that to one or more of
+   // {primary, matrix, transfer, range}. BuildColorSpaceFromv4l2() will use the
+   // matched value as first priority. Otherwise, if there is no best matching
+@@ -167,7 +167,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+   // Clockwise rotation in degrees. This value should be 0, 90, 180, or 270.
+   int rotation_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Support GPU memory buffer.
+   bool use_gpu_buffer_;
+   std::unique_ptr<V4L2CaptureDelegateGpuHelper> v4l2_gpu_helper_;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc
index cd743a293f11..1bd27f575454 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__v4l2.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig	2023-05-02 13:49:23 UTC
 +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_v4l2.cc
 @@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider
      : public VideoCaptureDeviceFactoryV4L2::DeviceProvider {
   public:
    void GetDeviceIds(std::vector<std::string>* target_container) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
 +    target_container->emplace_back("/dev/video");
 +#else
      const base::FilePath path("/dev/");
@@ -18,7 +18,7 @@
    }
  
    std::string GetDeviceModelId(const std::string& device_id) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
 +    return std::string();
 +#endif
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
@@ -28,7 +28,7 @@
    }
  
    std::string GetDeviceDisplayName(const std::string& device_id) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
 +    return std::string();
 +#endif
      const std::string file_name = ExtractFileNameFromDeviceId(device_id);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc
new file mode 100644
index 000000000000..bfa563fa7b66
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__buffer__tracker__factory__impl.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/media/capture/video/video_capture_buffer_tracker_factory_impl.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/media/capture/video/video_capture_buffer_tracker_factory_impl.cc
+@@ -14,7 +14,7 @@
+ #include "media/capture/video/chromeos/gpu_memory_buffer_tracker_cros.h"
+ #elif BUILDFLAG(IS_APPLE)
+ #include "media/capture/video/apple/gpu_memory_buffer_tracker_apple.h"
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/video/linux/v4l2_gpu_memory_buffer_tracker.h"
+ #elif BUILDFLAG(IS_WIN)
+ #include "media/capture/video/shared_memory_buffer_tracker.h"
+@@ -43,7 +43,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker(
+       return std::make_unique<GpuMemoryBufferTrackerCros>();
+ #elif BUILDFLAG(IS_APPLE)
+       return std::make_unique<GpuMemoryBufferTrackerApple>();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       return std::make_unique<V4L2GpuMemoryBufferTracker>();
+ #elif BUILDFLAG(IS_WIN)
+       if (!dxgi_device_manager_) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc
index 69f741431c9f..842b9dda9100 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc
-@@ -322,7 +322,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
- // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
- // Windows RGB24 defines blue at lowest byte,
- // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       fourcc_format = libyuv::FOURCC_RAW;
- #elif BUILDFLAG(IS_WIN)
-       fourcc_format = libyuv::FOURCC_24BG;
+@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
+       CHECK(!is_width_odd && !is_height_odd);
+       return {libyuv::FOURCC_UYVY};
+     case media::PIXEL_FORMAT_RGB24:
+-      if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) {
++      if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {
+         // Linux RGB24 defines red at lowest byte address,
+         // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
+         return {libyuv::FOURCC_RAW};
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_cdm_library__cdm_cdm__paths.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_cdm_library__cdm_cdm__paths.gni
new file mode 100644
index 000000000000..02b8f3d6b112
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_cdm_library__cdm_cdm__paths.gni
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/media/cdm/library_cdm/cdm_paths.gni.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/media/cdm/library_cdm/cdm_paths.gni
+@@ -15,7 +15,7 @@ assert(enable_library_cdms)
+ # Explicitly define what we use to avoid confusion.
+ if (is_chromeos) {
+   component_os = "cros"
+-} else if (is_linux) {
++} else if (is_linux || is_bsd) {
+   component_os = "linux"
+ } else if (is_win) {
+   component_os = "win"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc
index 2bc969973e5a..68e7cc0f92f2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig	2022-05-19 14:06:27 UTC
+--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/media/gpu/buffer_validation.cc
 @@ -15,7 +15,7 @@
  #include "ui/gfx/geometry/size.h"
@@ -18,7 +18,7 @@
    if (fd < 0) {
      VLOG(1) << "Invalid file descriptor";
      return false;
-@@ -73,7 +73,7 @@ bool VerifyGpuMemoryBufferHandle(
+@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle(
      VLOG(1) << "Unsupported: " << pixel_format;
      return false;
    }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc
index 3eb5fcdfe8ba..2a6874c36898 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr
- #if BUILDFLAG(USE_VAAPI)
-     create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create);
- #elif BUILDFLAG(USE_V4L2_CODEC) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))
-+    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))
-     create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create);
- #else
-     return nullptr;
-@@ -860,14 +860,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1026,14 +1026,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
      }
    }
  
@@ -26,7 +17,7 @@
    // Linux w/ V4L2 should not use a custom allocator
    // Only tested with video_decode_accelerator_tests
    // TODO(wenst@) Test with full Chromium Browser
-@@ -997,7 +997,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1170,7 +1170,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
               << " VideoFrames";
      auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc
index 84730e3c08b2..bad61d8e7bd2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -121,7 +121,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+@@ -119,7 +119,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
      return vea_factory_functions;
  
  #if BUILDFLAG(USE_VAAPI)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
index b054db0ad44b..1e2c2a8f7327 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
 @@ -15,7 +15,9 @@
  #include "media/gpu/vaapi/vaapi_wrapper.h"
@@ -18,15 +18,15 @@
  void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
                                bool include_sys_dev_char,
                                bool read_write) {
-@@ -160,6 +163,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
-   return false;
+@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+   NOTREACHED_NORETURN();
  #endif  // BUILDFLAG(USE_V4L2_CODEC)
  }
 +#endif
  
  }  // namespace
  
-@@ -175,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
  //   (at least).
  bool HardwareVideoDecodingPreSandboxHook(
      sandbox::policy::SandboxLinux::Options options) {
@@ -34,7 +34,7 @@
    using HardwareVideoDecodingProcessPolicy =
        sandbox::policy::HardwareVideoDecodingProcessPolicy;
    using PolicyType =
-@@ -212,6 +217,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook(
    sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
        command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(),
        options);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
index 4063da78a1f8..3ef02d85160d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2022-05-19 14:06:27 UTC
+--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_
@@ -7,7 +7,7 @@
 +#include "build/build_config.h"
 +
 +#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
index 973bd9244d1a..881836be0cc9 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
 @@ -18,12 +18,15 @@
  #include "media/gpu/v4l2/v4l2_device.h"
@@ -16,15 +16,11 @@
    sandbox::syscall_broker::BrokerCommandSet command_set;
    std::vector<BrokerFilePermission> permissions;
  
-@@ -125,8 +128,8 @@ bool HardwareVideoEncodingPreSandboxHook(
- #endif  // defined(__aarch64__)
+@@ -121,6 +124,7 @@ bool HardwareVideoEncodingPreSandboxHook(
+       return false;
+     }
    }
- #endif
--
 +#endif
+ #endif
    return true;
  }
- 
--}  // namespace media
-\ No newline at end of file
-+}  // namespace media
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
index 02783baff405..9cc18190d195 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h
 @@ -5,7 +5,13 @@
  #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
@@ -7,7 +7,7 @@
 +#include "build/build_config.h"
 +
 +#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc
index 3ac879eb290b..541298f16108 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig	2023-10-03 19:49:54 UTC
+--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -782,7 +782,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
    const gfx::Size decoder_natural_size =
        aspect_ratio_.GetNaturalSize(decoder_visible_rect);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc
new file mode 100644
index 000000000000..78386389a125
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_gpu_vaapi_vaapi__wrapper.cc
@@ -0,0 +1,56 @@
+--- src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -70,7 +70,7 @@
+ using media_gpu_vaapi::kModuleVa_prot;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/files/file_util.h"
+ #include "base/strings/string_split.h"
+ #endif
+@@ -1441,7 +1441,7 @@ bool IsVBREncodingSupported(VAProfile va_profile) {
+   return VASupportedProfiles::Get().IsProfileSupported(mode, va_profile);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Some VA-API drivers (vdpau-va-driver) will crash if used with VA/DRM on
+ // NVIDIA GPUs. This function checks if such drivers are present.
+ bool IsBrokenNvidiaVaapiDriverPresent() {
+@@ -1502,7 +1502,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
+   VADisplayStateSingleton& va_display_state = GetInstance();
+   base::AutoLock lock(va_display_state.lock_);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   std::string va_driver_name;
+   auto env = base::Environment::Create();
+   if (env->GetVar("LIBVA_DRIVER_NAME", &va_driver_name) &&
+@@ -1539,7 +1539,7 @@ void VADisplayStateSingleton::PreSandboxInitialization
+     if (base::EqualsCaseInsensitiveASCII(version_name, "vgem")) {
+       continue;
+     }
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // Skip NVIDIA GPUs if the VA-API driver used for them is known for crashing
+     // with VA/DRM.
+     if (is_nvidia_va_drm_broken &&
+@@ -1572,7 +1572,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
+     return {};
+   }
+ 
+-#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+   // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on
+   // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi
+   // for more details. This will also require revisiting everything that's
+@@ -2403,7 +2403,7 @@ scoped_refptr<VASurface> VaapiWrapper::CreateVASurface
+     return nullptr;
+   }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // TODO(crbug.com/1326754): enable use DRIME_PRIME_2 API on Linux with the
+   // iHD driver.
+   const bool use_drm_prime_2 = false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni
index 13d6f8e6fee3..737749461c1f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_media__options.gni
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/media_options.gni.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/media/media_options.gni.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/media/media_options.gni
-@@ -196,12 +196,15 @@ declare_args() {
+@@ -189,12 +189,15 @@ declare_args() {
    # Enables runtime selection of ALSA library for audio.
    use_alsa = false
  
@@ -17,7 +17,7 @@
        (!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
         is_cast_audio_only)) {
      use_alsa = true
-@@ -217,6 +220,10 @@ declare_args() {
+@@ -210,6 +213,10 @@ declare_args() {
      if (!use_cras && !is_castos && !is_asan && !is_tsan) {
        use_pulseaudio = true
      }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
index 929095529690..32f0c1350902 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc
@@ -1,15 +1,6 @@
---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -39,7 +39,7 @@ gfx::GpuMemoryBufferHandle GetVideoFrameGpuMemoryBuffe
-   gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle =
-       input->GetGpuMemoryBuffer()->CloneHandle();
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP);
-   CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty());
- #else
-@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
+@@ -837,7 +837,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
    return input.id;
  }
  
@@ -18,7 +9,7 @@
  // static
  gfx::NativePixmapHandle StructTraits<
      media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -772,7 +772,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
+@@ -858,7 +858,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
  
    output->type = gfx::NATIVE_PIXMAP;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
index 58c76e3dad1f..badd3fb67fa7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -693,7 +693,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
    static const gfx::GpuMemoryBufferId& id(
        const gfx::GpuMemoryBufferHandle& input);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc
index 4ceffe452896..7330db5c2cd0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_gpu__memory__buffer__video__frame__pool.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/media/video/gpu_memory_buffer_video_frame_pool.cc
 @@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
    }
@@ -9,8 +9,8 @@
    is_software_backed_video_frame &= !video_frame->HasDmaBufs();
  #endif
  
-@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
-     is_webgpu_compatible = (gpu_memory_buffer != nullptr);
+@@ -1199,7 +1199,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+     }
  #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +18,7 @@
      is_webgpu_compatible = (gpu_memory_buffer != nullptr);
      if (is_webgpu_compatible) {
        is_webgpu_compatible &=
-@@ -1177,7 +1177,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1218,7 +1218,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
                         gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
                         gpu::SHARED_IMAGE_USAGE_SCANOUT;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc
index 3975d337f8cb..035aa5896513 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter.cc
 @@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
    if (is_rgb)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc
index 6ac94ed8b548..566d26253613 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_media_video_video__encode__accelerator__adapter__test.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/media/video/video_encode_accelerator_adapter_test.cc
-@@ -449,7 +449,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
+@@ -459,7 +459,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
        CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2));
  
    VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn
index 3c99434c12d2..a96a138f0536 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/mojo/core/BUILD.gn.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/mojo/core/BUILD.gn.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/mojo/core/BUILD.gn
-@@ -164,7 +164,7 @@ template("core_impl_source_set") {
+@@ -166,7 +166,7 @@ template("core_impl_source_set") {
          ]
        }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h
index 9ed0dc06fcdd..e36f5ba80304 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_core_embedder_features.h
@@ -1,9 +1,9 @@
---- src/3rdparty/chromium/mojo/core/embedder/features.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/mojo/core/embedder/features.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/mojo/core/embedder/features.h
-@@ -14,7 +14,7 @@ namespace mojo {
- namespace core {
+@@ -16,7 +16,7 @@ namespace core {
  
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MAC)
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && \
+     !BUILDFLAG(MOJO_USE_APPLE_CHANNEL)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni
index ddad9b308a12..da3560fe7f91 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/mojo/public/tools/bindings/mojom.gni
-@@ -722,6 +722,16 @@ template("mojom") {
+@@ -743,6 +743,16 @@ template("mojom") {
        enabled_features += [ "is_apple" ]
      }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
index 3b132db0a7d7..b35ef2592495 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/net/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/net/BUILD.gn
-@@ -108,7 +108,7 @@ net_configs = [
+@@ -126,7 +126,7 @@ net_configs = [
    "//build/config/compiler:wexit_time_destructors",
  ]
  
@@ -9,12 +9,16 @@
    net_configs += [ "//build/config/linux:libresolv" ]
  }
  
-@@ -1228,6 +1228,15 @@ component("net") {
+@@ -1255,6 +1255,19 @@ component("net") {
      deps += [ "//third_party/xdg_shared_mime_info" ]
    }
  
 +  if (is_bsd) {
 +    sources -= [
++      "base/address_map_cache_linux.cc",
++      "base/address_map_cache_linux.h",
++      "base/address_map_linux.cc",
++      "base/address_map_linux.h",
 +      "base/address_tracker_linux.cc",
 +      "base/address_tracker_linux.h",
 +      "base/network_change_notifier_linux.cc",
@@ -25,16 +29,7 @@
    if (is_mac) {
      sources += [
        "base/network_notification_thread_mac.cc",
-@@ -1360,7 +1369,7 @@ component("net") {
-     }
-   }
- 
--  if (is_android || is_chromeos) {
-+  if (is_android || is_chromeos || is_bsd) {
-     sources += [
-       "base/network_change_notifier_posix.cc",
-       "base/network_change_notifier_posix.h",
-@@ -1393,7 +1402,7 @@ component("net") {
+@@ -1410,7 +1423,7 @@ component("net") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,8 +38,8 @@
      sources += [
        "base/network_interfaces_getifaddrs.cc",
        "base/network_interfaces_getifaddrs.h",
-@@ -2837,7 +2846,7 @@ test("net_unittests") {
-     sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ]
+@@ -2905,7 +2918,7 @@ test("net_unittests") {
+     ]
    }
  
 -  if (is_linux || is_chromeos) {
@@ -52,7 +47,7 @@
      sources += [
        "base/address_tracker_linux_unittest.cc",
        "base/network_interfaces_linux_unittest.cc",
-@@ -2909,6 +2918,10 @@ test("net_unittests") {
+@@ -2973,6 +2986,10 @@ test("net_unittests") {
      "//url:buildflags",
    ]
  
@@ -63,7 +58,7 @@
    if (enable_websockets) {
      deps += [ "//net/server:tests" ]
    }
-@@ -2976,7 +2989,7 @@ test("net_unittests") {
+@@ -3055,7 +3072,7 @@ test("net_unittests") {
      ]
    }
  
@@ -72,7 +67,7 @@
      sources += [ "tools/quic/quic_simple_server_test.cc" ]
    }
  
-@@ -3101,7 +3114,7 @@ test("net_unittests") {
+@@ -3190,7 +3207,7 @@ test("net_unittests") {
    }
  
    # Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc
new file mode 100644
index 000000000000..f9d3da04f73d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/net/base/features.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/net/base/features.cc
+@@ -181,7 +181,7 @@ BASE_FEATURE(kChromeRootStoreUsed,
+ #if BUILDFLAG(CHROME_ROOT_STORE_OPTIONAL)
+ BASE_FEATURE(kChromeRootStoreUsed,
+              "ChromeRootStoreUsed",
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.cc
new file mode 100644
index 000000000000..54f65b481329
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/net/base/mock_network_change_notifier.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/net/base/mock_network_change_notifier.cc
+@@ -103,7 +103,7 @@ MockNetworkChangeNotifier::GetCurrentConnectionCost() 
+   return connection_cost_;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AddressMapOwnerLinux* MockNetworkChangeNotifier::GetAddressMapOwnerInternal() {
+   return address_map_owner_;
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.h
new file mode 100644
index 000000000000..fa6daf99c99f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_mock__network__change__notifier.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/net/base/mock_network_change_notifier.h.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/net/base/mock_network_change_notifier.h
+@@ -84,7 +84,7 @@ class MockNetworkChangeNotifier : public NetworkChange
+   // use_default_connection_cost_implementation is set to true.
+   ConnectionCost GetCurrentConnectionCost() override;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void SetAddressMapOwnerLinux(AddressMapOwnerLinux* address_map_owner) {
+     address_map_owner_ = address_map_owner;
+   }
+@@ -104,7 +104,7 @@ class MockNetworkChangeNotifier : public NetworkChange
+   bool use_default_connection_cost_implementation_ = false;
+   NetworkChangeNotifier::NetworkList connected_networks_;
+   std::unique_ptr<SystemDnsConfigChangeNotifier> dns_config_notifier_;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   raw_ptr<AddressMapOwnerLinux> address_map_owner_ = nullptr;
+ #endif
+ };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc
index 614239a8ac70..54dd12bf63a8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/base/network_change_notifier.cc
 @@ -37,7 +37,7 @@
  #include "net/base/network_change_notifier_linux.h"
@@ -6,10 +6,10 @@
  #include "net/base/network_change_notifier_mac.h"
 -#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
- #include "net/base/network_change_notifier_posix.h"
+ #include "net/base/network_change_notifier_passive.h"
  #elif BUILDFLAG(IS_FUCHSIA)
  #include "net/base/network_change_notifier_fuchsia.h"
-@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
  #elif BUILDFLAG(IS_FUCHSIA)
    return std::make_unique<NetworkChangeNotifierFuchsia>(
        /*require_wlan=*/false);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__passive.cc
index 19b2300e0bba..4ab4523fae18 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier__passive.cc
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/net/base/network_change_notifier_posix.cc.orig	2022-08-31 12:19:35 UTC
-+++ src/3rdparty/chromium/net/base/network_change_notifier_posix.cc
-@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
+--- src/3rdparty/chromium/net/base/network_change_notifier_passive.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/net/base/network_change_notifier_passive.cc
+@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern
  NetworkChangeNotifier::NetworkChangeCalculatorParams
- NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
+ NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() {
    NetworkChangeCalculatorParams params;
 -#if BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc
index 75371fc06d21..49de64966dff 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verifier.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/net/cert/cert_verifier.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/cert/cert_verifier.cc
-@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa
-   }
- #endif
-   if (!verify_proc) {
--#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-     verify_proc =
-         CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher));
+@@ -40,7 +40,7 @@ class DefaultCertVerifyProcFactory : public net::CertV
+     return CertVerifyProc::CreateBuiltinWithChromeRootStore(
+         std::move(cert_net_fetcher), impl_params.crl_set,
+         base::OptionalToPtr(impl_params.root_store_data));
+-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
+                                                    impl_params.crl_set);
  #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc
index 5da70a7c4a36..99e797965813 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/net/cert/cert_verify_proc.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/cert/cert_verify_proc.cc
-@@ -414,7 +414,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
+@@ -409,7 +409,7 @@ base::Value::Dict CertVerifyParams(
  
  }  // namespace
  
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
  // static
  scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc(
-     scoped_refptr<CertNetFetcher> cert_net_fetcher) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h
index d2ff3390f0eb..9946d7f3a1f4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_cert__verify__proc.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/net/cert/cert_verify_proc.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/net/cert/cert_verify_proc.h
-@@ -68,7 +68,7 @@ class NET_EXPORT CertVerifyProc
+@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc
      kMaxValue = kChainLengthOne
    };
  
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
    // Creates and returns a CertVerifyProc that uses the system verifier.
    // |cert_net_fetcher| may not be used, depending on the implementation.
-   static scoped_refptr<CertVerifyProc> CreateSystemVerifyProc(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h
new file mode 100644
index 000000000000..3beddde56ec9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_cert_pki_general__names.h
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/net/cert/pki/general_names.h.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/net/cert/pki/general_names.h
+@@ -8,6 +8,7 @@
+ #include <memory>
+ #include <string_view>
+ #include <vector>
++#include <string>
+ 
+ #include "net/base/net_export.h"
+ #include "net/cert/pki/cert_error_id.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h
deleted file mode 100644
index f9ae7455c2f3..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_disk__cache_blockfile_disk__format.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h.orig	2022-08-31 12:19:35 UTC
-+++ src/3rdparty/chromium/net/disk_cache/blockfile/disk_format.h
-@@ -153,7 +153,9 @@ struct RankingsNode {
- };
- #pragma pack(pop)
- 
-+#if !defined(OS_BSD)
- static_assert(sizeof(RankingsNode) == 36, "bad RankingsNode");
-+#endif
- 
- }  // namespace disk_cache
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn
index 93250dcd0367..3617747ac2ba 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/dns/BUILD.gn.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/net/dns/BUILD.gn.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/net/dns/BUILD.gn
-@@ -124,7 +124,7 @@ source_set("dns") {
+@@ -128,7 +128,7 @@ source_set("dns") {
        "dns_config_service_android.cc",
        "dns_config_service_android.h",
      ]
@@ -9,16 +9,26 @@
      sources += [
        "dns_config_service_linux.cc",
        "dns_config_service_linux.h",
-@@ -165,6 +165,7 @@ source_set("dns") {
+@@ -162,6 +162,9 @@ source_set("dns") {
+   }
+
+   deps = [ "//net:net_deps" ]
++  if (is_bsd) {
++    deps += [ "//components/services/screen_ai/buildflags" ]
++  }
+
+   public_deps = [
+     ":dns_client",
+@@ -169,6 +172,7 @@ source_set("dns") {
      ":host_resolver_manager",
      ":mdns_client",
      "//net:net_public_deps",
 +    "//printing/buildflags",
    ]
- 
+
    allow_circular_includes_from = [
-@@ -428,9 +429,9 @@ source_set("tests") {
- 
+@@ -436,9 +440,9 @@ source_set("tests") {
+
    if (is_android) {
      sources += [ "dns_config_service_android_unittest.cc" ]
 -  } else if (is_linux) {
@@ -28,4 +38,4 @@
 +  } else if (is_posix && !is_bsd) {
      sources += [ "dns_config_service_posix_unittest.cc" ]
    }
- 
+
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc
new file mode 100644
index 000000000000..645bc6db9596
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__info.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/net/dns/address_info.cc.orig	2023-09-29 10:14:06 UTC
++++ src/3rdparty/chromium/net/dns/address_info.cc
+@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
+     // error.
+     // http://crbug.com/134142
+     err = ERR_NAME_NOT_RESOLVED;
+-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
++#elif BUILDFLAG(IS_POSIX)
++#ifdef EAI_NODATA
+     if (os_error != EAI_NONAME && os_error != EAI_NODATA)
++#else
++    if (os_error != EAI_NONAME)
++#endif
+       err = ERR_NAME_RESOLUTION_FAILED;
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc
index 6e159df9c59f..56f6e5420624 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/net/dns/address_sorter_posix.cc
-@@ -18,6 +18,7 @@
- #include <ifaddrs.h>
- #include <net/if.h>
+@@ -27,6 +27,7 @@
+ #include "net/dns/netinet_in_var_ios.h"
+ #else
  #include <netinet/in_var.h>
 +#include <netinet6/in6_var.h>
- #include <string.h>
- #include <sys/ioctl.h>
+ #endif  // BUILDFLAG(IS_IOS)
  #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc
index 981b7ed99ffb..56580ae1ca4e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc
-@@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+@@ -370,8 +370,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
      static const char* const kDefaultLibraryNames[] = {
  #if BUILDFLAG(IS_APPLE)
        "/System/Library/Frameworks/GSS.framework/GSS"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc
new file mode 100644
index 000000000000..8433aae87595
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__handler__negotiate.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/net/http/http_auth_handler_negotiate.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/net/http/http_auth_handler_negotiate.cc
+@@ -121,7 +121,7 @@ int HttpAuthHandlerNegotiate::Factory::CreateAuthHandl
+ #elif BUILDFLAG(IS_POSIX)
+   if (is_unsupported_)
+     return ERR_UNSUPPORTED_AUTH_SCHEME;
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Note: Don't set is_unsupported_ = true here. AllowGssapiLibraryLoad()
+   // might change to true during a session.
+   if (!http_auth_preferences() ||
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.cc
new file mode 100644
index 000000000000..a4a4207ce0bf
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/net/http/http_auth_preferences.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/net/http/http_auth_preferences.cc
+@@ -39,7 +39,7 @@ std::string HttpAuthPreferences::AuthAndroidNegotiateA
+ }
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool HttpAuthPreferences::AllowGssapiLibraryLoad() const {
+   return allow_gssapi_library_load_;
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.h
new file mode 100644
index 000000000000..7b8e4bdd586c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__preferences.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/net/http/http_auth_preferences.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/net/http/http_auth_preferences.h
+@@ -50,7 +50,7 @@ class NET_EXPORT HttpAuthPreferences {
+ #if BUILDFLAG(IS_ANDROID)
+   virtual std::string AuthAndroidNegotiateAccountType() const;
+ #endif
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   virtual bool AllowGssapiLibraryLoad() const;
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+   virtual bool CanUseDefaultCredentials(
+@@ -86,7 +86,7 @@ class NET_EXPORT HttpAuthPreferences {
+   }
+ #endif  // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void set_allow_gssapi_library_load(bool allow_gssapi_library_load) {
+     allow_gssapi_library_load_ = allow_gssapi_library_load;
+   }
+@@ -137,7 +137,7 @@ class NET_EXPORT HttpAuthPreferences {
+   std::string auth_android_negotiate_account_type_;
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   bool allow_gssapi_library_load_ = true;
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc
index bed4b7b584a5..a9af59c8661f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/proxy_resolution/proxy_config_service_linux.cc
 @@ -6,7 +6,9 @@
  
  #include <errno.h>
  #include <limits.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  #include <sys/inotify.h>
 +#endif
  #include <unistd.h>
@@ -14,7 +14,7 @@
  }
  #endif  // defined(USE_GIO)
  
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  // Converts |value| from a decimal string to an int. If there was a failure
  // parsing, returns |default_value|.
  int StringToIntOrDefault(base::StringPiece value, int default_value) {
@@ -26,11 +26,11 @@
  
  }  // namespace
  
-@@ -1248,9 +1252,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
-     case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
      case base::nix::DESKTOP_ENVIRONMENT_KDE4:
      case base::nix::DESKTOP_ENVIRONMENT_KDE5:
-+#if !defined(OS_BSD)
+     case base::nix::DESKTOP_ENVIRONMENT_KDE6:
++#if !BUILDFLAG(IS_BSD)
        setting_getter_ =
            std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
        break;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc
index a2eb5a7980c2..1e27146b95fe 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_tcp__socket__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/net/socket/tcp_socket_posix.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/socket/tcp_socket_posix.cc
-@@ -99,6 +99,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
        PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
        return false;
      }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc
index d6ad69879dbd..68a680130778 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc
-@@ -577,7 +577,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() {
  }
  
  void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
    if (confirm) {
      sendto_flags_ |= MSG_CONFIRM;
    } else {
-@@ -598,7 +598,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
    int value = broadcast ? 1 : 0;
    int rv;
@@ -18,7 +18,7 @@
    // SO_REUSEPORT on OSX permits multiple processes to each receive
    // UDP multicast or broadcast datagrams destined for the bound
    // port.
-@@ -911,7 +911,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
+@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) 
  #if BUILDFLAG(IS_CHROMEOS_ASH)
    if (last_error == EINVAL)
      return ERR_ADDRESS_IN_USE;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
index 92fd48113d9e..c715ee91ed28 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
 @@ -35,7 +35,7 @@
  #include "net/url_request/url_request_context_builder.h"
@@ -18,12 +18,12 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -127,7 +127,7 @@ class CertVerifyImpl {
+@@ -126,7 +126,7 @@ class CertVerifyImpl {
  std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
      base::StringPiece impl_name,
      scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
    if (impl_name == "platform") {
      return std::make_unique<CertVerifyImpl>(
-         "CertVerifyProc (system)", net::CertVerifyProc::CreateSystemVerifyProc(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc
index 21a600136e64..4d2b90081384 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/net/tools/cert_verify_tool/cert_verify_tool.cc
 @@ -31,7 +31,7 @@
  #include "net/url_request/url_request_context_builder.h"
@@ -18,21 +18,21 @@
    // On Linux, use a fixed ProxyConfigService, since the default one
    // depends on glib.
    //
-@@ -222,7 +222,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
-     base::StringPiece impl_name,
+@@ -223,7 +223,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
      scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
+     scoped_refptr<net::CRLSet> crl_set,
      RootStoreType root_store_type) {
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
    if (impl_name == "platform") {
      if (root_store_type != RootStoreType::kSystem) {
-       std::cerr << "WARNING: platform verifier not supported with "
-@@ -534,7 +534,7 @@ int main(int argc, char** argv) {
+@@ -537,7 +537,7 @@ int main(int argc, char** argv) {
    std::string impls_str = command_line.GetSwitchValueASCII("impls");
    if (impls_str.empty()) {
      // Default value.
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+       BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
      impls_str = "platform,";
  #endif
-     impls_str += "builtin,pathbuilder";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc
index 89ac3cd25dc2..1d82ab2392fc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/net/url_request/url_request_context_builder.cc
-@@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -446,7 +446,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
    }
  
    if (!proxy_resolution_service_) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
index 150ef4b2664b..7bfd41e35275 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc
-@@ -84,7 +84,7 @@
+@@ -83,7 +83,7 @@
  #include "gin/public/cppgc.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "pdf/pdfium/pdfium_font_linux.h"
  #endif
  
-@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon
+@@ -525,7 +525,7 @@ void InitializeSDK(bool enable_v8,
  
    FPDF_InitLibraryWithConfig(&config);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc
deleted file mode 100644
index 5a90544a5b4f..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__helper.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/printing/backend/cups_helper.cc.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/printing/backend/cups_helper.cc
-@@ -127,7 +127,7 @@ void GetResolutionSettings(ppd_file_t* ppd,
-   // found.
- #if BUILDFLAG(IS_MAC)
-   constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   constexpr gfx::Size kDefaultMissingDpi(kPixelsPerInch, kPixelsPerInch);
- #else
-   constexpr gfx::Size kDefaultMissingDpi(kDefaultPdfDpi, kDefaultPdfDpi);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc
index a0de02e92b31..e3b7090806f5 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_backend_cups__ipp__helper.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/printing/backend/cups_ipp_helper.cc
-@@ -210,7 +210,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
+@@ -215,7 +215,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
    // Provide a default DPI if no valid DPI is found.
  #if BUILDFLAG(IS_MAC)
    constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc
index f7f14d9a11f0..5e70a52bef9b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.cc
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.cc
-@@ -15,7 +15,7 @@
- #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
- #include "ui/gfx/geometry/size.h"
+@@ -19,7 +19,7 @@
+ #include "base/numerics/safe_conversions.h"
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "mojo/public/mojom/base/values.mojom.h"
  #endif
  
-@@ -150,7 +150,7 @@ bool StructTraits<
+@@ -161,7 +161,7 @@ bool StructTraits<
    }
  
    out->set_pages_per_sheet(data.pages_per_sheet());
@@ -18,3 +18,12 @@
    DCHECK(out->advanced_settings().empty());
    if (!data.ReadAdvancedSettings(&out->advanced_settings()))
      return false;
+@@ -239,7 +239,7 @@ bool StructTraits<
+       return false;
+     }
+ 
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     // The dictionary must contain three strings.
+     base::Value* value = system_print_dialog_data.Find(
+         printing::kLinuxSystemPrintDialogDataPrinter);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h
index aa26b6bb7df4..fcdfc946bf1f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_mojom_printing__context__mojom__traits.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/mojom/printing_context_mojom_traits.h
-@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
+@@ -166,7 +166,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
      return s.pages_per_sheet();
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc
index 363d83e8e5d5..a4f4d9d86d32 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/printing/print_settings.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/printing/print_settings.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/print_settings.cc
-@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
+@@ -320,7 +320,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
  #endif
    is_modifiable_ = settings.is_modifiable_;
    pages_per_sheet_ = settings.pages_per_sheet_;
@@ -9,7 +9,25 @@
    for (const auto& item : settings.advanced_settings_)
      advanced_settings_.emplace(item.first, item.second.Clone());
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -405,7 +405,7 @@ void PrintSettings::Clear() {
+@@ -350,7 +350,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+ #endif
+                   is_modifiable_, requested_custom_margins_in_points_,
+                   pages_per_sheet_
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+                   ,
+                   advanced_settings_
+ #endif
+@@ -374,7 +374,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+                   other.is_modifiable_,
+                   other.requested_custom_margins_in_points_,
+                   other.pages_per_sheet_
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+                   ,
+                   other.advanced_settings_
+ #endif
+@@ -414,7 +414,7 @@ void PrintSettings::Clear() {
  #endif
    is_modifiable_ = true;
    pages_per_sheet_ = 1;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h
index bf497f113add..3d7d309de02d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings.h
@@ -1,15 +1,24 @@
---- src/3rdparty/chromium/printing/print_settings.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/printing/print_settings.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/print_settings.h
-@@ -21,7 +21,7 @@
- #include "ui/gfx/geometry/rect.h"
- #include "ui/gfx/geometry/size.h"
+@@ -25,7 +25,7 @@
+ #include "base/values.h"
+ #endif
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include <map>
  
  #include "base/values.h"
-@@ -74,7 +74,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -51,7 +51,7 @@ inline constexpr char kMacSystemPrintDialogDataPrintSe
+     "print_settings";
+ #endif  // BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ inline constexpr char kLinuxSystemPrintDialogDataPrinter[] = "printer_name";
+ inline constexpr char kLinuxSystemPrintDialogDataPrintSettings[] =
+     "print_settings";
+@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
      std::string vendor_id;
    };
  
@@ -18,7 +27,7 @@
    using AdvancedSettings = std::map<std::string, base::Value>;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -241,7 +241,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -276,7 +276,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
      pages_per_sheet_ = pages_per_sheet;
    }
  
@@ -27,7 +36,7 @@
    AdvancedSettings& advanced_settings() { return advanced_settings_; }
    const AdvancedSettings& advanced_settings() const {
      return advanced_settings_;
-@@ -372,7 +372,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -429,7 +429,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
    // Number of pages per sheet.
    int pages_per_sheet_;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc
index 124d6ab84e9d..5da292797b4a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_print__settings__conversion.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/printing/print_settings_conversion.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/print_settings_conversion.cc
-@@ -277,7 +277,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
+@@ -287,7 +287,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet
      settings->set_is_modifiable(is_modifiable.value());
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc
index 5849f4064098..948fad7aa10e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_printing__context__linux.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/printing/printing_context_linux.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/printing/printing_context_linux.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/printing/printing_context_linux.cc
-@@ -19,7 +19,7 @@
- #include "printing/units.h"
+@@ -23,7 +23,7 @@
+ #endif
  
  // Avoid using LinuxUi on Fuchsia.
 -#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
+@@ -72,7 +72,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
  
    ResetSettings();
  
@@ -18,7 +18,7 @@
    if (!ui::LinuxUi::instance())
      return mojom::ResultCode::kSuccess;
  
-@@ -84,7 +84,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
+@@ -88,7 +88,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett
  }
  
  gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() {
@@ -27,7 +27,7 @@
    if (ui::LinuxUi::instance())
      return ui::LinuxUi::instance()->GetPdfPaperSize(this);
  #endif
-@@ -97,7 +97,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS
+@@ -101,7 +101,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS
    DCHECK(!printer_settings.show_system_dialog);
    DCHECK(!in_print_job_);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc
index 3abb9b1db71f..8f2aa000c2c1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.cc
-@@ -10,21 +10,28 @@
+@@ -10,20 +10,27 @@
  #include "base/path_service.h"
  #include "build/build_config.h"
  #include "printing/buildflags/buildflags.h"
@@ -9,9 +9,8 @@
  #include "sandbox/linux/syscall_broker/broker_file_permission.h"
  #include "sandbox/policy/export.h"
  #include "sandbox/policy/linux/sandbox_linux.h"
- #include "services/network/network_sandbox_hook_linux.h"
 +#else
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#endif
  
  #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
@@ -29,7 +28,7 @@
  namespace {
  
  sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() {
-@@ -85,9 +92,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP
+@@ -76,9 +83,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP
  }
  
  }  // namespace
@@ -41,7 +40,7 @@
  #if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
    // Create the socket connections to the CUPS server before engaging the
    // sandbox, since new connections cannot be made after that.
-@@ -101,6 +110,7 @@ bool PrintBackendPreSandboxHook(
+@@ -92,6 +101,7 @@ bool PrintBackendPreSandboxHook(
        sandbox::policy::SandboxLinux::PreSandboxHook(), options);
  
    instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h
index 562558862c61..57c55c4add93 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_printing_sandbox_print__backend__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/printing/sandbox/print_backend_sandbox_hook_linux.h
 @@ -5,8 +5,13 @@
  #ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
@@ -6,8 +6,8 @@
  
 +#include "build/build_config.h"
  #include "base/component_export.h"
-+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn
index ee65ecf8a3a5..cfdee966f711 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/sandbox/linux/BUILD.gn.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/sandbox/linux/BUILD.gn.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/sandbox/linux/BUILD.gn
 @@ -12,11 +12,11 @@ if (is_android) {
  }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc
index 1007bb73db43..7593efce8eed 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_linux_services_libc__interceptor.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/sandbox/linux/services/libc_interceptor.cc
 @@ -12,7 +12,9 @@
  #include <stddef.h>
  #include <stdint.h>
  #include <string.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  #include <sys/prctl.h>
 +#endif
  #include <sys/socket.h>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn
index 3f5ef1a4abdd..2d970ec34ee7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_BUILD.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/sandbox/policy/BUILD.gn.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/sandbox/policy/BUILD.gn
 @@ -35,7 +35,7 @@ component("policy") {
      "//sandbox/policy/mojom",
@@ -9,7 +9,7 @@
      sources += [
        "linux/bpf_audio_policy_linux.cc",
        "linux/bpf_audio_policy_linux.h",
-@@ -103,6 +103,27 @@ component("policy") {
+@@ -106,6 +106,27 @@ component("policy") {
        "//sandbox/linux:sandbox_services",
        "//sandbox/linux:seccomp_bpf",
        "//sandbox/linux:suid_sandbox_client",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc
index c85e54bcce00..b5c11fdb5f0b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_features.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/sandbox/policy/features.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/sandbox/policy/features.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/sandbox/policy/features.cc
-@@ -15,7 +15,11 @@ namespace sandbox::policy::features {
- // (Only causes an effect when feature kNetworkService is enabled.)
+@@ -19,7 +19,11 @@ namespace sandbox::policy::features {
+ // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
  BASE_FEATURE(kNetworkServiceSandbox,
               "NetworkServiceSandbox",
 +#if BUILDFLAG(IS_BSD)
@@ -9,6 +9,6 @@
 +#else
               base::FEATURE_DISABLED_BY_DEFAULT);
 +#endif
- #endif  // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA)
  
- #if BUILDFLAG(IS_WIN)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ // Enables a fine-grained seccomp-BPF syscall filter for the network service.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc
index 113fe2c35295..2c31ebe63ce2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.cc
@@ -120,7 +120,7 @@
 +      base::FilePath cache_directory, local_directory;
 +
 +      base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+      base::PathService::Get(base::DIR_HOME, &local_directory);
++      base::PathService::Get(base::DIR_HOME, &local_directory);   
 +
 +      cache_directory = cache_directory.AppendASCII("chromium");
 +      local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h
index 63c091d8eaab..bf58da39099d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_freebsd_sandbox__freebsd.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h.orig	2023-12-22 15:04:02 UTC
 +++ src/3rdparty/chromium/sandbox/policy/freebsd/sandbox_freebsd.h
 @@ -0,0 +1,278 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom
index 8534b0cee625..39ac0d6e34b4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_mojom_sandbox.mojom
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/sandbox/policy/mojom/sandbox.mojom
-@@ -76,6 +76,12 @@ enum Sandbox {
-   [EnableIf=is_win]
-   kFileUtil,
+@@ -72,6 +72,12 @@ enum Sandbox {
+   [EnableIf=is_fuchsia]
+   kVideoCapture,
  
 +  [EnableIf=is_openbsd]
 +  kVideoCapture,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc
index 79833e898578..dbc297b8a2ab 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_openbsd_sandbox__openbsd.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/sandbox/policy/openbsd/sandbox_openbsd.cc
-@@ -0,0 +1,399 @@
+@@ -0,0 +1,420 @@
 +// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -37,6 +37,8 @@
 +#include "base/threading/thread.h"
 +#include "base/time/time.h"
 +#include "build/build_config.h"
++#include "crypto/crypto_buildflags.h"
++#include "ppapi/buildflags/buildflags.h"
 +#include "sandbox/constants.h"
 +#include "sandbox/linux/services/credentials.h"
 +#include "sandbox/linux/services/namespace_sandbox.h"
@@ -55,7 +57,7 @@
 +#include <sanitizer/common_interface_defs.h>
 +#endif
 +
-+#if defined(USE_NSS_CERTS)
++#if BUILDFLAG(USE_NSS_CERTS)
 +#include "crypto/nss_util.h"
 +#endif
 +
@@ -66,10 +68,7 @@
 +#define MAXTOKENS	3
 +
 +#define _UNVEIL_MAIN		"/etc/chromium/unveil.main";
-+#define _UNVEIL_RENDERER	"/etc/chromium/unveil.renderer";
 +#define _UNVEIL_GPU		"/etc/chromium/unveil.gpu";
-+#define _UNVEIL_PLUGIN		"/etc/chromium/unveil.plugin";
-+#define _UNVEIL_UTILITY		"/etc/chromium/unveil.utility";
 +#define _UNVEIL_UTILITY_NETWORK	"/etc/chromium/unveil.utility_network";
 +#define _UNVEIL_UTILITY_AUDIO	"/etc/chromium/unveil.utility_audio";
 +#define _UNVEIL_UTILITY_VIDEO	"/etc/chromium/unveil.utility_video";
@@ -118,40 +117,41 @@
 +  base::SysInfo::NumberOfProcessors();
 +  base::SysInfo::CPUModelName();
 +
-+#if defined(USE_NSS_CERTS)
-+  // The main process has to initialize the ~/.pki dir which won't work
-+  // after unveil(2).
-+  if (process_type.empty())
-+    crypto::EnsureNSSInit();
++  switch (sandbox_type) {
++    case sandbox::mojom::Sandbox::kNoSandbox:
++    {
++#if BUILDFLAG(USE_NSS_CERTS)
++      // The main process has to initialize the ~/.pki dir which won't work
++      // after unveil(2).
++      crypto::EnsureNSSInit();
 +#endif
++      CRYPTO_pre_sandbox_init();
 +
-+  if (process_type.empty())
-+    CRYPTO_pre_sandbox_init();
++      base::FilePath cache_directory, local_directory;
 +
-+  if (process_type.empty()) {
-+    base::FilePath cache_directory, local_directory;
++      base::PathService::Get(base::DIR_CACHE, &cache_directory);
++      base::PathService::Get(base::DIR_HOME, &local_directory);   
 +
-+    base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+    base::PathService::Get(base::DIR_HOME, &local_directory);   
++      cache_directory = cache_directory.AppendASCII("chromium");
++      local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
 +
-+    cache_directory = cache_directory.AppendASCII("chromium");
-+    local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
++      if (!base::CreateDirectory(cache_directory)) {
++        LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
++      }
 +
-+    if (!base::CreateDirectory(cache_directory)) {
-+      LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+    }
++      if (!base::CreateDirectory(local_directory)) {
++        LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++      }
 +
-+    if (!base::CreateDirectory(local_directory)) {
-+      LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++      break;
 +    }
++    case sandbox::mojom::Sandbox::kRenderer:
++      gfx::InitializeFonts();
++      break;
++    default:
++      break;
 +  }
 +
-+  if (process_type == switches::kRendererProcess)
-+    gfx::InitializeFonts();
-+
-+  if (!command_line->HasSwitch(switches::kDisableUnveil))
-+    SetUnveil(process_type, sandbox_type);
-+
 +  pre_initialized_ = true;
 +}
 +
@@ -164,6 +164,7 @@
 +  if (pstring != NULL) {
 +    if (pledge(pstring, NULL) == -1)
 +      goto err;
++    VLOG(5) << "pledge " << pstring;
 +  } else if (ppath != NULL) {
 +    fp = fopen(ppath, "r");
 +    if (fp != NULL) {
@@ -172,10 +173,11 @@
 +          s[strlen(s)-1] = '\0';
 +        if (pledge(s, NULL) == -1)
 +  	  goto err;
++        VLOG(5) << "pledge " << s;
 +      }
 +      fclose(fp);
 +    } else {
-+      LOG(ERROR) << "fopen() failed, errno: " << errno;
++      LOG(ERROR) << "fopen(" << ppath << ") failed, errno: " << errno;
 +      return false;
 +    }
 +  }
@@ -192,24 +194,25 @@
 +  const char *ufile;
 +  size_t len = 0, lineno = 0;
 +
-+  if (process_type.empty()) {
-+    ufile = _UNVEIL_MAIN;
-+  } else if (process_type == switches::kRendererProcess) {
-+    ufile = _UNVEIL_RENDERER;
-+  } else if (process_type == switches::kGpuProcess) {
-+    ufile = _UNVEIL_GPU;
-+  } else if (process_type == switches::kPpapiPluginProcess) {
-+    ufile = _UNVEIL_PLUGIN;
-+  } else if (process_type == switches::kUtilityProcess) {
-+    if (sandbox_type == sandbox::mojom::Sandbox::kNetwork) {
++  switch (sandbox_type) {
++    case sandbox::mojom::Sandbox::kNoSandbox:
++      ufile = _UNVEIL_MAIN;
++      break;
++    case sandbox::mojom::Sandbox::kGpu:
++      ufile = _UNVEIL_GPU;
++      break;
++    case sandbox::mojom::Sandbox::kNetwork:
 +      ufile = _UNVEIL_UTILITY_NETWORK;
-+    } else if (sandbox_type == sandbox::mojom::Sandbox::kAudio) {
++      break;
++    case sandbox::mojom::Sandbox::kAudio:
 +      ufile = _UNVEIL_UTILITY_AUDIO;
-+    } else if (sandbox_type == sandbox::mojom::Sandbox::kVideoCapture) {
++      break;
++    case sandbox::mojom::Sandbox::kVideoCapture:
 +      ufile = _UNVEIL_UTILITY_VIDEO;
-+    } else {
-+      ufile = _UNVEIL_UTILITY;
-+    }
++      break;
++    default:
++      unveil("/dev/null", "r");
++      goto done;
 +  }
 +
 +  fp = fopen(ufile, "r");
@@ -259,7 +262,7 @@
 +        LOG(ERROR) << "failed unveiling " << path << " with permissions " << tokens[1];
 +        _exit(1);
 +      } else {
-+        VLOG(1) << "unveiling " << path << " with permissions " << tokens[1];
++        VLOG(5) << "unveiling " << path << " with permissions " << tokens[1];
 +      }
 +    }
 +    fclose(fp);
@@ -268,6 +271,7 @@
 +        _exit(1);
 +  }
 +
++done:
 +  unveil_initialized_ = true;
 +
 +  return true;
@@ -307,31 +311,46 @@
 +    PCHECK(limited_as);
 +  }
 +
-+  if (process_type.empty()) {
-+    // XXX use a file for listing pledges of the main process for now
-+    // XXX not having the file is not a fatal error
-+    SetPledge(NULL, "/etc/chromium/pledge.main");
-+  } else if (process_type == switches::kRendererProcess) {
-+    // prot_exec needed by v8
-+    // flock needed by sqlite3 locking
-+    SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL);
-+  } else if (process_type == switches::kGpuProcess) {
-+    SetPledge("stdio rpath flock cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL);
-+  } else if (process_type == switches::kPpapiPluginProcess) {
-+    // prot_exec needed by v8
-+    SetPledge("stdio rpath prot_exec recvfd sendfd", NULL);
-+  } else if (process_type == switches::kUtilityProcess) {
-+    if (sandbox_type == sandbox::mojom::Sandbox::kAudio)
++  if (hook)
++    CHECK(std::move(hook).Run(options));
++
++  if (!command_line->HasSwitch(switches::kDisableUnveil))
++    SetUnveil(process_type, sandbox_type);
++
++  switch(sandbox_type) {
++    case sandbox::mojom::Sandbox::kNoSandbox:
++      SetPledge(NULL, "/etc/chromium/pledge.main");
++      break;
++    case sandbox::mojom::Sandbox::kRenderer:
++      // prot_exec needed by v8
++      // flock needed by sqlite3 locking
++      SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL);
++      break;
++    case sandbox::mojom::Sandbox::kGpu:
++      SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL);
++      break;
++#if BUILDFLAG(ENABLE_PPAPI)
++    case sandbox::mojom::Sandbox::kPpapi:
++      // prot_exec needed by v8
++      SetPledge("stdio rpath prot_exec recvfd sendfd", NULL);
++      break;
++#endif
++    case sandbox::mojom::Sandbox::kAudio:
 +      SetPledge(NULL, "/etc/chromium/pledge.utility_audio");
-+    else if (sandbox_type == sandbox::mojom::Sandbox::kNetwork)
++      break;
++    case sandbox::mojom::Sandbox::kNetwork:
 +      SetPledge(NULL, "/etc/chromium/pledge.utility_network");
-+    else if (sandbox_type == sandbox::mojom::Sandbox::kVideoCapture)
++      break;
++    case sandbox::mojom::Sandbox::kVideoCapture:
 +      SetPledge(NULL, "/etc/chromium/pledge.utility_video");
-+    else
++      break;
++    case sandbox::mojom::Sandbox::kUtility:
++    case sandbox::mojom::Sandbox::kService:
 +      SetPledge("stdio rpath cpath wpath fattr flock sendfd recvfd prot_exec", NULL);
-+  } else {
-+    LOG(ERROR) << "non-pledge()'d process: " << process_type;
-+    return false;
++      break;
++    default:
++      LOG(ERROR) << "non-pledge()'d process: " << GetSandboxTypeInEnglish(sandbox_type);
++      break;
 +  }
 +
 +  return true;
@@ -377,8 +396,10 @@
 +      return "Utility";
 +    case sandbox::mojom::Sandbox::kGpu:
 +      return "GPU";
++#if BUILDFLAG(ENABLE_PPAPI)
 +    case sandbox::mojom::Sandbox::kPpapi:
 +      return "PPAPI";
++#endif
 +    case sandbox::mojom::Sandbox::kNetwork:
 +      return "Network";
 +    case sandbox::mojom::Sandbox::kCdm:
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc
index 227228695db7..3adb46cdb0a8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/sandbox/policy/sandbox.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/sandbox/policy/sandbox.cc
 @@ -18,6 +18,10 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
 +#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
 +#endif  // BUILDFLAG(IS_BSD)
 +
  #if BUILDFLAG(IS_MAC)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h
index cd61caa4672c..4c335f283a21 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox.h
@@ -1,17 +1,19 @@
---- src/3rdparty/chromium/sandbox/policy/sandbox.h.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/sandbox/policy/sandbox.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/sandbox/policy/sandbox.h
-@@ -12,6 +12,10 @@
+@@ -12,6 +12,12 @@
  #include "sandbox/policy/linux/sandbox_linux.h"
  #endif
  
-+#if BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_OPENBSD)
 +#include "sandbox/policy/openbsd/sandbox_openbsd.h"
-+#endif  
++#elif BUILDFLAG(IS_FREEBSD)
++#include "sandbox/policy/freebsd/sandbox_freebsd.h"
++#endif
 +
  namespace sandbox {
  namespace mojom {
  enum class Sandbox;
-@@ -32,7 +36,7 @@ namespace policy {
+@@ -32,7 +38,7 @@ namespace policy {
  
  class SANDBOX_POLICY_EXPORT Sandbox {
   public:
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc
index 19c190830793..a9c05cd93b7d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_sandbox__type.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/sandbox/policy/sandbox_type.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/sandbox/policy/sandbox_type.cc
-@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
  #endif
      case Sandbox::kAudio:
        return false;
@@ -9,7 +9,7 @@
      case Sandbox::kVideoCapture:
        return false;
  #endif
-@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
      case Sandbox::kMirroring:
      case Sandbox::kNaClLoader:
  #endif
@@ -18,7 +18,7 @@
      case Sandbox::kHardwareVideoDecoding:
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
      case Sandbox::kLibassistant:
  #endif  // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
  #endif  // // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,7 +27,7 @@
      case Sandbox::kZygoteIntermediateSandbox:
      case Sandbox::kHardwareVideoEncoding:
  #endif
-@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
  #endif
      case Sandbox::kPrintCompositor:
      case Sandbox::kAudio:
@@ -36,9 +36,9 @@
      case Sandbox::kVideoCapture:
  #endif
  #if BUILDFLAG(IS_WIN)
-@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+     case Sandbox::kMediaFoundationCdm:
      case Sandbox::kWindowsSystemProxyResolver:
-     case Sandbox::kFileUtil:
  #endif  // BUILDFLAG(IS_WIN)
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
@@ -49,7 +49,7 @@
      case Sandbox::kHardwareVideoEncoding:
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
      case Sandbox::kNaClLoader:
        break;
  #endif  // BUILDFLAG(IS_MAC)
@@ -58,7 +58,7 @@
      case Sandbox::kZygoteIntermediateSandbox:
        break;
  #endif
-@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine(
+@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine(
    if (process_type == switches::kNaClBrokerProcess)
      return Sandbox::kNoSandbox;
  
@@ -67,7 +67,7 @@
    // Intermediate process gains a sandbox later.
    if (process_type == switches::kZygoteProcessType)
      return Sandbox::kZygoteIntermediateSandbox;
-@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
        return switches::kUtilitySandbox;
      case Sandbox::kAudio:
        return switches::kAudioSandbox;
@@ -76,7 +76,7 @@
      case Sandbox::kVideoCapture:
        return switches::kVideoCaptureSandbox;
  #endif
-@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
      case Sandbox::kMirroring:
        return switches::kMirroringSandbox;
  #endif
@@ -90,7 +90,7 @@
      case Sandbox::kHardwareVideoEncoding:
        return switches::kHardwareVideoEncodingSandbox;
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
  #if BUILDFLAG(IS_MAC)
      case Sandbox::kNaClLoader:
  #endif  // BUILDFLAG(IS_MAC)
@@ -99,7 +99,7 @@
      case Sandbox::kZygoteIntermediateSandbox:
  #endif
        NOTREACHED();
-@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
+@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
    if (sandbox_string == switches::kScreenAISandbox)
      return Sandbox::kScreenAI;
  #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc
index 0bd48e0c9d4e..90b08ff08439 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/sandbox/policy/switches.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/sandbox/policy/switches.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/sandbox/policy/switches.cc
-@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util";
+@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
  const char kMirroringSandbox[] = "mirroring";
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -13,7 +13,7 @@
  const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
  // Meant to be used as a browser-level switch for testing purposes only.
  const char kNoSandbox[] = "no-sandbox";
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h
index 7b40176617d3..592df44c1c2b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_sandbox_policy_switches.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/sandbox/policy/switches.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/sandbox/policy/switches.h.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/sandbox/policy/switches.h
-@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb
+@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
  SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
  #endif  // BUILDFLAG(IS_MAC)
  
@@ -13,7 +13,7 @@
  SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[];
  #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  
-@@ -82,7 +82,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -80,7 +80,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
  SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
  SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc
index faadfc71d1b0..b1f86a21a7c0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.cc
 @@ -143,6 +143,7 @@ void AddPulseAudioFilePermissions(
  }
  #endif
  
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
  std::vector<BrokerFilePermission> GetAudioFilePermissions() {
    std::vector<BrokerFilePermission> permissions{
        BrokerFilePermission::ReadOnly("/dev/urandom"),
@@ -17,7 +17,7 @@
  }  // namespace
  
  bool AudioPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
    LoadAudioLibraries();
    auto* instance = sandbox::policy::SandboxLinux::GetInstance();
    instance->StartBrokerProcess(MakeBrokerCommandSet({
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h
index 14582b531ce2..bbb595ea5940 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_audio_audio__sandbox__hook__linux.h
@@ -1,11 +1,13 @@
---- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/services/audio/audio_sandbox_hook_linux.h
-@@ -5,7 +5,11 @@
+@@ -5,7 +5,13 @@
  #ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
  #define SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
  
-+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "build/build_config.h"
++
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc
index 133b559de600..992107b54222 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_cert__verifier_cert__verifier__creation.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/services/cert_verifier/cert_verifier_creation.cc
-@@ -12,7 +12,7 @@
- #include "net/cert_net/cert_net_fetcher_url_request.h"
+@@ -13,7 +13,7 @@
+ #include "net/cert/multi_threaded_cert_verifier.h"
  #include "net/net_buildflags.h"
  
 -#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -9,16 +9,16 @@
  #include "net/cert/cert_verify_proc_builtin.h"
  #include "net/cert/internal/system_trust_store.h"
  #endif
-@@ -89,7 +89,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
+@@ -112,7 +112,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri
              user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot(
                                           user_slot_restriction_.get()))
                                     : nullptr));
 -#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX)
 +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-     verify_proc = net::CreateCertVerifyProcBuiltin(
-         std::move(cert_net_fetcher), net::CreateSslSystemTrustStore());
- #else
-@@ -226,6 +226,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+     return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
+                                             std::move(crl_set),
+                                             net::CreateSslSystemTrustStore());
+@@ -212,6 +212,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
  bool IsUsingCertNetFetcher() {
  #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ||      \
      BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ||       \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc
index 401ce80fbf17..34292de6c8f9 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_compute__pressure_cpu__probe.cc
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/services/device/compute_pressure/cpu_probe.cc
-@@ -29,6 +29,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
+@@ -44,6 +44,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create(
  #elif BUILDFLAG(IS_MAC)
-   return CpuProbeMac::Create();
+   return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback));
  #else
 +  NOTIMPLEMENTED();
    return nullptr;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
index c62c8e44c171..118fd20757cb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc
-@@ -162,7 +162,7 @@ LocationArbitrator::NewSystemLocationProvider() {
+@@ -190,7 +190,7 @@ LocationArbitrator::NewSystemLocationProvider() {
  
  std::unique_ptr<LocationProvider>
  LocationArbitrator::NewSystemLocationProvider() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn
index 5d27502e2a44..5ab6b092215f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_hid_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/device/hid/BUILD.gn.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/services/device/hid/BUILD.gn.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/services/device/hid/BUILD.gn
-@@ -35,7 +35,26 @@ source_set("hid") {
+@@ -34,7 +34,26 @@ source_set("hid") {
      "//services/device/public/mojom",
    ]
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h
new file mode 100644
index 000000000000..021f577d67fc
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_cpp_generic__sensor_sensor__reading.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/services/device/public/cpp/generic_sensor/sensor_reading.h
+@@ -8,6 +8,8 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <cstdint>
++
+ #include <type_traits>
+ 
+ namespace device {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn
index 0699fae497ce..88ef09f6821b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_public_mojom_BUILD.gn
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/services/device/public/mojom/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/services/device/public/mojom/BUILD.gn.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/services/device/public/mojom/BUILD.gn
-@@ -90,7 +90,7 @@ mojom("device_service") {
-   cpp_only = true
+@@ -97,7 +97,7 @@ mojom("device_service") {
+   enable_js_fuzzing = false
  
    enabled_features = []
 -  if ((is_linux || is_chromeos) && use_udev) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_BUILD.gn
new file mode 100644
index 000000000000..9496dbd69359
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/device/serial/BUILD.gn.orig	2022-11-30 08:12:58 UTC
++++ src/3rdparty/chromium/services/device/serial/BUILD.gn
+@@ -5,7 +5,7 @@
+ import("//build/config/chromeos/ui_mode.gni")
+ import("//build/config/features.gni")
+ 
+-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) {
++if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac) {
+   config("platform_support") {
+     visibility = [ ":serial" ]
+     if (is_win) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc
new file mode 100644
index 000000000000..4551edb6aefa
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__device__enumerator.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/services/device/serial/serial_device_enumerator.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/services/device/serial/serial_device_enumerator.cc
+@@ -12,7 +12,7 @@
+ #include "build/build_config.h"
+ #include "components/device_event_log/device_event_log.h"
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "services/device/serial/serial_device_enumerator_linux.h"
+ #elif BUILDFLAG(IS_MAC)
+ #include "services/device/serial/serial_device_enumerator_mac.h"
+@@ -25,7 +25,7 @@ namespace device {
+ // static
+ std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
+     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   return SerialDeviceEnumeratorLinux::Create();
+ #elif BUILDFLAG(IS_MAC)
+   return std::make_unique<SerialDeviceEnumeratorMac>();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc
new file mode 100644
index 000000000000..b3316232bea7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_serial_serial__io__handler__posix.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/services/device/serial/serial_io_handler_posix.cc
+@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
+     BITRATE_TO_SPEED_CASE(9600)
+     BITRATE_TO_SPEED_CASE(19200)
+     BITRATE_TO_SPEED_CASE(38400)
+-#if !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
+     BITRATE_TO_SPEED_CASE(57600)
+     BITRATE_TO_SPEED_CASE(115200)
+     BITRATE_TO_SPEED_CASE(230400)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc
index bb7e24c66c52..fce74f22c9bb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor__linux.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor_linux.cc
 @@ -131,7 +131,11 @@ class TimeZoneMonitorLinuxImpl
      // false positives are harmless, assuming the false positive rate is
      // reasonable.
      const char* const kFilesToWatch[] = {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +        "/etc/localtime",
 +#else
          "/etc/localtime", "/etc/timezone", "/etc/TZ",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn
index 4911a73de228..0f25748aedb0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_device_usb_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig	2022-10-29 13:32:26 UTC
+--- src/3rdparty/chromium/services/device/usb/BUILD.gn.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/services/device/usb/BUILD.gn
-@@ -103,15 +103,17 @@ static_library("usb") {
+@@ -89,15 +89,17 @@ static_library("usb") {
      deps += [ "//third_party/re2" ]
    }
  
@@ -27,7 +27,7 @@
  
      # These sources and deps are required for libusb.
      # TODO(https://crbug.com/1096743) Remove these sources.
-@@ -135,6 +137,13 @@ static_library("usb") {
+@@ -121,6 +123,13 @@ static_library("usb") {
      deps += [ "//third_party/libusb" ]
    }
  
@@ -41,7 +41,7 @@
    if (is_linux || is_chromeos) {
      sources += [
        "usb_device_linux.cc",
-@@ -152,7 +161,7 @@ static_library("usb") {
+@@ -138,7 +147,7 @@ static_library("usb") {
      deps += [ "//device/udev_linux" ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn
index 8b746237f99b..dd715b10d896 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/network/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/services/network/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/services/network/BUILD.gn
-@@ -339,7 +339,6 @@ if (is_linux || is_chromeos) {
+@@ -393,7 +393,6 @@ if (is_linux || is_chromeos) {
      ]
      deps = [
        "//base:base",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc
new file mode 100644
index 000000000000..5c50f6899215
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/services/network/network_context.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/services/network/network_context.cc
+@@ -447,7 +447,7 @@ NetworkContext::NetworkContextHttpAuthPreferences::
+ NetworkContext::NetworkContextHttpAuthPreferences::
+     ~NetworkContextHttpAuthPreferences() = default;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool NetworkContext::NetworkContextHttpAuthPreferences::AllowGssapiLibraryLoad()
+     const {
+   if (network_service_) {
+@@ -2322,7 +2322,7 @@ void NetworkContext::OnHttpAuthDynamicParamsChanged(
+       http_auth_dynamic_network_service_params->android_negotiate_account_type);
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   http_auth_merged_preferences_.set_allow_gssapi_library_load(
+       http_auth_dynamic_network_service_params->allow_gssapi_library_load);
+ #endif  // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h
new file mode 100644
index 000000000000..ef65756f7dca
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__context.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/network/network_context.h.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/services/network/network_context.h
+@@ -668,7 +668,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+    public:
+     explicit NetworkContextHttpAuthPreferences(NetworkService* network_service);
+     ~NetworkContextHttpAuthPreferences() override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     bool AllowGssapiLibraryLoad() const override;
+ #endif  // BUILDFLAG(IS_LINUX)
+    private:
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc
index ea09515f2353..a7e1ceef53df 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.cc
@@ -1,26 +1,37 @@
---- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig	2022-03-19 12:56:15 UTC
+--- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/services/network/network_sandbox_hook_linux.cc
-@@ -26,12 +26,15 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBr
-   });
- }
+@@ -14,11 +14,14 @@
+ #include "sandbox/policy/features.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
  
-+#if !defined(OS_BSD)
- std::vector<BrokerFilePermission> GetNetworkFilePermissions() {
-   // TODO(tsepez): remove universal permission under filesystem root.
-   return {BrokerFilePermission::ReadWriteCreateRecursive("/")};
- }
++#if !BUILDFLAG(IS_BSD)
+ using sandbox::syscall_broker::BrokerFilePermission;
+ using sandbox::syscall_broker::MakeBrokerCommandSet;
 +#endif
  
- bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+#if !defined(OS_BSD)
-   auto* instance = sandbox::policy::SandboxLinux::GetInstance();
+ namespace network {
  
-   instance->StartBrokerProcess(
-@@ -39,6 +42,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin
-       sandbox::policy::SandboxLinux::PreSandboxHook(), options);
++#if !BUILDFLAG(IS_BSD)
+ sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() {
+   return MakeBrokerCommandSet({
+       sandbox::syscall_broker::COMMAND_ACCESS,
+@@ -102,9 +105,11 @@ void LoadNetworkLibraries() {
+   }
+ }
+ #endif  // BUILDFLAG(IS_CHROMEOS)
++#endif
  
-   instance->EngageNamespaceSandboxIfPossible();
+ bool NetworkPreSandboxHook(std::vector<std::string> network_context_parent_dirs,
+                            sandbox::policy::SandboxLinux::Options options) {
++#if !BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS)
+   LoadNetworkLibraries();
+ #endif
+@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne
+       GetNetworkBrokerCommandSet(),
+       GetNetworkFilePermissions(std::move(network_context_parent_dirs)),
+       sandbox::policy::SandboxLinux::PreSandboxHook(), options);
 +#endif
+ 
    return true;
  }
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h
index ebc2e1117b38..b7f9e169b92b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__sandbox__hook__linux.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/services/network/network_sandbox_hook_linux.h
-@@ -10,7 +10,11 @@
+@@ -6,7 +6,11 @@
+ #define SERVICES_NETWORK_NETWORK_SANDBOX_HOOK_LINUX_H_
+ 
  #include "base/component_export.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
-+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#include "sandbox/policy/sandbox.h"
 +#else
  #include "sandbox/policy/linux/sandbox_linux.h"
 +#endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc
index 41b2a15c06f6..0387004ccf70 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/network/network_service.cc.orig	2023-10-03 19:49:54 UTC
+--- src/3rdparty/chromium/services/network/network_service.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/services/network/network_service.cc
-@@ -92,7 +92,7 @@
+@@ -96,7 +96,7 @@
  #include "third_party/boringssl/src/include/openssl/cpu.h"
  #endif
  
@@ -8,4 +8,22 @@
 +#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \
      BUILDFLAG(IS_CHROMEOS_LACROS)
  
- #include "components/os_crypt/key_storage_config_linux.h"
+ #include "components/os_crypt/sync/key_storage_config_linux.h"
+@@ -1003,7 +1003,7 @@ void NetworkService::SetExplicitlyAllowedPorts(
+   net::SetExplicitlyAllowedPorts(ports);
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void NetworkService::SetGssapiLibraryLoadObserver(
+     mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
+         gssapi_library_load_observer) {
+@@ -1085,7 +1085,7 @@ NetworkService::CreateHttpAuthHandlerFactory(NetworkCo
+   );
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void NetworkService::OnBeforeGssapiLibraryLoad() {
+   if (gssapi_library_load_observer_.is_bound()) {
+     gssapi_library_load_observer_->OnBeforeGssapiLibraryLoad();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h
new file mode 100644
index 000000000000..49004dda8f15
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_network__service.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/services/network/network_service.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/services/network/network_service.h
+@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+       mojo::PendingReceiver<mojom::NetworkServiceTest> receiver) override;
+   void SetFirstPartySets(net::GlobalFirstPartySets sets) override;
+   void SetExplicitlyAllowedPorts(const std::vector<uint16_t>& ports) override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void SetGssapiLibraryLoadObserver(
+       mojo::PendingRemote<mojom::GssapiLibraryLoadObserver>
+           gssapi_library_load_observer) override;
+@@ -266,7 +266,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+   std::unique_ptr<net::HttpAuthHandlerFactory> CreateHttpAuthHandlerFactory(
+       NetworkContext* network_context);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // This is called just before a GSSAPI library may be loaded.
+   void OnBeforeGssapiLibraryLoad();
+ #endif  // BUILDFLAG(IS_LINUX)
+@@ -507,7 +507,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
+   // leaking stale listeners between tests.
+   std::unique_ptr<net::NetworkChangeNotifier> mock_network_change_notifier_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   mojo::Remote<mojom::GssapiLibraryLoadObserver> gssapi_library_load_observer_;
+ #endif  // BUILDFLAG(IS_LINUX)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn
new file mode 100644
index 000000000000..98fa9af485a3
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_BUILD.gn
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/network/public/cpp/BUILD.gn.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/services/network/public/cpp/BUILD.gn
+@@ -481,7 +481,7 @@ jumbo_component("cpp_base") {
+     sources += [ "transferable_directory_fuchsia.cc" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     sources += [
+       "network_interface_change_listener_mojom_traits.cc",
+       "network_interface_change_listener_mojom_traits.h",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc
new file mode 100644
index 000000000000..d2cc30bdf15a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_cpp_features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/network/public/cpp/features.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/services/network/public/cpp/features.cc
+@@ -383,7 +383,7 @@ CONSTINIT const base::Feature kOutOfProcessSystemDnsRe
+ // that can be adequately sandboxed.
+ CONSTINIT const base::Feature kOutOfProcessSystemDnsResolution(
+              "OutOfProcessSystemDnsResolution",
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn
new file mode 100644
index 000000000000..05b8728422f8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_public_mojom_BUILD.gn
@@ -0,0 +1,25 @@
+--- src/3rdparty/chromium/services/network/public/mojom/BUILD.gn.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/services/network/public/mojom/BUILD.gn
+@@ -515,11 +515,11 @@ mojom("url_loader_base") {
+   }
+ 
+   enabled_features = []
+-  if (is_android || is_chromeos || is_linux) {
++  if (!is_bsd && (is_android || is_chromeos || is_linux)) {
+     enabled_features += [ "network_change_notifier_in_browser" ]
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+     # not include lacros.
+     enabled_features += [ "use_network_interface_change_listener" ]
+@@ -1435,7 +1435,7 @@ mojom("mojom") {
+     }
+   }
+ 
+-  if (is_linux) {
++  if (is_linux && !is_bsd) {
+     # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+     # not include lacros.
+     enabled_features += [ "use_network_interface_change_listener" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
new file mode 100644
index 000000000000..be502691c819
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
+@@ -9,6 +9,8 @@
+ #include <string>
+ #include <vector>
+ 
++#include <vector>
++
+ #include "base/component_export.h"
+ #include "base/functional/callback.h"
+ #include "crypto/secure_hash.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index 3b7b3cff2c06..13f892b50c1b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
-@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
+@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
                                       uint32_t shared_resident_kb) {
    DCHECK(os_dump.platform_private_footprint);
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -9,7 +9,7 @@
    uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
    uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
    return (rss_anon_bytes + vm_swap_bytes) / 1024;
-@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
+@@ -81,7 +81,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
    os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
    os_dump->private_footprint_kb =
        CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
@@ -18,7 +18,7 @@
    os_dump->private_footprint_swap_kb =
        internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
  #endif
-@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -217,7 +217,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // On most platforms each process can dump data about their own process
  // so ask each process to do so Linux is special see below.
@@ -27,7 +27,7 @@
      request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
      client->RequestOSMemoryDump(request->memory_map_option(),
                                  {base::kNullProcessId},
-@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -232,7 +232,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
  
  // In some cases, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -36,7 +36,7 @@
    std::vector<base::ProcessId> pids;
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -278,7 +278,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
      const OsCallback& os_callback) {
  // On Linux, OS stats can only be dumped from a privileged process to
  // get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -45,7 +45,7 @@
    mojom::ClientProcess* browser_client = nullptr;
    base::ProcessId browser_client_pid = 0;
    for (const auto& client_info : clients) {
-@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -328,7 +328,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
      // each client process provides 1 OS dump, % the case where the client is
      // disconnected mid dump.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -54,7 +54,7 @@
      for (auto& kv : extra_os_dumps) {
        auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
        DCHECK(results.find(pid) == results.end());
-@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
+@@ -389,7 +389,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* 
      // crash). In the latter case (OS_LINUX) we expect the full map to come
      // from the browser process response.
      OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
index 7a5ee75672b2..04cda496465e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -33,8 +33,12 @@ component("memory_instrumentation") {
+@@ -29,8 +29,12 @@ component("memory_instrumentation") {
      sources += [ "os_metrics_win.cc" ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
index 98424621078e..da4d13bb211d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc
 @@ -39,7 +39,7 @@
  #include "third_party/perfetto/protos/perfetto/trace/track_event/process_descriptor.pbzero.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc
new file mode 100644
index 000000000000..75a613c10a31
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.cc
@@ -0,0 +1,38 @@
+--- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/services/video_capture/video_capture_service_impl.cc
+@@ -40,7 +40,7 @@
+ #include "services/video_capture/lacros/device_factory_adapter_lacros.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "media/capture/video/video_capture_gpu_channel_host.h"
+ #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
+@@ -107,7 +107,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext 
+       this};
+ };
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Intended usage of this class is to create viz::Gpu in utility process and
+ // connect to viz::GpuClient of browser process, which will call to Gpu service.
+ // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
+@@ -288,7 +288,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
+   if (!gpu_dependencies_context_)
+     gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+     if (!viz_gpu_context_provider_) {
+       viz_gpu_context_provider_ =
+@@ -384,7 +384,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
+ }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
+   viz_gpu_ = std::move(viz_gpu);
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h
new file mode 100644
index 000000000000..acb5813fd8f4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_services_video__capture_video__capture__service__impl.h
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/services/video_capture/video_capture_service_impl.h
+@@ -24,7 +24,7 @@
+ #include "services/video_capture/ash/video_capture_device_factory_ash.h"
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+ 
+@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ #if BUILDFLAG(IS_WIN)
+   void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
+ #endif
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
+  private:
+@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+       factory_receivers_ash_;
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   class VizGpuContextProvider;
+   std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
+   std::unique_ptr<viz::Gpu> viz_gpu_;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp
index 55bfcd8fe428..151e9652875e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp
-@@ -79,7 +79,7 @@ static void* malloc_nothrow(size_t size) {
+@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) {
    // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
    // doesn't work as intended everywhere.
    void* result;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc
new file mode 100644
index 000000000000..cb22466885c4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_skia_ext_skcolorspace__trfn.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc.orig	2023-08-17 07:33:31 UTC
++++ src/3rdparty/chromium/skia/ext/skcolorspace_trfn.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cmath>
++
+ #include "skia/ext/skcolorspace_trfn.h"
+ 
+ #include <cmath>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h
index d0ca2bd9ca3f..f34a7506e942 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_config.h
@@ -1,21 +1,21 @@
---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/config.h
-@@ -460,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
- // POSIX.1-2001.
+@@ -450,7 +450,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  #ifdef ABSL_HAVE_SCHED_YIELD
  #error ABSL_HAVE_SCHED_YIELD cannot be directly set
--#elif defined(__linux__) || defined(__ros__) || defined(__native_client__)
-+#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
-+    defined(__OpenBSD__) || defined(__FreeBSD__)
+ #elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \
+-    defined(__VXWORKS__)
++    defined(__VXWORKS__) || defined(__OpenBSD__) || defined(__FreeBSD__)
  #define ABSL_HAVE_SCHED_YIELD 1
  #endif
  
-@@ -475,7 +476,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -465,7 +465,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
  // platforms.
  #ifdef ABSL_HAVE_SEMAPHORE_H
  #error ABSL_HAVE_SEMAPHORE_H cannot be directly set
--#elif defined(__linux__) || defined(__ros__)
-+#elif defined(__linux__) || defined(__ros__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+-#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__)
++#elif defined(__linux__) || defined(__ros__) || defined(__VXWORKS__) || \
++    defined(__OpenBSD__) || defined(__FreeBSD__)
  #define ABSL_HAVE_SEMAPHORE_H 1
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc
index ade86489b072..a00606557592 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_raw__logging.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/raw_logging.cc
-@@ -52,10 +52,12 @@
+@@ -56,10 +56,12 @@
  // ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall
  //   syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len);
  // for low level operations that want to avoid libc.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc
index 8b5c784ee738..b8e4d18eabb0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_base_internal_sysinfo.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
-@@ -30,7 +30,7 @@
+@@ -30,10 +30,14 @@
  #include <sys/syscall.h>
  #endif
  
@@ -9,7 +9,30 @@
  #include <sys/sysctl.h>
  #endif
  
-@@ -310,9 +310,11 @@ static double GetNominalCPUFrequency() {
++#if defined(__FreeBSD__)
++#include <pthread_np.h>
++#endif
++
+ #if defined(__myriad2__)
+ #include <rtems.h>
+ #endif
+@@ -186,6 +190,7 @@ static double GetNominalCPUFrequency() {
+ 
+ #else
+ 
++#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ // Helper function for reading a long from a file. Returns true if successful
+ // and the memory location pointed to by value is set to the value read.
+ static bool ReadLongFromFile(const char *file, long *value) {
+@@ -218,6 +223,7 @@ static bool ReadLongFromFile(const char *file, long *v
+   }
+   return ret;
+ }
++#endif
+ 
+ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
+ 
+@@ -317,9 +323,11 @@ static double GetNominalCPUFrequency() {
    // a new mode (turbo mode). Essentially, those frequencies cannot
    // always be relied upon. The same reasons apply to /proc/cpuinfo as
    // well.
@@ -21,3 +44,35 @@
  
  #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY)
    // On these platforms, the TSC frequency is the nominal CPU
+@@ -338,10 +346,12 @@ static double GetNominalCPUFrequency() {
+   // If CPU scaling is in effect, we want to use the *maximum*
+   // frequency, not whatever CPU speed some random processor happens
+   // to be using now.
++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) // pledge violation
+   if (ReadLongFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq",
+                        &freq)) {
+     return freq * 1e3;  // Value is kHz.
+   }
++#endif
+ 
+   return 1.0;
+ #endif  // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
+@@ -439,6 +449,18 @@ pid_t GetTID() {
+   static_assert(sizeof(pid_t) == sizeof(thread),
+                 "In NaCL int expected to be the same size as a pointer");
+   return reinterpret_cast<pid_t>(thread);
++}
++
++#elif defined(__OpenBSD__)
++
++pid_t GetTID() {
++  return getthrid();
++}
++
++#elif defined(__FreeBSD__)
++
++pid_t GetTID() {
++  return pthread_getthreadid_np();
+ }
+ 
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
index 44235736ba9a..d375d14c6dbe 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2022-08-31 12:19:35 UTC
+--- src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h
-@@ -33,7 +33,7 @@
- 
+@@ -34,7 +34,7 @@
  #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
      !defined(__native_client__) && !defined(__asmjs__) &&             \
--    !defined(__wasm__) && !defined(__HAIKU__)
-+    !defined(__wasm__) && !defined(__HAIKU__) && !defined(__FreeBSD__)
+     !defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) &&   \
+-    !defined(__VXWORKS__) && !defined(__hexagon__)
++    !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__FreeBSD__)
  #define ABSL_HAVE_ELF_MEM_IMAGE 1
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
deleted file mode 100644
index 4db0493638ae..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig	2022-09-24 10:57:32 UTC
-+++ src/3rdparty/chromium/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
-@@ -19,7 +19,7 @@
- #endif
- 
- #if defined(HAS_STRPTIME) && HAS_STRPTIME
--#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #define _XOPEN_SOURCE  // Definedness suffices for strptime.
- #endif
- #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
index a611e87d0332..8829526ae674 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/angle/BUILD.gn
-@@ -280,7 +280,6 @@ config("extra_warnings") {
+@@ -325,7 +325,6 @@ config("extra_warnings") {
        "-Wtautological-type-limit-compare",
        "-Wundefined-reinterpret-cast",
        "-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
        "-Wsuggest-destructor-override",
        "-Wsuggest-override",
  
-@@ -451,7 +450,7 @@ template("angle_common_lib") {
+@@ -496,7 +495,7 @@ template("angle_common_lib") {
        all_dependent_configs = [ ":angle_disable_pool_alloc" ]
      }
  
@@ -17,7 +17,7 @@
        libs = [ "dl" ]
      }
  
-@@ -606,6 +605,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -651,6 +650,9 @@ angle_static_library("angle_gpu_info_util") {
          "Xi",
          "Xext",
        ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform__helpers.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform__helpers.h
new file mode 100644
index 000000000000..ba4eb7f74eee
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_platform__helpers.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/angle/src/common/platform_helpers.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/angle/src/common/platform_helpers.h
+@@ -62,7 +62,7 @@ inline constexpr bool IsIOS()
+ 
+ inline constexpr bool IsLinux()
+ {
+-#if defined(ANGLE_PLATFORM_LINUX)
++#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
+     return true;
+ #else
+     return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn
deleted file mode 100644
index 19c3b7997a88..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_common_vulkan_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/angle/src/common/vulkan/BUILD.gn.orig	2023-03-28 19:45:02 UTC
-+++ src/3rdparty/chromium/third_party/angle/src/common/vulkan/BUILD.gn
-@@ -33,7 +33,7 @@ if (angle_enable_vulkan || angle_build_vulkan_system_i
-     if (angle_shared_libvulkan) {
-       defines = [ "ANGLE_SHARED_LIBVULKAN=1" ]
-     }
--    if (angle_use_wayland) {
-+    if (angle_use_wayland && !use_system_libwayland) {
-       include_dirs = [ "$wayland_dir/src" ]
-     }
-     configs = [ "$angle_root:angle_vulkan_wayland_config" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index 74ed5951c3cb..721f6c16dbde 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2022-02-23 19:25:59 UTC
+--- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_internal.h
-@@ -14,6 +14,13 @@
+@@ -15,6 +15,13 @@
  namespace angle
  {
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
index 67f708c8ae60..8d52ddf1e027 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp
@@ -1,16 +1,16 @@
---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp
-@@ -55,7 +55,7 @@
- #        include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
- #    elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS)
- #        include "libANGLE/renderer/gl/apple/DisplayApple_api.h"
+@@ -60,7 +60,7 @@
+ #        include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
+ #    elif ANGLE_ENABLE_EAGL
+ #        include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
 -#    elif defined(ANGLE_PLATFORM_LINUX)
 +#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
  #        include "libANGLE/renderer/gl/egl/DisplayEGL.h"
  #        if defined(ANGLE_USE_X11)
  #            include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
-             impl = rx::CreateDisplayCGLOrEAGL(state);
+@@ -411,7 +411,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+             impl = new rx::DisplayEAGL(state);
              break;
  
 -#    elif defined(ANGLE_PLATFORM_LINUX)
@@ -18,16 +18,16 @@
  #        if defined(ANGLE_USE_GBM)
              if (platformType == 0)
              {
-@@ -387,7 +387,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -457,7 +457,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
  #if defined(ANGLE_ENABLE_OPENGL)
  #    if defined(ANGLE_PLATFORM_WINDOWS)
              impl = new rx::DisplayWGL(state);
 -#    elif defined(ANGLE_PLATFORM_LINUX)
 +#    elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
  #        if defined(ANGLE_USE_GBM)
-             if (platformType == 0 ||
-                 platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -436,7 +436,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+             if (platformType == 0)
+             {
+@@ -508,7 +508,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
                  impl = rx::CreateVulkanWin32Display(state);
              }
              break;
@@ -36,7 +36,7 @@
  #        if defined(ANGLE_USE_GBM)
              if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
              {
-@@ -2046,7 +2046,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2148,7 +2148,7 @@ static ClientExtensions GenerateClientExtensions()
      extensions.x11Visual = true;
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp
index d4a68f0b4eed..e59e83967111 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_formatutils.cpp
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig	2023-04-20 13:16:39 UTC
+--- src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1486,7 +1486,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1475,7 +1475,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
      AddYUVFormat(&map,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,            true,   8,   8,  8,   0,  0,  GL_G8_B8R8_2PLANE_420_UNORM_ANGLE,    GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
      AddYUVFormat(&map,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,           true,   8,   8,  8,   0,  0,  GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE,   GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          RequireExt<&Extensions::yuvInternalFormatANGLE>,          NeverSupported, NeverSupported);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h
deleted file mode 100644
index c83f0e5a4fb5..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_driver__utils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h.orig	2023-03-09 06:31:50 UTC
-+++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.h
-@@ -206,7 +206,7 @@ inline bool IsWindows()
- 
- inline bool IsLinux()
- {
--#if defined(ANGLE_PLATFORM_LINUX)
-+#if defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
-     return true;
- #else
-     return false;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn
deleted file mode 100644
index 8882c027c537..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_third__party_volk_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/angle/src/third_party/volk/BUILD.gn.orig	2023-03-28 19:45:02 UTC
-+++ src/3rdparty/chromium/third_party/angle/src/third_party/volk/BUILD.gn
-@@ -20,7 +20,7 @@ source_set("volk") {
-   public_configs = [ ":volk_config" ]
-   configs += [ "$angle_root:angle_no_cfi_icall" ]
-   public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
--  if (angle_use_wayland) {
-+  if (angle_use_wayland && !use_system_libwayland) {
-     include_dirs = [ "$wayland_dir/src" ]
-   }
- }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn
index bdcc8380c778..89e05cbb806f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_angle_util_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/third_party/angle/util/BUILD.gn.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/angle/util/BUILD.gn
-@@ -292,7 +292,7 @@ foreach(is_shared_library,
+@@ -311,7 +311,7 @@ foreach(is_shared_library,
      ]
      libs = []
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc
deleted file mode 100644
index 2498eff5ae1c..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_privacy__budget_active__sampling.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc.orig	2022-08-31 12:19:35 UTC
-+++ src/3rdparty/chromium/third_party/blink/common/privacy_budget/active_sampling.cc
-@@ -24,7 +24,7 @@ namespace blink {
- bool IdentifiabilityActiveSampler::IsFontFamilyAvailable(const char* family,
-                                                          SkFontMgr* fm) {
-   base::ScopedAllowBaseSyncPrimitives allow;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return !!fm->legacyMakeTypeface(family, SkFontStyle());
- #else
-   sk_sp<SkFontStyleSet> set(fm->matchFamily(family));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
index 633d3d8166d0..9e33b07c62d0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_common_renderer__preferences_renderer__preferences__mojom__traits.cc
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/common/renderer_preferences/renderer_preferences_mojom_traits.cc
-@@ -64,7 +64,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
-   if (!data.ReadAcceptLanguages(&out->accept_languages))
-     return false;
+@@ -66,7 +66,7 @@ bool StructTraits<blink::mojom::RendererPreferencesDat
+ 
+   out->send_subresource_notification = data.send_subresource_notification();
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h
index db513ac3f494..32cad4b736ee 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences.h
@@ -1,9 +1,9 @@
---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences.h
-@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
-   bool webrtc_allow_legacy_tls_protocols{false};
+@@ -64,7 +64,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
    UserAgentOverride user_agent_override;
    std::string accept_languages;
+   bool send_subresource_notification{false};
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    std::string system_font_family_name;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
index e4805d43e10b..67169fd8511f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h
-@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT
-     return data.accept_languages;
+@@ -162,7 +162,7 @@ struct BLINK_COMMON_EXPORT
+     return data.send_subresource_notification;
    }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h
index 3b10091dc9cc..23a41de0d93b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_public_platform_platform.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/public/platform/platform.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/public/platform/platform.h
-@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -338,7 +338,7 @@ class BLINK_PLATFORM_EXPORT Platform {
      return nullptr;
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc
index 6bca1da72ea0..ac6d110766df 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/controller/blink_initializer.cc
-@@ -74,12 +74,12 @@
+@@ -78,12 +78,12 @@
  #include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
  #endif
  
@@ -10,12 +10,12 @@
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+-    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
  #include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
  #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
  #endif
-@@ -222,7 +222,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
        main_thread_task_runner);
  #endif
  
@@ -24,12 +24,12 @@
    binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
        ConvertToBaseRepeatingCallback(
            CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterMemoryWatchers() {
+@@ -266,7 +266,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
  #endif
  
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
--    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+    BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
-   UserLevelMemoryPressureSignalGenerator::Initialize(main_thread_task_runner);
- 
+-    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++    BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   // Start reporting the highest private memory footprint after the first
+   // navigation.
+   HighestPmfReporter::Initialize(main_thread_task_runner);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
index 5feca7d63c91..4fcc364618f1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
-@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() {
+@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() {
  
  void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file,
                                             base::File status_file) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc
index 3504310a3820..9687f1a1ba46 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -408,7 +408,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
+@@ -421,7 +421,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
      const blink::RendererPreferences& prefs) {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
@@ -9,7 +9,7 @@
    if (!prefs.should_antialias_text) {
      // When anti-aliasing is off, GTK maps all non-zero hinting settings to
      // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3344,7 +3344,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3323,7 +3323,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
        renderer_preferences_.use_subpixel_positioning);
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc
index fb2c5dc7e1f3..7f9ab08a9e53 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6439,7 +6439,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6456,7 +6456,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
  }
  
  #if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
  // TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
  // TODO(crbug.com/1317375): Build these tests on all platforms.
  #define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6847,7 +6847,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+@@ -6865,7 +6865,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
  TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
    RunTest("composited_selection_bounds_large_selection_noscroll.html");
  }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
index 911e3e5bdf4d..f11b44ff51f0 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2022-05-19 14:06:27 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
-@@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
+@@ -48,7 +48,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin
  
  /* The value is based on user statistics on Nov 2017. */
  #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index 400c6dcc4bf6..304806dd92eb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
+@@ -189,7 +189,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t 
  
  Vector<String> InspectorMemoryAgent::Symbolize(
      const WebVector<void*>& addresses) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc
index bc56f72530fd..f850372415f1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_layout__view.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_layout_ng_layout__ng__view.cc
@@ -1,17 +1,17 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/layout_view.cc
-@@ -67,7 +67,7 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/core/layout/ng/layout_ng_view.cc
+@@ -15,7 +15,7 @@
+ #include "third_party/blink/renderer/core/svg/svg_document_extensions.h"
  #include "ui/display/screen_info.h"
- #include "ui/gfx/geometry/quad_f.h"
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() {
-   DCHECK(!layout_state_);
-   LayoutState root_layout_state(*this);
+@@ -53,7 +53,7 @@ void LayoutNGView::UpdateLayout() {
+     fragmentation_context_.Clear();
+   }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc
index c621e73fe9ec..fba7e07799ee 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_paint_paint__layer.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -114,7 +114,7 @@ namespace blink {
+@@ -118,7 +118,7 @@ namespace blink {
  
  namespace {
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index 9b232d22a2f2..66cc9a32e6e7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2022-10-24 13:33:33 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
 @@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const 
  // is true for at least GTK and QT apps).
@@ -9,7 +9,7 @@
    return false;
  #else
    return true;
-@@ -329,7 +329,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
+@@ -355,7 +355,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
                                               const WebMouseEvent& event) {
  // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
  // complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc
new file mode 100644
index 000000000000..faf4d28f3312
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_canvas_canvas2d_canvas__style.cc
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
+@@ -76,6 +76,9 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+ 
+ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
+                                float global_alpha) const {
++#if defined(__clang__) && (__clang_major__ < 16)
++  SkColor4f custom_color = SkColor4f{0.0f, 0.0f, 0.0f, global_alpha};
++#endif
+   switch (type_) {
+     case kColor:
+       ApplyColorToFlags(flags, global_alpha);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index 96842118dc7d..0a7db99120cf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,9 +1,9 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
-@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
+@@ -724,7 +724,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
              mixer->get_output_params_for_testing().sample_rate());
  
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
 -    BUILDFLAG(IS_FUCHSIA)
 +    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
    // Use 10 ms buffer (441 frames per buffer).
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni
index f80bb2c5bc70..3486073555fc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_features.gni
@@ -1,9 +1,11 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/features.gni
-@@ -7,5 +7,5 @@ declare_args() {
+@@ -7,7 +7,7 @@ declare_args() {
    # This enables building WebNN with XNNPACK. Currently only available for
-   # Windows on x64 or x86.
+   # Windows and Linux on x64 or x86.
    build_webnn_with_xnnpack =
--      is_win && (current_cpu == "x64" || current_cpu == "x86")
+-      (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86")
 +      !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86"))
- }
+ 
+   # This build flag enables WebNN on ChromeOS platform to access hardware
+   # acceleration by using ModelLoader mojo interface.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
index 1bad3278c937..b232a528b725 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
-@@ -177,7 +177,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
+@@ -191,7 +191,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
  
    ~SharedXnnpackContext() {
      base::AutoLock auto_lock(SharedXnnpackContextLock());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
index f786e2c56e04..07b7f12fde5d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
+@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
    SetupRenderer(kDefaultOutputDeviceId);
    renderer_proxy_->Start();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index 0bb8db1053a4..668add41a422 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6231,7 +6231,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6321,7 +6321,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
    constexpr bool kAllowZeroCopyImages = true;
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
deleted file mode 100644
index 1f3d5b2d4492..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc
-@@ -102,7 +102,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin
- // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
- // complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
--    BUILDFLAG(IS_FUCHSIA)
-+    BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-   // TODO(jie.a.chen@intel.com): Add Linux support.
-   return false;
- #elif BUILDFLAG(IS_APPLE)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 4a16beaf548c..2d061233f1b7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -707,7 +707,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
- // platform requires interop supported. According to the bug, this change will
- // be a long time task. So disable using webgpu mailbox texture uploading path
+@@ -746,7 +746,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
  // on linux platform.
+ // TODO(crbug.com/1424119): using a webgpu mailbox texture on the OpenGLES
+ // backend is failing for unknown reasons.
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   use_webgpu_mailbox_texture = false;
-   unaccelerated_image = image->MakeUnaccelerated();
-   image = unaccelerated_image.get();
+   bool forceReadback = true;
+ #elif BUILDFLAG(IS_WIN)
+   bool forceReadback =
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn
index 9e67a519c9bb..ca33eca74907 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/BUILD.gn
-@@ -1976,7 +1976,7 @@ jumbo_static_library("test_support") {
+@@ -1975,7 +1975,7 @@ jumbo_static_library("test_support") {
    ]
  
    # fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
index 62b9add21a53..0ebf2995f22c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc
 @@ -72,7 +72,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo
  
@@ -9,7 +9,7 @@
  float FontCache::device_scale_factor_ = 1.0;
  #endif
  
-@@ -119,7 +119,7 @@ FontPlatformData* FontCache::SystemFontPlatformData(
+@@ -118,7 +118,7 @@ FontPlatformData* FontCache::SystemFontPlatformData(
      const FontDescription& font_description) {
    const AtomicString& family = FontCache::SystemFontFamily();
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
index 14048654d8b4..b3e27e71c678 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -57,7 +57,7 @@
+@@ -56,7 +56,7 @@
  #include "third_party/skia/include/core/SkFontMgr.h"
  #include "third_party/skia/include/core/SkRefCnt.h"
  
@@ -9,7 +9,7 @@
  #include "ui/gfx/font_fallback_linux.h"
  #endif
  
-@@ -180,7 +180,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -174,7 +174,7 @@ class PLATFORM_EXPORT FontCache final {
    static void PrewarmFamily(const AtomicString& family_name) {}
  #endif
  
@@ -18,7 +18,7 @@
    // These are needed for calling QueryRenderStyleForStrike, since
    // gfx::GetFontRenderParams makes distinctions based on DSF.
    static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -264,7 +264,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -250,7 +250,7 @@ class PLATFORM_EXPORT FontCache final {
        const char* locale_family_name);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -27,7 +27,7 @@
    static bool GetFontForCharacter(UChar32,
                                    const char* preferred_locale,
                                    gfx::FallbackFontData*);
-@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache final {
                                     const FontFaceCreationParams&,
                                     std::string& name);
  
@@ -36,8 +36,8 @@
    static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
                                                  UChar32,
                                                  const FontDescription&,
-@@ -387,7 +387,7 @@ class PLATFORM_EXPORT FontCache final {
-   std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_;
+@@ -368,7 +368,7 @@ class PLATFORM_EXPORT FontCache final {
+   bool is_test_font_mgr_ = false;
  #endif  // BUILDFLAG(IS_WIN)
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc
index 6e59b05a818a..21a42c1fcb59 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__description.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_description.cc
 @@ -39,7 +39,7 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_hash.h"
@@ -9,7 +9,7 @@
  #include "third_party/blink/renderer/platform/fonts/font_cache.h"
  #endif
  
-@@ -275,7 +275,7 @@ FontCacheKey FontDescription::CacheKey(
+@@ -274,7 +274,7 @@ FontCacheKey FontDescription::CacheKey(
        static_cast<unsigned>(fields_.orientation_) << 1 |          // bit 2-3
        static_cast<unsigned>(fields_.subpixel_text_position_);     // bit 1
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h
new file mode 100644
index 000000000000..74578b876a36
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__palette.h
@@ -0,0 +1,28 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_palette.h.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_palette.h
+@@ -96,7 +96,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted<
+       Color::ColorSpace color_interpolation_space,
+       absl::optional<Color::HueInterpolationMethod> hue_interpolation_method) {
+     return base::AdoptRef(new FontPalette(
+-        start, end, NonNormalizedPercentages{start_percentage, end_percentage},
++#if defined(__clang__) && (__clang_major__ >= 16)
++        start, end, NonNormalizedPercentages(start_percentage, end_percentage),
++#else
++        start, end, NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage}),
++#endif
+         normalized_percentage, alpha_multiplier, color_interpolation_space,
+         hue_interpolation_method));
+   }
+@@ -170,7 +174,11 @@ class PLATFORM_EXPORT FontPalette : public RefCounted<
+       double normalized_percentage) {
+     double end_percentage = normalized_percentage * 100.0;
+     double start_percentage = 100.0 - end_percentage;
+-    return NonNormalizedPercentages{start_percentage, end_percentage};
++#if defined(__clang__) && (__clang_major__ >= 16)
++    return NonNormalizedPercentages(start_percentage, end_percentage);
++#else
++    return NonNormalizedPercentages(NonNormalizedPercentages{start_percentage, end_percentage});
++#endif
+   }
+ 
+   double GetAlphaMultiplier() const {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc
index 65b7bf46d0b1..f4fe74bacd65 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__platform__data.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_platform_data.cc
 @@ -51,7 +51,7 @@ namespace {
  namespace blink {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc
new file mode 100644
index 000000000000..65e93bb77bc0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_palette__interpolation.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/palette_interpolation.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/palette_interpolation.cc
+@@ -31,7 +31,12 @@ Vector<FontPalette::FontPaletteOverride> PaletteInterp
+         color_interpolation_space, hue_interpolation_method, start_color,
+         end_color, percentage, alpha_multiplier);
+ 
+-    FontPalette::FontPaletteOverride result_color_record{(int)i, result_color};
++#if defined(__clang__) && (__clang_major__ >= 16)
++    FontPalette::FontPaletteOverride result_color_record(i, result_color);
++#else
++    FontPalette::FontPaletteOverride fpo = { static_cast<int>(i), result_color };
++    FontPalette::FontPaletteOverride result_color_record(fpo);
++#endif
+     result_color_records.push_back(result_color_record);
+   }
+   return result_color_records;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index 041279edd07b..4041c0ad526e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
-@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) {
+@@ -64,7 +64,7 @@ AtomicString ToAtomicString(const SkString& str) {
    return AtomicString::FromUTF8(str.c_str(), str.size());
  }
  
@@ -9,16 +9,7 @@
  // This function is called on android or when we are emulating android fonts on
  // linux and the embedder has overriden the default fontManager with
  // WebFontRendering::setSkiaFontMgr.
-@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
-   }
- #endif
- 
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
-   // On linux if the fontManager has been overridden then we should be calling
-   // the embedder provided font Manager rather than calling
-   // SkTypeface::CreateFromName which may redirect the call to the default font
-@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
+@@ -246,7 +246,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
    std::string name;
  
    sk_sp<SkTypeface> typeface;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index 495ee9e234ce..b05f28ed8769 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -77,8 +77,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
+@@ -71,8 +71,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
  
    // Once we are using RAF, this thread is driving user interactive display
    // updates. Update priority accordingly.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index 53474e91ff22..dc308173b771 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -356,7 +356,7 @@ void VideoFrameSubmitter::OnBeginFrame(
        continue;
      auto& feedback =
          timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
index 1ae8befc0f50..cfc8e3fbf7eb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc
-@@ -197,12 +197,12 @@ SupportedFormats GetSupportedFormatsInternal(
+@@ -198,12 +198,12 @@ SupportedFormats GetSupportedFormatsInternal(
        supported_formats.scalability_modes.push_back(profile.scalability_modes);
        supported_formats.sdp_formats.push_back(std::move(*format));
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5
index 89970e0e44de..f729bbaa5d14 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1531,7 +1531,7 @@
-       depends_on: ["FileSystemAccessLocal"],
-       status: {"Android": "test", "default": "stable"},
-       origin_trial_feature_name: "FileHandling",
+@@ -2781,7 +2781,7 @@
+       name: "PaymentHandlerMinimalHeaderUX",
+       origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
+       origin_trial_allows_third_party: true,
 -      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
 +      origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
-       base_feature: "FileHandlingAPI",
      },
      {
-@@ -3358,7 +3358,7 @@
+       name: "PaymentInstruments",
+@@ -3803,7 +3803,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -18,16 +18,7 @@
      },
      {
        name: "URLPatternCompareComponent",
-@@ -3379,7 +3379,7 @@
-       origin_trial_feature_name: "UserAgentReduction",
-       origin_trial_allows_third_party: true,
-       // iOS not included as it should not send a reduced User-Agent string.
--      origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"],
-+      origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"],
-       base_feature: "ReduceUserAgent",
-     },
-     {
-@@ -3553,12 +3553,12 @@
+@@ -4006,12 +4006,12 @@
        status: "experimental",
        base_feature: "none",
        origin_trial_feature_name: "WebAppUrlHandling",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc
index cab2808e46a6..d8fc91ddadb8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_scheduler_common_thread.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2022-10-24 13:33:33 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/scheduler/common/thread.cc
-@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() {
+@@ -82,7 +82,7 @@ void Thread::CreateAndSetCompositorThread() {
        std::make_unique<scheduler::CompositorThread>(params);
    compositor_thread->Init();
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
new file mode 100644
index 000000000000..ac8abe61fb37
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
+@@ -621,7 +621,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV
+   }
+ 
+   const unsigned texture_target =
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+       // Explicitly set GL_TEXTURE_EXTERNAL_OES as the
+       // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12
+       // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
new file mode 100644
index 000000000000..a957cfd32446
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
+@@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& BlinkCategorizedWo
+ 
+ void BlinkCategorizedWorkerPoolDelegate::NotifyThreadWillRun(
+     base::PlatformThreadId tid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+   scoped_refptr<base::TaskRunner> task_runner =
+       Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted());
+   task_runner->PostTask(FROM_HERE, base::BindOnce(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
deleted file mode 100644
index b80eab4f0b29..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig	2023-03-09 06:31:50 UTC
-+++ src/3rdparty/chromium/third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc
-@@ -242,7 +242,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre
-       "CompositorTileWorkerBackground", thread_options, this,
-       background_thread_prio_categories,
-       &has_task_for_background_priority_thread_cv_);
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   thread->SetBackgroundingCallback(
-       Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted()),
-       base::BindOnce([](base::PlatformThreadId thread_id) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h
index 54822740990c..0c99b83324b4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_wtf_math__extras.h
@@ -1,17 +1,6 @@
---- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/math_extras.h
-@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) {
-   return g * (1.0f / 400.0f);
- }
- 
-+#if defined(OS_FREEBSD)
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Winvalid-constexpr"
-+#endif
- inline double RoundHalfTowardsPositiveInfinity(double value) {
-   return std::floor(value + 0.5);
- }
-@@ -135,6 +139,9 @@ inline float RoundHalfTowardsPositiveInfinity(float va
+@@ -135,6 +135,9 @@ inline float RoundHalfTowardsPositiveInfinity(float va
  inline float RoundHalfTowardsPositiveInfinity(float value) {
    return std::floor(value + 0.5f);
  }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni
deleted file mode 100644
index f23df4066ad8..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.generated.gni
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni.orig	2023-09-07 16:02:00 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/BUILD.generated.gni
-@@ -87,6 +87,7 @@ crypto_sources = [
-   "src/crypto/cpu_aarch64_freebsd.c",
-   "src/crypto/cpu_aarch64_fuchsia.c",
-   "src/crypto/cpu_aarch64_linux.c",
-+  "src/crypto/cpu_aarch64_openbsd.c",
-   "src/crypto/cpu_aarch64_win.c",
-   "src/crypto/cpu_arm.c",
-   "src/crypto/cpu_arm_freebsd.c",
-@@ -193,6 +194,7 @@ crypto_sources = [
-   "src/crypto/rand_extra/deterministic.c",
-   "src/crypto/rand_extra/forkunsafe.c",
-   "src/crypto/rand_extra/fuchsia.c",
-+  "src/crypto/rand_extra/arc4random.c",
-   "src/crypto/rand_extra/passive.c",
-   "src/crypto/rand_extra/rand_extra.c",
-   "src/crypto/rand_extra/windows.c",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn
deleted file mode 100644
index 7bc990a32f49..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_BUILD.gn
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/BUILD.gn.orig	2022-03-25 21:59:56 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/BUILD.gn
-@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
-         public_configs = [ ":no_asm_config" ]
-       }
-     } else if (current_cpu == "arm64") {
--      if (is_linux || is_chromeos || is_android) {
-+      if ((is_linux || is_chromeos || is_android) && !is_freebsd) {
-         sources += crypto_sources_linux_aarch64
-       } else if (is_apple) {
-         sources += crypto_sources_apple_aarch64
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl
deleted file mode 100644
index 0d7a6c505632..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl
-@@ -78,6 +78,7 @@ $code.=<<___;
- 
- .extern OPENSSL_ia32cap_P
- 
-+.rodata
- .align	64
- .Lzero:
- .long	0,0,0,0
-@@ -107,6 +108,7 @@ $code.=<<___;
- .Lsixteen:
- .long	16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16
- .asciz	"ChaCha20 for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
- 
- sub AUTOLOAD()          # thunk [simplified] 32-bit style perlasm
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl
deleted file mode 100644
index 23fc58a63e69..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl
-@@ -32,7 +32,7 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
- *STDOUT=*OUT;
- 
- $code.=<<___;
--.data
-+.rodata
- 
- .align 16
- one:
-@@ -66,6 +66,7 @@ con3:
- .byte -1,-1,-1,-1,-1,-1,-1,-1,4,5,6,7,4,5,6,7
- and_mask:
- .long 0,0xffffffff, 0xffffffff, 0xffffffff
-+.previous
- ___
- 
- $code.=<<___;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl
deleted file mode 100644
index a3bb3e648f9a..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl
-@@ -42,6 +42,7 @@ $code.=<<___;
- 
- chacha20_poly1305_constants:
- 
-+.rodata
- .align 64
- .Lchacha20_consts:
- .byte 'e','x','p','a','n','d',' ','3','2','-','b','y','t','e',' ','k'
-@@ -79,6 +80,7 @@ chacha20_poly1305_constants:
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
-+.previous
- ___
- 
- my ($oup,$inp,$inl,$adp,$keyp,$itr1,$itr2,$adl)=("%rdi","%rsi","%rbx","%rcx","%r9","%rcx","%r8","%r8");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c
deleted file mode 100644
index 60fd01169810..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig	2022-03-25 21:59:56 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c
-@@ -0,0 +1,57 @@
-+/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-+
-+#include <openssl/cpu.h>
-+
-+#if defined(OPENSSL_AARCH64) && defined(OPENSSL_OPENBSD) && \
-+    !defined(OPENSSL_STATIC_ARMCAP)
-+
-+#include <sys/sysctl.h>
-+#include <machine/cpu.h>
-+#include <machine/armreg.h>
-+#include <stdio.h>
-+
-+#include <openssl/arm_arch.h>
-+
-+#include "internal.h"
-+
-+extern uint32_t OPENSSL_armcap_P;
-+
-+void OPENSSL_cpuid_setup(void) {
-+  int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+  size_t len = sizeof(uint64_t);
-+  uint64_t cpu_id = 0;
-+
-+  if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
-+    return;
-+
-+  OPENSSL_armcap_P |= ARMV7_NEON;
-+
-+  if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_BASE)
-+    OPENSSL_armcap_P |= ARMV8_AES;
-+
-+  if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL)
-+    OPENSSL_armcap_P |= ARMV8_PMULL;
-+
-+  if (ID_AA64ISAR0_SHA1(cpu_id) >= ID_AA64ISAR0_SHA1_BASE)
-+    OPENSSL_armcap_P |= ARMV8_SHA1;
-+
-+  if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_BASE)
-+    OPENSSL_armcap_P |= ARMV8_SHA256;
-+
-+  if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_512)
-+    OPENSSL_armcap_P |= ARMV8_SHA512;
-+}
-+
-+#endif  // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
deleted file mode 100644
index eec96103d4ec..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl
-@@ -3778,6 +3778,7 @@ ___
- }
- 
- $code.=<<___;
-+.rodata
- .align	64
- .Lbswap_mask:
- 	.byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -3800,6 +3801,7 @@ $code.=<<___;
- 
- .asciz  "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>"
- .align	64
-+.previous
- ___
- 
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl
deleted file mode 100644
index a12e445991f2..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl
-@@ -1288,6 +1288,7 @@ _vpaes_preheat:
- ##                                                    ##
- ########################################################
- .type	_vpaes_consts,\@object
-+.rodata
- .align	64
- _vpaes_consts:
- .Lk_inv:	# inv, inva
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl
deleted file mode 100644
index f7ef4e8e55ba..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl
-@@ -3576,11 +3576,13 @@ $code.=<<___;
- ___
- }
- $code.=<<___;
-+.rodata
- .align	64
- .Linc:
- 	.long	0,0, 1,1
- 	.long	2,2, 2,2
- .asciz	"Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
- 
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl
deleted file mode 100644
index 383c6889b710..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl
-@@ -62,6 +62,7 @@ $code.=<<___;
- .extern	OPENSSL_ia32cap_P
- 
- # The polynomial
-+.rodata
- .align 64
- .Lpoly:
- .quad 0xffffffffffffffff, 0x00000000ffffffff, 0x0000000000000000, 0xffffffff00000001
-@@ -80,6 +81,7 @@ $code.=<<___;
- .quad 0xf3b9cac2fc632551, 0xbce6faada7179e84, 0xffffffffffffffff, 0xffffffff00000000
- .LordK:
- .quad 0xccd1c8aaee00bc4f
-+.previous
- ___
- 
- {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
deleted file mode 100644
index e28864dfceb4..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl
-@@ -1053,6 +1053,7 @@ $code.=<<___;
- ___
- 
- $code.=<<___;
-+.rodata
- .align	64
- .Lbswap_mask:
- 	.byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1066,6 +1067,7 @@ $code.=<<___;
- 	.byte	1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
- .asciz	"AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align	64
-+.previous
- ___
- }}} else {{{
- $code=<<___;	# assembler is too old
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
deleted file mode 100644
index 2cea056c5b0c..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl
-@@ -331,6 +331,7 @@ $code .= <<____;
- .seh_endproc
- .size	gcm_ghash_ssse3,.-gcm_ghash_ssse3
- 
-+.rodata
- .align	16
- # .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the
- # bytes in an XMM register.
-@@ -339,6 +340,7 @@ $code .= <<____;
- # .Llow4_mask is an XMM mask which selects the low four bits of each byte.
- .Llow4_mask:
- .quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-+.previous
- ____
- 
- print $code;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
deleted file mode 100644
index 4124a866436a..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl
-@@ -1297,6 +1297,7 @@ ___
- }
- 
- $code.=<<___;
-+.rodata
- .align	64
- .Lbswap_mask:
- 	.byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1308,6 +1309,7 @@ $code.=<<___;
- 
- .asciz	"GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align	64
-+.previous
- ___
- 
- $code =~ s/\`([^\`]*)\`/eval($1)/gem;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h
deleted file mode 100644
index 29b0a6683006..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_rand_internal.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig	2022-09-24 10:57:32 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/rand/internal.h
-@@ -27,7 +27,8 @@ extern "C" {
- 
- 
- #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \
--    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY)
-+    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY) && \
-+    !defined(OPENSSL_ARC4RANDOM)
- #define OPENSSL_URANDOM
- #endif
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl
deleted file mode 100644
index 387ba2cba7af..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl
-@@ -1815,6 +1815,7 @@ ___
- }
- }
- $code.=<<___;
-+.rodata
- .align	64
- K_XX_XX:
- .long	0x5a827999,0x5a827999,0x5a827999,0x5a827999	# K_00_19
-@@ -1833,6 +1834,7 @@ ___
- $code.=<<___;
- .asciz	"SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align	64
-+.previous
- ___
- 
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl
deleted file mode 100644
index 49553e42ba57..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig	2023-02-08 09:03:45 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl
-@@ -404,6 +404,7 @@ ___
- 
- if ($SZ==4) {
- $code.=<<___;
-+.rodata
- .align	64
- .type	$TABLE,\@object
- $TABLE:
-@@ -447,9 +448,11 @@ $TABLE:
- 	.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
- 	.long	0xffffffff,0xffffffff,0x03020100,0x0b0a0908
- 	.asciz	"SHA256 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
- } else {
- $code.=<<___;
-+.rodata
- .align	64
- .type	$TABLE,\@object
- $TABLE:
-@@ -537,6 +540,7 @@ $TABLE:
- 	.quad	0x0001020304050607,0x08090a0b0c0d0e0f
- 	.quad	0x0001020304050607,0x08090a0b0c0d0e0f
- 	.asciz	"SHA512 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
- }
- 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c
deleted file mode 100644
index 0c920ae35733..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_rand__extra_arc4random.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig	2022-02-07 13:39:41 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/rand_extra/arc4random.c
-@@ -0,0 +1,33 @@
-+/* Copyright (c) 2018, Robert Nagy <robert@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-+
-+#define _BSD_SOURCE 1
-+
-+#include <openssl/rand.h>
-+
-+#if defined(OPENSSL_ARC4RANDOM) && !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE)
-+
-+#include <stdlib.h>
-+
-+#include "../fipsmodule/rand/internal.h"
-+
-+void CRYPTO_sysrand_for_seed(uint8_t *out, size_t requested) {                 
-+  CRYPTO_sysrand(out, requested);
-+}                                                                              
-+
-+void CRYPTO_sysrand(uint8_t *out, size_t requested) {
-+  arc4random_buf(out, requested);
-+}
-+
-+#endif  // OPENSSL_ARC4RANDOM && !BORINGSSL_UNSAFE_DETERMINISTIC_MODE
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c
deleted file mode 100644
index 25cae0821ee0..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_crypto_refcount__c11.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c.orig	2022-09-24 10:57:32 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/crypto/refcount_c11.c
-@@ -22,6 +22,9 @@
- #include <stdatomic.h>
- #include <stdlib.h>
- 
-+#if !defined(__cplusplus) && !defined(static_assert)
-+#define static_assert _Static_assert
-+#endif
- 
- // See comment above the typedef of CRYPTO_refcount_t about these tests.
- static_assert(alignof(CRYPTO_refcount_t) == alignof(_Atomic CRYPTO_refcount_t),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h
deleted file mode 100644
index 209350e7f0a6..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_base.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h.orig	2023-04-05 11:05:06 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/base.h
-@@ -151,6 +151,11 @@ extern "C" {
- #define OPENSSL_FUCHSIA
- #endif
- 
-+#if defined(__OpenBSD__)
-+#define OPENSSL_OPENBSD
-+#define OPENSSL_ARC4RANDOM
-+#endif   
-+
- #if defined(__TRUSTY__)
- #define OPENSSL_TRUSTY
- #define OPENSSL_NO_THREADS_CORRUPT_MEMORY_AND_LEAK_SECRETS_IF_THREADED
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h
deleted file mode 100644
index b62795e17f60..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_include_openssl_thread.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/3rdparty/chromium/third_party/boringssl/src/include/openssl/thread.h.orig	2022-05-19 14:06:27 UTC
-+++ src/3rdparty/chromium/third_party/boringssl/src/include/openssl/thread.h
-@@ -78,6 +78,7 @@ typedef union crypto_mutex_st {
-   void *handle;
- } CRYPTO_MUTEX;
- #elif !defined(__GLIBC__)
-+#include <pthread.h>
- typedef pthread_rwlock_t CRYPTO_MUTEX;
- #else
- // On glibc, |pthread_rwlock_t| is hidden under feature flags, and we can't
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py
index 3759a6f23805..3efd7510b554 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_boringssl_src_util_generate__build__files.py
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/boringssl/src/util/generate_build_files.py
-@@ -785,10 +785,10 @@ def main(platforms):
+@@ -766,10 +766,10 @@ def main(platforms):
    ]
  
    # Generate err_data.c
@@ -15,7 +15,7 @@
    crypto_c_files.append('err_data.c')
    crypto_c_files.sort()
  
-@@ -801,11 +801,11 @@ def main(platforms):
+@@ -780,11 +780,11 @@ def main(platforms):
    crypto_test_files = []
    if EMBED_TEST_DATA:
      # Generate crypto_test_data.cc
@@ -29,6 +29,6 @@
 +#          ['go', 'run', 'util/embed_test_data.go'] + cmake['CRYPTO_TEST_DATA'],
 +#          cwd='src',
 +#          stdout=out)
-     crypto_test_files += ['crypto_test_data.cc']
+     crypto_test_files.append('crypto_test_data.cc')
  
-   crypto_test_files += FindCFiles(os.path.join('src', 'crypto'), OnlyTests)
+   crypto_test_files += PrefixWithSrc(cmake['CRYPTO_TEST_SOURCES'])
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni
new file mode 100644
index 000000000000..fb61d3ecf290
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_cpuinfo_cpuinfo.gni
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/cpuinfo/cpuinfo.gni.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/third_party/cpuinfo/cpuinfo.gni
+@@ -7,7 +7,7 @@ use_cpuinfo =
+     current_cpu != "ppc64" && current_cpu != "ppc64le" &&
+     current_cpu != "s390" && current_cpu != "s390x" &&
+     # cpuinfo is not supported on fuchsia.
+-    !is_fuchsia &&
++    !is_fuchsia && !is_bsd &&
+     # There's a few arm architectures that are not supported by cpuinfo,
+     # especially amongst ChromeOS devices.
+     # See //third_party/cpuinfo/src/src/arm/linux/cp.h.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
new file mode 100644
index 000000000000..14c9411abecc
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_build_crashpad__buildconfig.gni
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/build/crashpad_buildconfig.gni
+@@ -61,7 +61,7 @@ if (crashpad_is_in_chromium) {
+   crashpad_is_ios = is_ios
+   crashpad_is_apple = is_apple
+   crashpad_is_win = is_win
+-  crashpad_is_linux = is_linux || is_chromeos
++  crashpad_is_linux = (is_linux || is_chromeos) && !is_bsd
+   crashpad_is_android = is_android
+   crashpad_is_fuchsia = is_fuchsia
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn
new file mode 100644
index 000000000000..8964a52ea7f7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_BUILD.gn
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/client/BUILD.gn.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/client/BUILD.gn
+@@ -137,6 +137,13 @@ static_library("common") {
+   if (crashpad_is_win) {
+     sources += [ "crash_report_database_win.cc" ]
+   }
++
++  if (crashpad_is_posix) {
++    sources += [
++      "crashpad_client_posix.cc",
++    ]
++  }
++
+   if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) {
+     sources += [
+       "crash_report_database_generic.cc",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc
new file mode 100644
index 000000000000..eaa3a41627ed
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_client_crashpad__client__posix.cc
@@ -0,0 +1,43 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/client/crashpad_client_posix.cc
+@@ -0,0 +1,40 @@
++// Copyright 2017 The Crashpad Authors. All rights reserved.
++//
++// Licensed under the Apache License, Version 2.0 (the "License");
++// you may not use this file except in compliance with the License.
++// You may obtain a copy of the License at
++//
++//     http://www.apache.org/licenses/LICENSE-2.0
++//
++// Unless required by applicable law or agreed to in writing, software
++// distributed under the License is distributed on an "AS IS" BASIS,
++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++// See the License for the specific language governing permissions and
++// limitations under the License.
++
++#include "client/crashpad_client.h"
++
++#include "base/logging.h"
++#include "base/notreached.h"
++
++namespace crashpad {
++
++CrashpadClient::CrashpadClient() {}
++
++CrashpadClient::~CrashpadClient() {}
++
++bool CrashpadClient::StartHandler(
++    const base::FilePath& handler,
++    const base::FilePath& database,
++    const base::FilePath& metrics_dir,
++    const std::string& url,
++    const std::map<std::string, std::string>& annotations,
++    const std::vector<std::string>& arguments,
++    bool restartable,
++    bool asynchronous_start,   
++    const std::vector<base::FilePath>& attachments) {
++  NOTREACHED();  // TODO(scottmg): https://crashpad.chromium.org/bug/196
++  return false;
++}
++
++}  // namespace crashpad
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
new file mode 100644
index 000000000000..f337430eb9d6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig	2022-07-22 17:30:31 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
+@@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() {
+   static constexpr char kOS[] = "win";
+ #elif BUILDFLAG(IS_FUCHSIA)
+   static constexpr char kOS[] = "fuchsia";
++#elif defined(OS_OPENBSD)
++  static constexpr char kOS[] = "openbsd";
++#elif defined(OS_FREEBSD)
++  static constexpr char kOS[] = "freebsd";
+ #else
+ #error define kOS for this operating system
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h
new file mode 100644
index 000000000000..ada89edcb833
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_address__types.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/address_types.h.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/address_types.h
+@@ -25,7 +25,7 @@
+ #include <mach/mach_types.h>
+ #elif BUILDFLAG(IS_WIN)
+ #include "util/win/address_types.h"
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "util/linux/address_types.h"
+ #elif BUILDFLAG(IS_FUCHSIA)
+ #include <zircon/types.h>
+@@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t;
+ using VMAddress = WinVMAddress;
+ using VMSize = WinVMSize;
+ 
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ 
+ using VMAddress = LinuxVMAddress;
+ using VMSize = LinuxVMSize;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h
new file mode 100644
index 000000000000..fddd74c41f77
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_capture__context.h
@@ -0,0 +1,22 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/capture_context.h
+@@ -21,7 +21,8 @@
+ #include <mach/mach.h>
+ #elif BUILDFLAG(IS_WIN)
+ #include <windows.h>
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
++      BUILDFLAG(IS_FREEBSD)
+ #include <ucontext.h>
+ #endif  // BUILDFLAG(IS_APPLE)
+ 
+@@ -35,7 +36,8 @@ using NativeCPUContext = arm_unified_thread_state;
+ #endif
+ #elif BUILDFLAG(IS_WIN)
+ using NativeCPUContext = CONTEXT;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
++      BUILDFLAG(IS_BSD)
+ using NativeCPUContext = ucontext_t;
+ #endif  // BUILDFLAG(IS_APPLE)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc
new file mode 100644
index 000000000000..ae45aff49a98
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_metrics.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/metrics.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/metrics.cc
+@@ -25,7 +25,7 @@
+ #define METRICS_OS_NAME "Win"
+ #elif BUILDFLAG(IS_ANDROID)
+ #define METRICS_OS_NAME "Android"
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #define METRICS_OS_NAME "Linux"
+ #elif BUILDFLAG(IS_FUCHSIA)
+ #define METRICS_OS_NAME "Fuchsia"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc
new file mode 100644
index 000000000000..022e44d4763e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_misc_uuid.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/misc/uuid.cc
+@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() {
+   InitializeFromBytes(uuid);
+   return true;
+ #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+   // Linux, Android, and Fuchsia do not provide a UUID generator in a
+   // widely-available system library. On Linux and Android, uuid_generate()
+   // from libuuid is not available everywhere.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc
new file mode 100644
index 000000000000..051d9df2784d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_close__multiple.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/close_multiple.cc
+@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) {
+ // This is an advantage over looping over all possible file descriptors, because
+ // no attempt needs to be made to close file descriptors that are not open.
+ bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) {
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+   static constexpr char kFDDir[] = "/dev/fd";
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+   static constexpr char kFDDir[] = "/proc/self/fd";
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc
new file mode 100644
index 000000000000..07d2646d3883
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_drop__privileges.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig	2022-02-28 16:54:41 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/drop_privileges.cc
+@@ -25,7 +25,7 @@ void DropPrivileges() {
+   gid_t gid = getgid();
+   uid_t uid = getuid();
+ 
+-#if BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+   // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and
+   // setregid(), setreuid() and setregid() alone should be sufficient to drop
+   // privileges. The standard specifies that the saved ID should be set to the
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc
new file mode 100644
index 000000000000..af3e3cb7d4d0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_signals.cc
@@ -0,0 +1,33 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc.orig	2022-08-31 12:19:35 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/signals.cc
+@@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = {
+ #if defined(SIGEMT)
+     SIGEMT,
+ #endif  // defined(SIGEMT)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     SIGXCPU,
+     SIGXFSZ,
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -91,7 +91,7 @@ constexpr int kTerminateSignals[] = {
+     SIGXCPU,
+     SIGXFSZ,
+ #endif  // BUILDFLAG(IS_APPLE)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+     SIGIO,
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ };
+@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi
+          // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c
+          // psignal_internal().
+          (code > 0 &&
++#if defined(SI_ASYNCIO)
+           code != SI_ASYNCIO &&
++#endif
++#if defined(SI_MESGQ)
+           code != SI_MESGQ &&
++#endif
+           code != SI_QUEUE &&
+           code != SI_TIMER &&
+           code != SI_USER &&
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
new file mode 100644
index 000000000000..4de23be51e5a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig	2022-04-21 18:48:31 UTC
++++ src/3rdparty/chromium/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
+@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = {
+     "INFO",
+     "USR1",
+     "USR2",
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #if defined(ARCH_CPU_MIPS_FAMILY)
+     "HUP",
+     "INT",
+@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = {
+ #endif  // defined(ARCH_CPU_MIPS_FAMILY)
+ #endif
+ };
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ // NSIG is 64 to account for real-time signals.
+ static_assert(std::size(kSignalNames) == 32, "kSignalNames length");
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
index 43f6c7e72760..f6bf968b709f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_crc32c_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/crc32c/BUILD.gn.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/third_party/crc32c/BUILD.gn.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/crc32c/BUILD.gn
-@@ -47,7 +47,7 @@ config("crc32c_config") {
+@@ -46,7 +46,7 @@ config("crc32c_config") {
    }
  
    # Android added <sys/auxv.h> in API level 18.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h
index 790f62477c31..bb7e4435422f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+@@ -80,7 +80,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
  };
  
  // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn
new file mode 100644
index 000000000000..4917ac78d8ac
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_BUILD.gn
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/BUILD.gn
+@@ -357,7 +357,6 @@ target(link_target_type, "ffmpeg_internal") {
+       libs += [
+         "m",
+         "z",
+-        "rt",
+       ]
+     }
+     if (is_component_ffmpeg) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py
new file mode 100644
index 000000000000..7399348201c9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_build__ffmpeg.py
@@ -0,0 +1,121 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -32,7 +32,7 @@ NDK_ROOT_DIR = os.path.abspath(
+ SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
+ 
+ sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build'))
+-import gn_helpers
++#import gn_helpers
+ 
+ BRANDINGS = [
+     'Chrome',
+@@ -45,6 +45,8 @@ ARCH_MAP = {
+     'linux': [
+         'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'
+     ],
++    'openbsd': ['x64', 'arm64', 'ia32'],
++    'freebsd': ['x64', 'arm64', 'ia32'],
+     'mac': ['x64', 'arm64'],
+     'win': ['ia32', 'x64', 'arm64'],
+ }
+@@ -54,6 +56,8 @@ USAGE_END = """
+ Valid combinations are android     [%(android)s]
+                        linux       [%(linux)s]
+                        mac         [%(mac)s]
++                       openbsd     [%(openbsd)s]
++                       freebsd     [%(freebsd)s]
+                        win         [%(win)s]
+ 
+ If no target architecture is specified all will be built.
+@@ -126,6 +130,10 @@ def PrintAndCheckCall(argv, *args, **kwargs):
+ def DetermineHostOsAndArch():
+   if platform.system() == 'Linux':
+     host_os = 'linux'
++  if platform.system() == 'OpenBSD':
++    host_os = 'openbsd'
++  elif platform.system() == 'FreeBSD':
++    host_os = 'freebsd'
+   elif platform.system() == 'Darwin':
+     host_os = 'mac'
+   elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system():
+@@ -135,7 +143,7 @@ def DetermineHostOsAndArch():
+ 
+   if re.match(r'i.86', platform.machine()):
+     host_arch = 'ia32'
+-  elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64':
++  elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64' or platform.machine() == 'amd64':
+     host_arch = 'x64'
+   elif platform.machine() == 'aarch64':
+     host_arch = 'arm64'
+@@ -152,7 +160,7 @@ def DetermineHostOsAndArch():
+ 
+ 
+ def GetDsoName(target_os, dso_name, dso_version):
+-  if target_os in ('linux', 'linux-noasm', 'android'):
++  if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+     return 'lib%s.so.%s' % (dso_name, dso_version)
+   elif target_os == 'mac':
+     return 'lib%s.%s.dylib' % (dso_name, dso_version)
+@@ -495,7 +503,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
+   # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
+   # #warning which will be converted to an error via -Werror.
+   # There is also no prctl.h
+-  if target_os in ['linux', 'linux-noasm']:
++  if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+     pre_make_rewrites += [
+         (r'(#define HAVE_SYSCTL [01])',
+          r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
+@@ -622,7 +630,7 @@ def main(argv):
+   configure_args = args[2:]
+ 
+ 
+-  if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all'):
++  if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all', 'openbsd', 'freebsd'):
+     parser.print_help()
+     return 1
+ 
+@@ -744,7 +752,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+         '--enable-parser=vp3,vp8',
+     ])
+ 
+-  if target_os in ('linux', 'linux-noasm', 'android'):
++  if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+     if target_arch == 'x64':
+       if target_os == 'android':
+         configure_flags['Common'].extend([
+@@ -754,7 +762,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+         configure_flags['Common'].extend([
+           '--enable-lto',
+           '--arch=x86_64',
+-          '--target-os=linux',
++          '--target-os=' + target_os,
+         ])
+ 
+         if host_arch != 'x64':
+@@ -845,7 +853,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+               '--extra-cflags=-mfpu=vfpv3-d16',
+           ])
+     elif target_arch == 'arm64':
+-      if target_os != 'android':
++      if target_os != 'android' and target_os != 'openbsd' and target_os != 'freebsd':
+         if host_arch != 'arm64':
+           configure_flags['Common'].extend([
+             '--enable-cross-compile',
+@@ -910,7 +918,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+             '--disable-mips64r2',
+             '--enable-msa',
+         ])
+-      if target_os == 'linux':
++      if target_os == 'Linux':
+         configure_flags['Common'].extend([
+             '--enable-cross-compile',
+             '--target-os=linux',
+@@ -1061,7 +1069,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+         'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] +
+         configure_args)
+ 
+-  if target_os in ['linux', 'linux-noasm']:
++  if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+     # ChromeOS enables MPEG4 which requires error resilience :(
+     chrome_os_flags = (
+         configure_flags['Common'] + configure_flags['Chrome'] +
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py
new file mode 100644
index 000000000000..c75d668bf1be
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_chromium_scripts_robo__lib_config.py
@@ -0,0 +1,53 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/robo_lib/config.py.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/robo_lib/config.py
+@@ -35,7 +35,7 @@ class RoboConfiguration:
+     self._patches_commit_title = "Chromium patches file"
+     # Title of the commit with README.chromium
+     self._readme_chromium_commit_title = "README.chromium file"
+-    self.EnsureHostInfo()
++    #self.EnsureHostInfo()
+     self.EnsureChromeSrc()
+     self.EnsureScriptDirectory()
+ 
+@@ -47,18 +47,15 @@ class RoboConfiguration:
+     self._llvm_path = os.path.join(self.chrome_src(), "third_party",
+             "llvm-build", "Release+Asserts", "bin")
+ 
+-    self.EnsurePathContainsLLVM()
+-    self.EnsureNoMakeInfo()
++    #self.EnsurePathContainsLLVM()
++    #self.EnsureNoMakeInfo()
+     self.EnsureFFmpegHome()
+     self.EnsureASANConfig()
+-    self.ComputeBranchName()
++    #self.ComputeBranchName()
+     if not quiet:
+       shell.log(f"Using chrome src: {self.chrome_src()}")
+       shell.log(f"Using script dir: {self._script_directory}")
+       shell.log(f"Using ffmpeg home:{self.ffmpeg_home()}")
+-      shell.log(f"On branch: {self.branch_name()}")
+-      if self.sushi_branch_name():
+-        shell.log(f"On sushi branch: {self.sushi_branch_name()}")
+ 
+     # Filename that we'll ask generate_gn.py to write git commands to.
+     # TODO: Should this use script_directory, or stay with ffmpeg?  As long as
+@@ -149,7 +146,7 @@ class RoboConfiguration:
+     """Ensure that the host architecture and platform are set."""
+     kernel, host, os, *rest = shell.output_or_error(["uname", "-a"]).split()
+     assert kernel in ("Linux", "linux")
+-    assert "x86_64" in rest
++    assert ("x86_64", "amd64") in rest
+     self._host_operating_system = "linux"
+     self._host_architecture = "x64"
+ 
+@@ -165,8 +162,8 @@ class RoboConfiguration:
+     wd = os.getcwd()
+     # Walk up the tree until we find src/AUTHORS
+     while wd != "/":
+-      if os.path.isfile(os.path.join(wd, "src", "AUTHORS")):
+-        self._chrome_src = os.path.join(wd, "src")
++      if os.path.isfile(os.path.join(wd, "third_party", "DEPS")):
++        self._chrome_src = wd
+         return
+       wd = os.path.dirname(wd)
+     raise Exception("could not find src/AUTHORS in any parent of the wd")
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure
new file mode 100644
index 000000000000..7978d8f99f43
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_configure
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/configure.orig	2023-10-12 11:37:12 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/configure
+@@ -5613,6 +5613,7 @@ case $target_os in
+         disable symver
+         ;;
+     freebsd)
++        enable section_data_rel_ro
+         ;;
+     bsd/os)
+         add_extralibs -lpoll -lgnugetopt
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_cabac.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_cabac.h
new file mode 100644
index 000000000000..67db6588d1e4
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_cabac.h
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/cabac.h.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/cabac.h
+@@ -31,7 +31,8 @@
+ 
+ #if   (defined(__i386) && defined(__clang__) && (__clang_major__<2 || (__clang_major__==2 && __clang_minor__<10)))\
+    || (                  !defined(__clang__) && defined(__llvm__) && __GNUC__==4 && __GNUC_MINOR__==2 && __GNUC_PATCHLEVEL__<=1)\
+-   || (defined(__INTEL_COMPILER) && defined(_MSC_VER))
++   || (defined(__INTEL_COMPILER) && defined(_MSC_VER)) \
++   || ((defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386))
+ #       define BROKEN_COMPILER 1
+ #else
+ #       define BROKEN_COMPILER 0
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm
new file mode 100644
index 000000000000..54e1caaeae4e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavcodec_x86_fft.asm
@@ -0,0 +1,108 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/fft.asm.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/fft.asm
+@@ -296,6 +296,7 @@ INIT_YMM avx
+ %if HAVE_AVX_EXTERNAL
+ align 16
+ fft8_avx:
++    _CET_ENDBR
+     mova      m0, Z(0)
+     mova      m1, Z(1)
+     T8_AVX    m0, m1, m2, m3, m4
+@@ -306,6 +307,7 @@ fft8_avx:
+ 
+ align 16
+ fft16_avx:
++    _CET_ENDBR
+     mova       m2, Z(2)
+     mova       m3, Z(3)
+     T4_SSE     m2, m3, m7
+@@ -343,6 +345,7 @@ fft16_avx:
+ 
+ align 16
+ fft32_avx:
++    _CET_ENDBR
+     call fft16_avx
+ 
+     mova m0, Z(4)
+@@ -367,6 +370,7 @@ fft32_avx:
+     ret
+ 
+ fft32_interleave_avx:
++    _CET_ENDBR
+     call fft32_avx
+     mov r2d, 32
+ .deint_loop:
+@@ -390,6 +394,7 @@ INIT_XMM sse
+ align 16
+ fft4_avx:
+ fft4_sse:
++    _CET_ENDBR
+     mova     m0, Z(0)
+     mova     m1, Z(1)
+     T4_SSE   m0, m1, m2
+@@ -399,6 +404,7 @@ fft4_sse:
+ 
+ align 16
+ fft8_sse:
++    _CET_ENDBR
+     mova     m0, Z(0)
+     mova     m1, Z(1)
+     T4_SSE   m0, m1, m2
+@@ -413,6 +419,7 @@ fft8_sse:
+ 
+ align 16
+ fft16_sse:
++    _CET_ENDBR
+     mova     m0, Z(0)
+     mova     m1, Z(1)
+     T4_SSE   m0, m1, m2
+@@ -441,6 +448,7 @@ fft16_sse:
+ %macro DECL_PASS 2+ ; name, payload
+ align 16
+ %1:
++    _CET_ENDBR
+ DEFINE_ARGS zc, w, n, o1, o3
+     lea o3q, [nq*3]
+     lea o1q, [nq*8]
+@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3
+ %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs
+     lea r2, [dispatch_tab%1]
+     mov r2, [r2 + (%2q-2)*gprsize]
+-%ifdef PIC
+-    lea r3, [$$]
+-    add r2, r3
+-%endif
+     call r2
+ %endmacro ; FFT_DISPATCH
+ 
+@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3
+     jl      .loop
+     RET
+ 
+-%ifdef PIC
+-%define SECTION_REL - $$
+-%else
+ %define SECTION_REL
+-%endif
+ 
+ %macro DECL_FFT 1-2 ; nbits, suffix
+ %ifidn %0, 1
+@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3
+ 
+ align 16
+ fft %+ n %+ fullsuffix:
++    _CET_ENDBR
+     call fft %+ n2 %+ SUFFIX
+     add r0, n*4 - (n&(-2<<%1))
+     call fft %+ n4 %+ SUFFIX
+@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix:
+ %endrep
+ %undef n
+ 
++[SECTION .data.rel.ro write]
+ align 8
+ dispatch_tab %+ fullsuffix: pointer list_of_fft
++__?SECT?__
+ %endmacro ; DECL_FFT
+ 
+ %if HAVE_AVX_EXTERNAL
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_cpu.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_cpu.c
new file mode 100644
index 000000000000..bdf96b980918
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_cpu.c
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c.orig	2022-07-22 17:30:31 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/cpu.c
+@@ -38,10 +38,7 @@
+ #if HAVE_GETPROCESSAFFINITYMASK || HAVE_WINRT
+ #include <windows.h>
+ #endif
+-#if HAVE_SYSCTL
+-#if HAVE_SYS_PARAM_H
+-#include <sys/param.h>
+-#endif
++#if HAVE_SYSCTL && !defined(__OpenBSD__)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c
new file mode 100644
index 000000000000..ee8d0e6f047f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_mem.c
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c.orig	2022-05-19 14:06:27 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/mem.c
+@@ -33,9 +33,6 @@
+ #include <stdlib.h>
+ #include <stdatomic.h>
+ #include <string.h>
+-#if HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
+ 
+ #include "attributes.h"
+ #include "avassert.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_random__seed.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_random__seed.c
new file mode 100644
index 000000000000..56f6d74cfa8e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_random__seed.c
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/random_seed.c.orig	2023-09-13 13:13:30 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/random_seed.c
+@@ -35,6 +35,11 @@
+ #elif CONFIG_OPENSSL
+ #include <openssl/rand.h>
+ #endif
++#if HAVE_ARC4RANDOM_BUF
++#undef __BSD_VISIBLE
++#define __BSD_VISIBLE 1
++#include <stdlib.h>
++#endif
+ #include <fcntl.h>
+ #include <math.h>
+ #include <time.h>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm
new file mode 100644
index 000000000000..b7c6baa11d8b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ffmpeg_libavutil_x86_x86inc.asm
@@ -0,0 +1,23 @@
+--- src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/third_party/ffmpeg/libavutil/x86/x86inc.asm
+@@ -53,6 +53,12 @@
+     %endif
+ %endif
+ 
++%if ARCH_X86_64
++    %define _CET_ENDBR endbr64
++%else
++    %define _CET_ENDBR
++%endif
++
+ %define WIN64  0
+ %define UNIX64 0
+ %if ARCH_X86_64
+@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
+     %endif
+     align function_align
+     %2:
++    _CET_ENDBR
+     RESET_MM_PERMUTATION        ; needed for x86-64, also makes disassembly somewhat nicer
+     %xdefine rstk rsp           ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required
+     %assign stack_offset 0      ; stack pointer offset relative to the return address
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h
new file mode 100644
index 000000000000..5e821ba16c3d
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_include_config.h
@@ -0,0 +1,89 @@
+--- src/3rdparty/chromium/third_party/fontconfig/include/config.h.orig	2023-04-05 11:05:06 UTC
++++ src/3rdparty/chromium/third_party/fontconfig/include/config.h
+@@ -18,13 +18,13 @@
+ #define ENABLE_NLS 1
+ 
+ /* Additional font directories */
+-#define FC_ADD_FONTS "yes"
++#define FC_ADD_FONTS "/usr/local/share/fonts"
+ 
+ /* Architecture prefix to use for cache file names */
+ /* #undef FC_ARCHITECTURE */
+ 
+ /* System font directory */
+-#define FC_DEFAULT_FONTS "<dir>/usr/share/fonts</dir>"
++#define FC_DEFAULT_FONTS "<dir>/usr/X11R6/lib/X11/fonts</dir>"
+ 
+ /* The type of len parameter of the gperf hash/lookup function */
+ #define FC_GPERF_SIZE_T size_t
+@@ -99,7 +99,7 @@
+ #define HAVE_GETPAGESIZE 1
+ 
+ /* Define to 1 if you have the `getprogname' function. */
+-/* #undef HAVE_GETPROGNAME */
++#define HAVE_GETPROGNAME 1
+ 
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #define HAVE_GETTEXT 1
+@@ -141,7 +141,7 @@
+ /* #undef HAVE_NDIR_H */
+ 
+ /* Define to 1 if you have the 'posix_fadvise' function. */
+-#define HAVE_POSIX_FADVISE 1
++#define HAVE_POSIX_FADVISE 0
+ 
+ /* Have POSIX threads */
+ #define HAVE_PTHREAD 1
+@@ -156,11 +156,14 @@
+ #define HAVE_RANDOM 1
+ 
+ /* Define to 1 if you have the `random_r' function. */
+-#define HAVE_RANDOM_R 1
++/* #undef HAVE_RANDOM_R */
+ 
+ /* Define to 1 if you have the `rand_r' function. */
+ #define HAVE_RAND_R 1
+ 
++/* Define to 1 if you have the `arc4_random' function. */
++#define HAVE_ARC4RANDOM 1
++
+ /* Define to 1 if you have the `readlink' function. */
+ #define HAVE_READLINK 1
+ 
+@@ -204,7 +207,7 @@
+ #define HAVE_STRUCT_STATFS_F_FLAGS 1
+ 
+ /* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
+-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
++#define HAVE_STRUCT_STATFS_F_FSTYPENAME 1
+ 
+ /* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
+ /* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
+@@ -230,7 +233,7 @@
+ #define HAVE_SYS_PARAM_H 1
+ 
+ /* Define to 1 if you have the <sys/statfs.h> header file. */
+-#define HAVE_SYS_STATFS_H 1
++/* #undef HAVE_SYS_STATFS_H */
+ 
+ /* Define to 1 if you have the <sys/statvfs.h> header file. */
+ #define HAVE_SYS_STATVFS_H 1
+@@ -242,7 +245,7 @@
+ #define HAVE_SYS_TYPES_H 1
+ 
+ /* Define to 1 if you have the <sys/vfs.h> header file. */
+-#define HAVE_SYS_VFS_H 1
++/* #undef HAVE_SYS_VFS_H */
+ 
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #define HAVE_UNISTD_H 1
+@@ -265,7 +268,8 @@
+ /* Define to 1 if you have the `_mktemp_s' function. */
+ /* #undef HAVE__MKTEMP_S */
+ 
+-/* Define to the sub-directory where libtool stores uninstalled libraries. */
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
+ #define LT_OBJDIR ".libs/"
+ 
+ /* Name of package */
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_src_src_fccompat.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_src_src_fccompat.c
new file mode 100644
index 000000000000..d61aaa4c78cc
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_fontconfig_src_src_fccompat.c
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/third_party/fontconfig/src/src/fccompat.c.orig	2023-04-05 11:05:06 UTC
++++ src/3rdparty/chromium/third_party/fontconfig/src/src/fccompat.c
+@@ -184,7 +184,9 @@ FcRandom(void)
+ {
+     int32_t result;
+ 
+-#if HAVE_RANDOM_R
++#if HAVE_ARC4RANDOM
++    result = arc4random() & 0x7fffffff;
++#elif HAVE_RANDOM_R
+     static struct random_data fcrandbuf;
+     static char statebuf[256];
+     static FcBool initialized = FcFalse;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc
index 07420a924166..37f7dfaef0fc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_ipcz_src_reference__drivers_random.cc
@@ -1,16 +1,16 @@
---- src/3rdparty/chromium/third_party/ipcz/src/reference_drivers/random.cc.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/third_party/ipcz/src/reference_drivers/random.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/ipcz/src/reference_drivers/random.cc
-@@ -15,7 +15,7 @@
- #include <limits>
+@@ -14,7 +14,7 @@
+ #include <windows.h>
  #elif BUILDFLAG(IS_FUCHSIA)
  #include <zircon/syscalls.h>
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
  #include <asm/unistd.h>
- #include <errno.h>
  #include <sys/syscall.h>
-@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) {
-   ABSL_ASSERT(ok);
+ #include <unistd.h>
+@@ -86,7 +86,7 @@ void RandomBytes(absl::Span<uint8_t> destination) {
+   process_prng_fn(destination.data(), destination.size());
  #elif BUILDFLAG(IS_FUCHSIA)
    zx_cprng_draw(destination.data(), destination.size());
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc
index c42f7036b5ad..d3327af989cd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_leveldatabase_env__chromium.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/leveldatabase/env_chromium.cc
-@@ -318,7 +318,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
+@@ -320,7 +320,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std::
  
  Status ChromiumWritableFile::SyncParent() {
    TRACE_EVENT0("leveldb", "SyncParent");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
new file mode 100644
index 000000000000..e9a5a5d7dccb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libaom_source_libaom_aom__ports_aarch64__cpudetect.c
@@ -0,0 +1,39 @@
+--- src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c.orig	2023-09-17 18:22:45 UTC
++++ src/3rdparty/chromium/third_party/libaom/source/libaom/aom_ports/aarch64_cpudetect.c
+@@ -85,13 +85,35 @@ static int arm_get_cpu_caps(void) {
+   return flags;
+ }
+ 
+-#elif defined(ANDROID_USE_CPU_FEATURES_LIB)
++#elif defined(ANDROID_USE_CPU_FEATURES_LIB) || defined(__FreeBSD__)
+ 
+ static int arm_get_cpu_caps(void) {
+   int flags = 0;
+ #if HAVE_NEON
+   flags |= HAS_NEON;  // Neon is mandatory in Armv8.0-A.
+ #endif  // HAVE_NEON
++  return flags;
++}
++
++#elif defined(__OpenBSD__)
++#include <sys/sysctl.h>
++#include <machine/cpu.h>
++#include <machine/armreg.h>
++
++static int arm_get_cpu_caps(void) {
++  int flags = 0;
++  int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
++  uint64_t cpu_id = 0;
++  size_t len = sizeof(cpu_id);
++
++  flags |= HAS_NEON;  // Neon is mandatory in Armv8.0-A.
++
++  if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
++    return flags;
++
++  if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
++    flags |= HAS_ARM_CRC32;
++
+   return flags;
+ }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c
index 4506da637606..7ea69d700512 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libsync_src_sync.c
@@ -1,16 +1,16 @@
---- src/3rdparty/chromium/third_party/libsync/src/sync.c.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/third_party/libsync/src/sync.c.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/libsync/src/sync.c
-@@ -17,7 +17,9 @@
+@@ -17,8 +17,8 @@
   */
  
  #include <fcntl.h>
-+#if !defined(__OpenBSD__)
- #include <malloc.h>
-+#endif
+-#include <malloc.h>
  #include <stdint.h>
++#include <stdlib.h>
  #include <string.h>
  #include <errno.h>
-@@ -29,6 +31,12 @@
+ #include <poll.h>
+@@ -29,6 +29,12 @@
  
  #include <sync/sync.h>
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_BUILD.gn
new file mode 100644
index 000000000000..22b7c68e1787
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_BUILD.gn
@@ -0,0 +1,52 @@
+--- src/3rdparty/chromium/third_party/libusb/BUILD.gn.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/libusb/BUILD.gn
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+ 
+ # libusb is only used by //services/device/usb on macOS.
+-assert(is_mac)
++assert(is_mac || is_bsd)
+ 
+ import("//build/config/chromeos/ui_mode.gni")
+ import("//build/config/features.gni")
+@@ -103,7 +103,7 @@ static_library("libusb") {
+     ]
+   }
+ 
+-  if (is_linux || is_chromeos) {
++  if ((is_linux || is_chromeos) && !is_bsd) {
+     sources += [
+       "src/libusb/os/linux_usbfs.c",
+       "src/libusb/os/linux_usbfs.h",
+@@ -114,11 +114,21 @@ static_library("libusb") {
+     ]
+   }
+ 
++  if (is_openbsd) {
++    sources += [
++      "src/libusb/os/openbsd_usb.c",
++    ]
++    defines += [
++      "OS_OPENBSD=1",
++      "_GNU_SOURCE=1",
++    ]
++  }
++
+   if (is_chromeos_ash) {
+     defines += [ "USBI_TIMERFD_AVAILABLE" ]
+   }
+ 
+-  if (use_udev) {
++  if (use_udev && !is_bsd) {
+     sources += [ "src/libusb/os/linux_udev.cc" ]
+     defines += [
+       "HAVE_LIBUDEV=1",
+@@ -127,7 +137,7 @@ static_library("libusb") {
+     deps += [ "//build/linux/libudev" ]
+   }
+ 
+-  if ((is_linux || is_chromeos) && !use_udev) {
++  if ((is_linux || is_chromeos) && !use_udev && !is_bsd) {
+     sources += [ "src/libusb/os/linux_netlink.c" ]
+     defines += [ "HAVE_LINUX_NETLINK_H" ]
+   }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_core.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_core.c
new file mode 100644
index 000000000000..e26d42ffdd14
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_core.c
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/libusb/src/libusb/core.c.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/libusb/src/libusb/core.c
+@@ -448,7 +448,7 @@ libusb_free_device_list(list, 1);
+  * which grows when required. it can be freed once discovery has completed,
+  * eliminating the need for a list node in the libusb_device structure
+  * itself. */
+-#define DISCOVERED_DEVICES_SIZE_STEP 8
++#define DISCOVERED_DEVICES_SIZE_STEP 16
+ 
+ static struct discovered_devs *discovered_devs_alloc(void)
+ {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_os_threads__posix.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_os_threads__posix.c
new file mode 100644
index 000000000000..369d72508877
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libusb_src_libusb_os_threads__posix.c
@@ -0,0 +1,24 @@
+--- src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/third_party/libusb/src/libusb/os/threads_posix.c
+@@ -19,9 +19,11 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#if defined(__linux__) || defined(__OpenBSD__)
++#if defined(__linux__)
+ # include <unistd.h>
+ # include <sys/syscall.h>
++#elif defined(__OpenBSD__)
++# include <unistd.h>
+ #elif defined(__APPLE__)
+ # include <mach/mach.h>
+ #elif defined(__CYGWIN__)
+@@ -65,7 +67,7 @@ int usbi_get_tid(void)
+ #elif defined(__OpenBSD__)
+ 	/* The following only works with OpenBSD > 5.1 as it requires
+ 	   real thread support. For 5.1 and earlier, -1 is returned. */
+-	ret = syscall(SYS_getthrid);
++	ret = getthrid();
+ #elif defined(__APPLE__)
+ 	ret = mach_thread_self();
+ 	mach_port_deallocate(mach_task_self(), ret);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h
new file mode 100644
index 000000000000..34e828185f7b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_linux_config.h
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/libxml/linux/config.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/libxml/linux/config.h
+@@ -69,6 +69,9 @@
+ /* Define to 1 if you have the <pthread.h> header file. */
+ #define HAVE_PTHREAD_H /**/
+ 
++/* Define to 1 if you have the `arc4random' function. */
++#define HAVE_ARC4RANDOM 1
++
+ /* Define to 1 if you have the `rand_r' function. */
+ 
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c
new file mode 100644
index 000000000000..ce42ad8fb0f6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_libxml_src_dict.c
@@ -0,0 +1,41 @@
+--- src/3rdparty/chromium/third_party/libxml/src/dict.c.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/third_party/libxml/src/dict.c
+@@ -133,7 +133,7 @@ struct _xmlDict {
+ static xmlMutex xmlDictMutex;
+ 
+ #ifdef DICT_RANDOMIZATION
+-#ifdef HAVE_RAND_R
++#if defined(HAVE_RAND_R) && !defined(HAVE_ARC4RANDOM)
+ /*
+  * Internal data for random function, protected by xmlDictMutex
+  */
+@@ -160,7 +160,7 @@ int xmlInitializeDict(void) {
+ int __xmlInitializeDict(void) {
+     xmlInitMutex(&xmlDictMutex);
+ 
+-#ifdef DICT_RANDOMIZATION
++#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM)
+ #ifdef HAVE_RAND_R
+     rand_seed = time(NULL);
+     rand_r(& rand_seed);
+@@ -175,13 +175,17 @@ int __xmlInitializeDict(void) {
+ int __xmlRandom(void) {
+     int ret;
+ 
++#ifdef HAVE_ARC4RANDOM
++    ret = arc4random();
++#else
+     xmlMutexLock(&xmlDictMutex);
+-#ifdef HAVE_RAND_R
++#  ifdef HAVE_RAND_R
+     ret = rand_r(& rand_seed);
+-#else
++#  else
+     ret = rand();
+-#endif
++#  endif
+     xmlMutexUnlock(&xmlDictMutex);
++#endif
+     return(ret);
+ }
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_lzma__sdk_C_CpuArch.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_lzma__sdk_C_CpuArch.c
new file mode 100644
index 000000000000..de897e5ab5f8
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_lzma__sdk_C_CpuArch.c
@@ -0,0 +1,44 @@
+--- src/3rdparty/chromium/third_party/lzma_sdk/C/CpuArch.c.orig	2022-09-04 11:56:14 UTC
++++ src/3rdparty/chromium/third_party/lzma_sdk/C/CpuArch.c
+@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP
+ BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; }
+ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; }
+ 
++#elif defined(__OpenBSD__)
+ 
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <machine/cpu.h>
++#include <machine/armreg.h>
++
++BoolInt CPU_IsSupported_NEON() { return 1; }
++
++#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
++  BoolInt CPU_IsSupported_ ## name1() { \
++    int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; \
++    size_t len = sizeof(uint64_t); \
++    uint64_t cpu_id = 0; \
++    if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) \
++      return 0; \
++    if (ID_AA64ISAR0_ ## name2(cpu_id) >= ID_AA64ISAR0_## name2 ##_BASE) \
++      return 1; \
++    return 0; \
++  }
++
++#define MY_HWCAP_CHECK_FUNC(name) \
++  MY_HWCAP_CHECK_FUNC_2(name, name)
++
++MY_HWCAP_CHECK_FUNC (CRC32)
++MY_HWCAP_CHECK_FUNC (SHA1)
++MY_HWCAP_CHECK_FUNC (SHA2)
++MY_HWCAP_CHECK_FUNC (AES)
++
+ #else // __APPLE__
+ 
+ #include <sys/auxv.h>
+ 
+-#if !defined(ARMV8_OS_FUCHSIA)
++#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__)
+ #define USE_HWCAP
+ #endif // !defined(ARMV8_OS_FUCHSIA)
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn
new file mode 100644
index 000000000000..22f2c7c85230
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_BUILD.gn
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/third_party/maldoca/BUILD.gn.orig	2023-04-05 11:05:06 UTC
++++ src/3rdparty/chromium/third_party/maldoca/BUILD.gn
+@@ -264,6 +264,10 @@ source_set("maldoca-public-headers") {
+     ":maldoca_chromium_config",
+     ":maldoca_flags",
+   ]
++
++  if (is_bsd) {
++    libs = [ "iconv" ]
++  }
+ }
+ 
+ static_library("maldoca") {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc
new file mode 100644
index 000000000000..012d63151999
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_base_get__runfiles__dir.cc
@@ -0,0 +1,32 @@
+--- src/3rdparty/chromium/third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/maldoca/src/maldoca/base/get_runfiles_dir.cc
+@@ -24,11 +24,6 @@
+ #error "__APPLE__ not supported."
+ #endif
+ 
+-#if defined(__FreeBSD__)
+-// TODO(#110) FreeBSD-specific headers.
+-#error "__FreeBSD__ not supported."
+-#endif
+-
+ #if defined(_WIN32)
+ #include <windows.h>
+ #define PATH_MAX MAX_PATH
+@@ -50,8 +45,6 @@ std::string GetExecutablePath() {
+   char exe_path[PATH_MAX] = {0};
+ #ifdef __APPLE__
+ #error "__APPLE__ not supported.";
+-#elif defined(__FreeBSD__)
+-#error "__FreeBSD__ not supported.";
+ #elif defined(_WIN32)
+   HMODULE hModule = GetModuleHandleW(NULL);
+   WCHAR wc_file_path[MAX_PATH] = {0};
+@@ -97,8 +90,6 @@ std::string GetExecutablePath() {
+ absl::Status IsDirectory(const std::string& name) {
+ #ifdef __APPLE__
+ #error "__APPLE__ not supported.";
+-#elif defined(__FreeBSD__)
+-#error "__FreeBSD__ not supported.";
+ #else
+   struct stat sbuf;
+   if (stat(name.c_str(), &sbuf) != 0) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc
new file mode 100644
index 000000000000..1124a33989b5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_maldoca_src_maldoca_service_common_process__doc__wrapper.cc
@@ -0,0 +1,29 @@
+--- src/3rdparty/chromium/third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/maldoca/src/maldoca/service/common/process_doc_wrapper.cc
+@@ -7,7 +7,7 @@
+ #include "build/build_config.h"
+ 
+ #include "base/files/file_util.h"
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/strings/string_util.h"
+ #else
+ #include "base/strings/string_util_win.h"
+@@ -21,7 +21,7 @@ namespace third_party_maldoca {
+ 
+ 
+ bool ExtensionEqualInCaseSensitive(base::FilePath file_path, std::string extension){
+-  #if defined(OS_LINUX)
++  #if defined(OS_LINUX) || BUILDFLAG(IS_BSD)
+   std::string file_extension = file_path.FinalExtension();
+   return base::CompareCaseInsensitiveASCII(file_extension, extension) == 0;
+   #else
+@@ -74,7 +74,7 @@ void AnalyzeOfficeDocument(base::File office_file,
+   maldoca::DocProcessor doc_processor(processor_config);
+ 
+   maldoca::ProcessDocumentRequest process_doc_request;
+-  #if defined(OS_LINUX)
++  #if defined(OS_LINUX) || BUILDFLAG(IS_BSD)
+   const std::string file_name = file_path.BaseName().value().c_str();
+   process_doc_request.set_file_name(file_name);
+   #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc
new file mode 100644
index 000000000000..5756f922f7d5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_material__color__utilities_src_cpp_palettes_tones.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/material_color_utilities/src/cpp/palettes/tones.cc
+@@ -14,6 +14,8 @@
+  * limitations under the License.
+  */
+ 
++#include <cmath>
++
+ #include "cpp/palettes/tones.h"
+ 
+ #include <cmath>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py
new file mode 100644
index 000000000000..8252cc43cf87
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_node_node.py
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/node/node.py.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/node/node.py
+@@ -35,6 +35,8 @@ def GetBinaryPath():
+   return os_path.join(os_path.dirname(__file__), *{
+     'Darwin': ('mac', darwin_name, 'bin', 'node'),
+     'Linux': ('linux', 'node-linux-x64', 'bin', 'node'),
++    'OpenBSD': ('openbsd', 'node-openbsd', 'bin', 'node'),
++    'FreeBSD': ('freebsd', 'node-freebsd', 'bin', 'node'),
+     'Windows': ('win', 'node.exe'),
+   }[platform.system()])
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp
index 841874419cc8..cefcd897251a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2022-09-24 10:57:32 UTC
+--- src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/pdfium/core/fxge/cfx_fontmapper.cpp
 @@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
      {"ForteMT", "Forte"},
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni
index 5a5ccd520ed8..838db5141373 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/third_party/pdfium/pdfium.gni.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/third_party/pdfium/pdfium.gni.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/pdfium/pdfium.gni
-@@ -42,7 +42,7 @@ declare_args() {
-   pdf_use_cxx20 = is_win && is_component_build
- 
-   # Build PDFium with PartitionAlloc as the memory allocator.
+@@ -46,7 +46,7 @@ declare_args() {
+   # PDFium will use PartitionAlloc partitions to separate strings, scalars,
+   # etc. from other allocations. However, the use of PartitionAlloc for new or
+   # malloc is controlled by args in build_overrides/partition_alloc.gni.
 -  pdf_use_partition_alloc = pdf_use_partition_alloc_override
 +  pdf_use_partition_alloc = pdf_use_partition_alloc_override && use_partition_alloc_as_malloc
  
-   # Build PDFium to use Skia (experimental) for all PDFium graphics.
-   # If enabled, coexists in build with AGG graphics and the default
+   # Temporary config allowing chromium to switch its location of the
+   # partition_alloc library. https://crbug.com/1467773
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h
new file mode 100644
index 000000000000..0479b60ec02a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_pdfium_third__party_base_compiler__specific.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/pdfium/third_party/base/compiler_specific.h.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/third_party/pdfium/third_party/base/compiler_specific.h
+@@ -17,7 +17,7 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ //   NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE [[clang::noinline]]
+ #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE __attribute__((noinline))
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_track__event__legacy.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
index 26507d13fb91..01cf9543d4f4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_track__event__legacy.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h.orig	2023-04-05 11:59:13 UTC
-+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/track_event_legacy.h
-@@ -267,7 +267,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
+--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig	2023-04-28 17:01:32 UTC
++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
+@@ -249,7 +249,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
  // are different. E.g. on Mac size_t is considered a different type from
  // uint64_t even though it has the same size and signedness.
  // Below we add overloads for those types that are known to cause ambiguity.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc
index 94ef36aa2b95..18afd297453e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_base_unix__socket.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig	2022-10-24 13:33:33 UTC
+--- src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/perfetto/src/base/unix_socket.cc
-@@ -42,7 +42,7 @@
+@@ -44,7 +44,7 @@
  #include <unistd.h>
  #endif
  
@@ -9,7 +9,7 @@
  #include <sys/ucred.h>
  #endif
  
-@@ -803,9 +803,13 @@ void UnixSocket::ReadPeerCredentialsPosix() {
+@@ -917,9 +917,13 @@ void UnixSocket::ReadPeerCredentialsPosix() {
      return;
    PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
new file mode 100644
index 000000000000..565f390bca05
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig	2023-10-14 11:56:57 UTC
++++ src/3rdparty/chromium/third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc
+@@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op,
+   } else if (const auto* i32 = std::get_if<int32_t>(&*val)) {
+     auto* start = static_cast<const int32_t*>(data_) + range.start;
+     TypedLinearSearch(*i32, start, op, builder);
++#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__)
++  } else if (const auto* db = std::get_if<long double>(&*val)) {
++    auto* start = static_cast<const long double*>(data_) + range.start;
++#else
+   } else if (const auto* db = std::get_if<double>(&*val)) {
+     auto* start = static_cast<const double*>(data_) + range.start;
++#endif
+     TypedLinearSearch(*db, start, op, builder);
+   } else {
+     PERFETTO_DFATAL("Invalid");
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc
index a9d978192472..6efdf1fe26fe 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_core_tracing__service__impl.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -3122,7 +3122,8 @@ bool TracingServiceImpl::SnapshotClocks(
+@@ -3213,7 +3213,8 @@ bool TracingServiceImpl::SnapshotClocks(
  
  #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
      !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) &&   \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_ipc_memfd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_ipc_memfd.cc
new file mode 100644
index 000000000000..fb3732693530
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_ipc_memfd.cc
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/perfetto/src/tracing/ipc/memfd.cc.orig	2023-09-13 18:23:44 UTC
++++ src/3rdparty/chromium/third_party/perfetto/src/tracing/ipc/memfd.cc
+@@ -20,7 +20,8 @@
+ 
+ #define PERFETTO_MEMFD_ENABLED()             \
+   PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
+-      PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX)
++      (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && \
++      !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD))
+ 
+ #if PERFETTO_MEMFD_ENABLED()
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc
new file mode 100644
index 000000000000..fdff02b8b3c7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_src_tracing_track.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/perfetto/src/tracing/track.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/third_party/perfetto/src/tracing/track.cc
+@@ -143,7 +143,7 @@ namespace internal {
+ namespace {
+ 
+ uint64_t GetProcessStartTime() {
+-#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+   std::string stat;
+   if (!base::ReadFile("/proc/self/stat", &stat))
+     return 0u;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp
deleted file mode 100644
index 85318d909ea7..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_core_SkCpu.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp.orig	2023-11-20 16:08:07 UTC
-+++ src/3rdparty/chromium/third_party/skia/src/core/SkCpu.cpp
-@@ -73,6 +73,42 @@
-         return features;
-     }
- 
-+#elif defined(SK_CPU_ARM64) && defined(__OpenBSD__)
-+    #include <sys/sysctl.h>
-+    #include <machine/cpu.h>
-+    #include <machine/armreg.h>
-+
-+    static uint32_t read_cpu_features() {
-+      int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+      size_t len = sizeof(uint64_t);
-+      uint64_t cpu_id = 0;
-+      uint32_t features = 0;
-+
-+      if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) == 0) {
-+        if (ID_AA64ISAR0_CRC32(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
-+          features |= SkCpu::CRC32;
-+      }
-+
-+      return features;
-+    }
-+
-+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)
-+    #include <machine/armreg.h>
-+    #ifndef ID_AA64ISAR0_CRC32_VAL
-+    #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32
-+    #endif
-+
-+    static uint32_t read_cpu_features() {
-+      uint32_t features = 0;
-+      uint64_t id_aa64isar0;
-+
-+      id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);
-+      if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
-+        features |= SkCpu::CRC32;
-+      }
-+      return features;
-+    }
-+
- #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
-     #include <sys/auxv.h>
- 
-@@ -110,6 +146,23 @@
-             if (std::size(buf) != midr_el1.read(buf, std::size(buf))
-                           || 0 == memcmp(kMongoose3, buf, std::size(buf))) {
-                 features &= ~(SkCpu::ASIMDHP);
-+            }
-+        }
-+        return features;
-+    }
-+
-+#elif defined(SK_CPU_ARM32) && defined(__FreeBSD__)
-+    #include <sys/auxv.h>
-+
-+    static uint32_t read_cpu_features() {
-+        unsigned long hwcaps = 0;
-+        uint32_t features = 0;
-+
-+        elf_aux_info(AT_HWCAP, (void *)&hwcaps, sizeof hwcaps);
-+        if (hwcaps & HWCAP_NEON) {
-+            features |= SkCpu::NEON;
-+            if (hwcaps & HWCAP_VFPv4) {
-+                features |= SkCpu::NEON_FMA|SkCpu::VFP_FP16;
-             }
-         }
-         return features;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c
index a01061bd59ab..751b46f30d9d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_sqlite_src_amalgamation_sqlite3.c
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig	2023-04-20 13:16:39 UTC
+--- src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/third_party/sqlite/src/amalgamation/sqlite3.c
-@@ -43595,7 +43595,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -43843,7 +43843,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
    memset(zBuf, 0, nBuf);
    randomnessPid = osGetpid(0);
  #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS)
@@ -13,7 +13,7 @@
      int fd, got;
      fd = robust_open("/dev/urandom", O_RDONLY, 0);
      if( fd<0 ){
-@@ -43610,6 +43615,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
+@@ -43858,6 +43863,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
        robust_close(0, fd, __LINE__);
      }
    }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Reactor_Debug.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Reactor_Debug.cpp
new file mode 100644
index 000000000000..7a5739bd8b76
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Reactor_Debug.cpp
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/swiftshader/src/Reactor/Debug.cpp.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/swiftshader/src/Reactor/Debug.cpp
+@@ -46,7 +46,7 @@ namespace {
+ 
+ bool IsUnderDebugger()
+ {
+-#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__)
++#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ 	static bool checked = false;
+ 	static bool res = false;
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Configurator.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Configurator.cpp
new file mode 100644
index 000000000000..4f44dbe0672b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Configurator.cpp
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/third_party/swiftshader/src/System/Configurator.cpp.orig	2022-06-17 14:20:10 UTC
++++ src/3rdparty/chromium/third_party/swiftshader/src/System/Configurator.cpp
+@@ -38,6 +38,9 @@ namespace sw {
+ 
+ Configurator::Configurator(const std::string &filePath)
+ {
++#if defined(__OpenBSD__) || defined(__FreeBSD__)
++	return;
++#endif
+ 	std::fstream file(filePath, std::ios::in);
+ 	if(file.fail())
+ 	{
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Linux_MemFd.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Linux_MemFd.cpp
new file mode 100644
index 000000000000..b29f4c1c736a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_System_Linux_MemFd.cpp
@@ -0,0 +1,37 @@
+--- src/3rdparty/chromium/third_party/swiftshader/src/System/Linux/MemFd.cpp.orig	2023-09-13 18:23:44 UTC
++++ src/3rdparty/chromium/third_party/swiftshader/src/System/Linux/MemFd.cpp
+@@ -25,6 +25,7 @@
+ #	define MFD_CLOEXEC 0x0001U
+ #endif
+ 
++#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
+ #if __aarch64__
+ #	define __NR_memfd_create 279
+ #elif __arm__
+@@ -36,6 +37,7 @@
+ #elif __x86_64__
+ #	define __NR_memfd_create 319
+ #endif /* __NR_memfd_create__ */
++#endif
+ 
+ LinuxMemFd::~LinuxMemFd()
+ {
+@@ -63,13 +65,17 @@ bool LinuxMemFd::allocate(const char *name, size_t siz
+ {
+ 	close();
+ 
+-#ifndef __NR_memfd_create
++#if !defined(__NR_memfd_create) || defined(__OpenBSD__)
+ 	TRACE("memfd_create() not supported on this system!");
+ 	return false;
+ #else
+ 	// In the event of no system call this returns -1 with errno set
+ 	// as ENOSYS.
++#if defined(__FreeBSD__)
++	fd_ = memfd_create(name, MFD_CLOEXEC);
++#else
+ 	fd_ = syscall(__NR_memfd_create, name, MFD_CLOEXEC);
++#endif
+ 	if(fd_ < 0)
+ 	{
+ 		TRACE("memfd_create() returned %d: %s", errno, strerror(errno));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
new file mode 100644
index 000000000000..9abee3a057df
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_Vulkan_VkSemaphoreExternalLinux.hpp
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp.orig	2022-02-07 13:39:41 UTC
++++ src/3rdparty/chromium/third_party/swiftshader/src/Vulkan/VkSemaphoreExternalLinux.hpp
+@@ -49,13 +49,17 @@ class SharedSemaphore (public)
+ 	{
+ 		pthread_mutexattr_t mattr;
+ 		pthread_mutexattr_init(&mattr);
++#if 0
+ 		pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
++#endif
+ 		pthread_mutex_init(&mutex, &mattr);
+ 		pthread_mutexattr_destroy(&mattr);
+ 
+ 		pthread_condattr_t cattr;
+ 		pthread_condattr_init(&cattr);
++#if 0
+ 		pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
++#endif
+ 		pthread_cond_init(&cond, &cattr);
+ 		pthread_condattr_destroy(&cattr);
+ 	}
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_WSI_libXCB.cpp b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_WSI_libXCB.cpp
new file mode 100644
index 000000000000..befa5de154a5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_swiftshader_src_WSI_libXCB.cpp
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/third_party/swiftshader/src/WSI/libXCB.cpp.orig	2023-03-09 06:31:50 UTC
++++ src/3rdparty/chromium/third_party/swiftshader/src/WSI/libXCB.cpp
+@@ -57,7 +57,7 @@ LibXcbExports *LibXCB::loadExports()
+ 		}
+ 		else
+ 		{
+-			libxcb = loadLibrary("libxcb.so.1");
++			libxcb = loadLibrary("libxcb.so");
+ 		}
+ 
+ 		if(getProcAddress(RTLD_DEFAULT, "xcb_shm_query_version"))  // Search the global scope for pre-loaded XCB library.
+@@ -66,7 +66,7 @@ LibXcbExports *LibXCB::loadExports()
+ 		}
+ 		else
+ 		{
+-			libshm = loadLibrary("libxcb-shm.so.0");
++			libshm = loadLibrary("libxcb-shm.so");
+ 		}
+ 
+ 		return LibXcbExports(libxcb, libshm);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_BUILD.gn
new file mode 100644
index 000000000000..0ec45d02194b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_BUILD.gn
@@ -0,0 +1,15 @@
+--- src/3rdparty/chromium/third_party/test_fonts/fontconfig/BUILD.gn.orig	2022-03-01 11:59:41 UTC
++++ src/3rdparty/chromium/third_party/test_fonts/fontconfig/BUILD.gn
+@@ -26,7 +26,11 @@ if (is_linux || is_chromeos) {
+ 
+   copy("fonts_conf") {
+     sources = [ "fonts.conf" ]
+-    outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ]
++    if (is_freebsd) {
++      outputs = [ "$root_out_dir/usr/local/etc/fonts/{{source_file_part}}" ]
++    } else {
++      outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ]
++    }
+   }
+ 
+   if (current_toolchain == host_toolchain) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
new file mode 100644
index 000000000000..2166d1d0e2eb
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_fontconfig__util__linux.cc
@@ -0,0 +1,27 @@
+--- src/3rdparty/chromium/third_party/test_fonts/fontconfig/fontconfig_util_linux.cc.orig	2022-03-25 21:59:56 UTC
++++ src/3rdparty/chromium/third_party/test_fonts/fontconfig/fontconfig_util_linux.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include "build/build_config.h"
++
+ #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h"
+ 
+ #include <fontconfig/fontconfig.h>
+@@ -15,11 +17,15 @@
+ namespace test_fonts {
+ 
+ std::string GetSysrootDir() {
++#if BUILDFLAG(IS_BSD)
++  return std::string(".");
++#else
+   char buf[PATH_MAX + 1];
+   auto count = readlink("/proc/self/exe", buf, PATH_MAX);
+   assert(count > 0);
+   buf[count] = '\0';
+   return dirname(buf);
++#endif
+ }
+ 
+ void SetUpFontconfig() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
new file mode 100644
index 000000000000..ba43c4f788ae
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_test__fonts_fontconfig_generate__fontconfig__caches.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc.orig	2023-04-05 11:05:06 UTC
++++ src/3rdparty/chromium/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
+@@ -56,7 +56,7 @@ int main() {
+   FcFini();
+ 
+   // Check existence of intended fontconfig cache file.
+-  auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9";
++  auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION;
+   bool cache_exists = access(cache.c_str(), F_OK) == 0;
+   return !cache_exists;
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn
index a10cd1178266..bf385233e1f8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_BUILD.gn
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
 @@ -59,7 +59,7 @@ config("vulkan_internal_config") {
      defines += [
@@ -8,4 +8,4 @@
 +      "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"",
      ]
    }
- }
+   if (!vulkan_loader_shared) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
index 615a939c5599..78722a23698c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
-@@ -294,7 +294,15 @@ static inline char *loader_platform_executable_path(ch
+@@ -304,7 +304,15 @@ static inline char *loader_platform_executable_path(ch
  
      return buffer;
  }
@@ -15,5 +15,5 @@
 +}
 +#elif defined(__Fuchsia__)
  static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; }
- #elif defined(__QNXNTO__)
+ #elif defined(__QNX__)
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
index d759643467ec..262b38b443fc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig	2023-03-09 06:31:50 UTC
-+++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h
-@@ -2703,7 +2703,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
+--- src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+@@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
  
      return memalign(alignment, size);
  }
 -#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
 +#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
- #define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN
- #elif defined(__GNU_LIBRARY__)
- #  if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 16)
+ #include <cstdlib>
+ 
+ #if defined(__APPLE__)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
index 51abae4160d2..79fb83e67a78 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_vulkan__memory__allocator_include_vk__mem__alloc.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h
 @@ -2507,7 +2507,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size)
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn
new file mode 100644
index 000000000000..e7d1cf81aa50
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_wayland_BUILD.gn
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/third_party/wayland/BUILD.gn.orig	2023-02-08 15:40:14 UTC
++++ src/3rdparty/chromium/third_party/wayland/BUILD.gn
+@@ -22,6 +22,11 @@ config("wayland_config") {
+     "src/src",
+   ]
+ 
++  if (is_bsd) {
++    include_dirs += [ "/usr/local/include/libepoll-shim" ]
++    libs = [ "epoll-shim" ]
++  }
++
+   # Client/Server headers are automatically generated. Though, we still need
+   # to pass the path where these headers are located.
+   include_dirs += [ "$root_gen_dir/third_party/wayland/src/protocol" ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn
index 8b8bdc8af8aa..ab2fc3d5a55d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/webrtc/BUILD.gn.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/BUILD.gn
-@@ -211,6 +211,9 @@ config("common_inherited_config") {
+@@ -216,6 +216,9 @@ config("common_inherited_config") {
    if (is_linux || is_chromeos) {
      defines += [ "WEBRTC_LINUX" ]
    }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn
index 9b9fabb12f88..bbb9e9aecb9a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_audio__device_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -300,7 +300,7 @@ rtc_library("audio_device_impl") {
+@@ -349,7 +349,7 @@ rtc_library("audio_device_impl") {
      if (rtc_use_dummy_audio_file_devices) {
        defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ]
      } else {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
new file mode 100644
index 000000000000..d68e7a9f0a52
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_wayland_egl__dmabuf.cc
@@ -0,0 +1,18 @@
+--- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc.orig	2023-08-23 11:41:11 UTC
++++ src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc
+@@ -10,11 +10,15 @@
+ 
+ #include "modules/desktop_capture/linux/wayland/egl_dmabuf.h"
+ 
++#if !defined(WEBRTC_BSD)
+ #include <asm/ioctl.h>
++#endif
+ #include <dlfcn.h>
+ #include <fcntl.h>
+ #include <libdrm/drm_fourcc.h>
++#if !defined(WEBRTC_BSD)
+ #include <linux/types.h>
++#endif
+ #include <spa/param/video/format-utils.h>
+ #include <unistd.h>
+ #include <xf86drm.h>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
index c3a3263e64d8..ced8e98eea09 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
-@@ -212,6 +212,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
+@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
  void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
    Visual* default_visual = attributes.visual;
    int default_depth = attributes.depth;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc
deleted file mode 100644
index 7c8461b8c921..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-commit 267f9bdd53a37d1cbee760d5af07880198e1beef
-Author: Tommi <tommi@webrtc.org>
-Date:   2023-12-21T14:08:26+01:00
-
-    Update LegacyStatsCollector to conform with Wc++11-narrowing
-    
-    Bug: none
-    Change-Id: Ida6a1af5c324473a55ea4f3b143862ea016ff50a
-    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/332240
-    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
-    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
-    Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
-    Reviewed-by: Alexander Kornienko <alexfh@google.com>
-    Reviewed-by: Henrik Boström <hbos@webrtc.org>
-    Cr-Commit-Position: refs/heads/main@{#41432}
-
---- src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc.orig	2023-11-20 16:08:07 UTC
-+++ src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
-@@ -189,9 +189,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& in
-       {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate},
-       {StatsReport::kStatsValueNamePreemptiveExpandRate,
-        info.preemptive_expand_rate},
--      {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy},
-+      {StatsReport::kStatsValueNameTotalAudioEnergy,
-+       static_cast<float>(info.total_output_energy)},
-       {StatsReport::kStatsValueNameTotalSamplesDuration,
--       info.total_output_duration}};
-+       static_cast<float>(info.total_output_duration)}};
- 
-   const IntForAdd ints[] = {
-       {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms},
-@@ -245,9 +246,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info
-   SetAudioProcessingStats(report, info.apm_statistics);
- 
-   const FloatForAdd floats[] = {
--      {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
-+      {StatsReport::kStatsValueNameTotalAudioEnergy,
-+       static_cast<float>(info.total_input_energy)},
-       {StatsReport::kStatsValueNameTotalSamplesDuration,
--       info.total_input_duration}};
-+       static_cast<float>(info.total_input_duration)}};
- 
-   RTC_DCHECK_GE(info.audio_level, 0);
-   const IntForAdd ints[] = {
-@@ -341,7 +343,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& in
-       {StatsReport::kStatsValueNamePlisSent, info.plis_sent},
-       {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
-       {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
--      {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
-+      {StatsReport::kStatsValueNameFramesDecoded,
-+       static_cast<int>(info.frames_decoded)},
-   };
- 
-   for (const auto& i : ints)
-@@ -385,15 +388,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info
-        info.encode_usage_percent},
-       {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
-       {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
--      {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)},
-+      {StatsReport::kStatsValueNameFrameRateInput,
-+       static_cast<int>(round(info.framerate_input))},
-       {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
-       {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
--      {StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd},
-+      {StatsReport::kStatsValueNameNacksReceived,
-+       static_cast<int>(info.nacks_rcvd)},
-       {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
-       {StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
-       {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
--      {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
--      {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
-+      {StatsReport::kStatsValueNameFramesEncoded,
-+       static_cast<int>(info.frames_encoded)},
-+      {StatsReport::kStatsValueNameHugeFramesSent,
-+       static_cast<int>(info.huge_frames_sent)},
-   };
- 
-   for (const auto& i : ints)
-@@ -782,19 +789,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoRe
-                 AddCandidateReport(remote_candidate_stats, false)->id());
- 
-   const Int64ForAdd int64s[] = {
--      {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes},
--      {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes},
--      {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets},
--      {StatsReport::kStatsValueNameRtt, info.rtt},
-+      {StatsReport::kStatsValueNameBytesReceived,
-+       static_cast<int64_t>(info.recv_total_bytes)},
-+      {StatsReport::kStatsValueNameBytesSent,
-+       static_cast<int64_t>(info.sent_total_bytes)},
-+      {StatsReport::kStatsValueNamePacketsSent,
-+       static_cast<int64_t>(info.sent_total_packets)},
-+      {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)},
-       {StatsReport::kStatsValueNameSendPacketsDiscarded,
--       info.sent_discarded_packets},
-+       static_cast<int64_t>(info.sent_discarded_packets)},
-       {StatsReport::kStatsValueNameSentPingRequestsTotal,
--       info.sent_ping_requests_total},
-+       static_cast<int64_t>(info.sent_ping_requests_total)},
-       {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
--       info.sent_ping_requests_before_first_response},
--      {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses},
--      {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests},
--      {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses},
-+       static_cast<int64_t>(info.sent_ping_requests_before_first_response)},
-+      {StatsReport::kStatsValueNameSentPingResponses,
-+       static_cast<int64_t>(info.sent_ping_responses)},
-+      {StatsReport::kStatsValueNameRecvPingRequests,
-+       static_cast<int64_t>(info.recv_ping_requests)},
-+      {StatsReport::kStatsValueNameRecvPingResponses,
-+       static_cast<int64_t>(info.recv_ping_responses)},
-   };
-   for (const auto& i : int64s)
-     report->AddInt64(i.name, i.value);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_net__test__helpers.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_net__test__helpers.cc
new file mode 100644
index 000000000000..296ec5680e28
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_net__test__helpers.cc
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/third_party/webrtc/rtc_base/net_test_helpers.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/third_party/webrtc/rtc_base/net_test_helpers.cc
+@@ -21,6 +21,7 @@
+ #endif
+ #if defined(WEBRTC_POSIX) && !defined(__native_client__)
+ #include <arpa/inet.h>
++#include <sys/socket.h>
+ #if defined(WEBRTC_ANDROID)
+ #include "rtc_base/ifaddrs_android.h"
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc
index 27858ffdac55..38d531526387 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_network.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/network.cc
-@@ -288,7 +288,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -292,7 +292,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
    }
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc
index 240bdcbb2e31..b3621f020698 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -54,7 +54,7 @@
+@@ -56,7 +56,7 @@
  #include "rtc_base/time_utils.h"
  #include "system_wrappers/include/field_trial.h"
  
@@ -9,7 +9,7 @@
  #include <linux/sockios.h>
  #endif
  
-@@ -73,7 +73,7 @@ typedef void* SockOptArg;
+@@ -75,7 +75,7 @@ typedef void* SockOptArg;
  
  #endif  // WEBRTC_POSIX
  
@@ -18,7 +18,7 @@
  
  int64_t GetSocketRecvTimestamp(int socket) {
    struct timeval tv_ioctl;
-@@ -308,7 +308,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
+@@ -310,7 +310,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) 
      return -1;
    }
    if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
      *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -326,7 +326,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -328,7 +328,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
    if (TranslateOption(opt, &slevel, &sopt) == -1)
      return -1;
    if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
      value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
  #endif
    } else if (opt == OPT_DSCP) {
-@@ -354,7 +354,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -356,7 +356,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
  int PhysicalSocket::Send(const void* pv, size_t cb) {
    int sent = DoSend(
        s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
        // Suppress SIGPIPE. Without this, attempting to send on a socket whose
        // other end is closed will result in a SIGPIPE signal being raised to
        // our process, which by default will terminate the process, which we
-@@ -383,7 +383,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -385,7 +385,7 @@ int PhysicalSocket::SendTo(const void* buffer,
    size_t len = addr.ToSockAddrStorage(&saddr);
    int sent =
        DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
                 // Suppress SIGPIPE. See above for explanation.
                 MSG_NOSIGNAL,
  #else
-@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -643,7 +643,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
        *slevel = IPPROTO_IP;
        *sopt = IP_DONTFRAGMENT;
        break;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h
index d24fa878f15f..2ad61cfbad04 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_physical__socket__server.h
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig	2022-10-24 13:33:33 UTC
+--- src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.h
-@@ -12,7 +12,7 @@
- #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
- 
+@@ -14,7 +14,7 @@
  #include "api/units/time_delta.h"
--#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ 
+ #if defined(WEBRTC_POSIX)
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ // On Linux, use epoll.
  #include <sys/epoll.h>
  #define WEBRTC_USE_EPOLL 1
- #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni
new file mode 100644
index 000000000000..e47da639e240
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_widevine_cdm_widevine.gni
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/third_party/widevine/cdm/widevine.gni.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/third_party/widevine/cdm/widevine.gni
+@@ -27,6 +27,8 @@ library_widevine_cdm_available =
+     (is_chromeos &&
+      (target_cpu == "x64" || target_cpu == "arm" || target_cpu == "arm64")) ||
+     (target_os == "linux" && target_cpu == "x64") ||
++    (target_os == "openbsd" && target_cpu == "x64") ||
++    (target_os == "freebsd" && target_cpu == "x64") ||
+     (target_os == "mac" && (target_cpu == "x64" || target_cpu == "arm64")) ||
+     (target_os == "win" &&
+      (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64"))
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn
index b99d7342d389..d64f15ad9b82 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn
@@ -1,6 +1,26 @@
---- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/third_party/zlib/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/third_party/zlib/BUILD.gn
-@@ -455,7 +455,7 @@ static_library("bundled_minizip") {
+@@ -139,7 +139,7 @@ if (use_arm_neon_optimizations) {
+     defines = [ "CRC32_ARMV8_CRC32" ]
+     if (is_android) {
+       defines += [ "ARMV8_OS_ANDROID" ]
+-    } else if (is_linux || is_chromeos) {
++    } else if ((is_linux || is_chromeos) && !is_bsd) {
+       defines += [ "ARMV8_OS_LINUX" ]
+     } else if (is_mac) {
+       defines += [ "ARMV8_OS_MACOS" ]
+@@ -149,6 +149,10 @@ if (use_arm_neon_optimizations) {
+       defines += [ "ARMV8_OS_FUCHSIA" ]
+     } else if (is_win) {
+       defines += [ "ARMV8_OS_WINDOWS" ]
++    } else if (is_openbsd) {
++      defines += [ "ARMV8_OS_OPENBSD" ]
++    } else if (is_freebsd) {
++      defines += [ "ARMV8_OS_FREEBSD" ]
+     } else {
+       assert(false, "Unsupported ARM OS")
+     }
+@@ -462,7 +466,7 @@ static_library("bundled_minizip") {
      ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c
new file mode 100644
index 000000000000..38c136535f1c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c
@@ -0,0 +1,50 @@
+--- src/3rdparty/chromium/third_party/zlib/cpu_features.c.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/third_party/zlib/cpu_features.c
+@@ -35,7 +35,8 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+ 
+ #ifndef CPU_NO_SIMD
+ 
+-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS)
++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_IOS) || \
++    defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD)
+ #include <pthread.h>
+ #endif
+ 
+@@ -52,6 +53,10 @@ int ZLIB_INTERNAL x86_cpu_enable_avx512 = 0;
+ #include <windows.h>
+ #elif defined(ARMV8_OS_IOS)
+ #include <sys/sysctl.h>
++#elif defined(ARMV8_OS_OPENBSD)
++#include <sys/sysctl.h>
++#include <machine/cpu.h>
++#include <machine/armreg.h>
+ #elif !defined(_MSC_VER)
+ #include <pthread.h>
+ #else
+@@ -62,7 +67,7 @@ static void _cpu_check_features(void);
+ static void _cpu_check_features(void);
+ #endif
+ 
+-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || defined(__ARM_NEON__) || defined(__ARM_NEON)
++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_IOS) || defined(__ARM_NEON__) || defined(__ARM_NEON) || defined(ARMV8_OS_OPENBSD) || defined(ARMV8_OS_FREEBSD)
+ #if !defined(ARMV8_OS_MACOS)
+ // _cpu_check_features() doesn't need to do anything on mac/arm since all
+ // features are known at build time, so don't call it.
+@@ -115,6 +120,17 @@ static void _cpu_check_features(void)
+     unsigned long features = getauxval(AT_HWCAP2);
+     arm_cpu_enable_crc32 = !!(features & HWCAP2_CRC32);
+     arm_cpu_enable_pmull = !!(features & HWCAP2_PMULL);
++#elif defined(ARMV8_OS_OPENBSD)
++    int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
++    uint64_t cpu_id = 0;
++    size_t len = sizeof(cpu_id);
++    if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
++        return;
++    if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL)
++        arm_cpu_enable_pmull = 1;
++
++    if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_CRC32_BASE)
++        arm_cpu_enable_crc32 = 1;
+ #elif defined(ARMV8_OS_FUCHSIA)
+     uint32_t features;
+     zx_status_t rc = zx_system_get_features(ZX_FEATURE_KIND_CPU, &features);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py
index abbee2641c5b..7b114a5793ba 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_json__schema__compiler_feature__compiler.py
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/tools/json_schema_compiler/feature_compiler.py
-@@ -271,6 +271,8 @@ FEATURE_GRAMMAR = ({
+@@ -272,6 +272,8 @@ FEATURE_GRAMMAR = ({
                  'linux': 'Feature::LINUX_PLATFORM',
                  'mac': 'Feature::MACOSX_PLATFORM',
                  'win': 'Feature::WIN_PLATFORM',
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py
index 0dfa9b3a4808..eece09516469 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_licenses_licenses.py
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/tools/licenses/licenses.py.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/tools/licenses/licenses.py.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/tools/licenses/licenses.py
-@@ -618,6 +618,8 @@ def _GnBinary():
+@@ -751,6 +751,8 @@ def _GnBinary():
    exe = 'gn'
    if sys.platform.startswith('linux'):
      subdir = 'linux64'
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
index c6354c6a16d6..a6355ce7ed8d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -45,7 +45,7 @@ group("telemetry_chrome_test") {
+@@ -47,7 +47,7 @@ group("telemetry_chrome_test") {
      data_deps += [ "//chrome:reorder_imports" ]
    }
  
@@ -9,7 +9,7 @@
      data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
  
      # CrOS currently has issues with the locally compiled version of
-@@ -186,7 +186,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -172,7 +172,7 @@ group("telemetry_chrome_test_without_chrome") {
    ]
  
    # Cr-Fuchsia doesn't support breakpad.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py
index 24c78f4641d1..30a967525268 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_tools_protoc__wrapper_protoc__wrapper.py
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/tools/protoc_wrapper/protoc_wrapper.py
-@@ -175,15 +175,19 @@ def main(argv):
+@@ -179,15 +179,19 @@ def main(argv):
      if not options.exclude_imports:
        protoc_cmd += ["--include_imports"]
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h
index 7924af9905e5..d028631ecb43 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_clipboard_clipboard__constants.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h.orig	2023-02-08 09:03:45 UTC
 +++ src/3rdparty/chromium/ui/base/clipboard/clipboard_constants.h
 @@ -47,7 +47,7 @@ extern const char kMimeTypeDataTransferEndpoint[];
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc
index 79de80575550..3c8c2dc646ff 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.cc
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/cursor/cursor_factory.cc
-@@ -89,7 +89,7 @@ void CursorFactory::ObserveThemeChanges() {
- 
- void CursorFactory::SetDeviceScaleFactor(float scale) {}
+@@ -98,7 +98,7 @@ void CursorFactory::ObserveThemeChanges() {
+   NOTIMPLEMENTED();
+ }
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h
index e07f7a7e8cea..a491a495b6dd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_cursor_cursor__factory.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/base/cursor/cursor_factory.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/base/cursor/cursor_factory.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/cursor/cursor_factory.h
-@@ -88,7 +88,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory {
+@@ -93,7 +93,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory {
    base::ObserverList<CursorFactoryObserver>::Unchecked observers_;
  };
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc
index 6b838ecccde6..5edfe0015072 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_dragdrop_os__exchange__data__provider__factory.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/base/dragdrop/os_exchange_data_provider_factory.cc
 @@ -7,7 +7,7 @@
  #include "base/notreached.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc
index 138eaeb23614..d46504db82ba 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.cc
-@@ -167,7 +167,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
+@@ -171,7 +171,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
    return false;
  }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h
index 7a662ed6b560..9d7f2c1f6dc4 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_fake__text__input__client.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/ime/fake_text_input_client.h
-@@ -73,7 +73,7 @@ class FakeTextInputClient : public TextInputClient {
+@@ -74,7 +74,7 @@ class FakeTextInputClient : public TextInputClient {
    void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override;
    ukm::SourceId GetClientSourceForMetrics() const override;
    bool ShouldDoLearning() override;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h
index e9fc52934e5a..6c1bcf28e30b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ime_text__input__client.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/ui/base/ime/text_input_client.h.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/ui/base/ime/text_input_client.h
-@@ -242,7 +242,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient
+@@ -265,7 +265,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient
    // fields that are considered 'private' (e.g. in incognito tabs).
    virtual bool ShouldDoLearning() = 0;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc
index 720099c22c09..06c7bc0d03bd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_resource_resource__bundle.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/ui/base/resource/resource_bundle.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/resource/resource_bundle.cc
-@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -926,7 +926,7 @@ void ResourceBundle::ReloadFonts() {
  }
  
  ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
@@ -8,4 +8,4 @@
 +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
    return max_scale_factor_;
  #else
-   return GetSupportedResourceScaleFactors().back();
+   return GetMaxSupportedResourceScaleFactor();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc
index 5b1a5e7a453c..fe398bc13563 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.cc
@@ -1,6 +1,15 @@
---- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/ui_base_features.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/base/ui_base_features.cc
-@@ -210,7 +210,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat
+@@ -135,7 +135,7 @@ bool AreF11AndF12ShortcutsEnabled() {
+ }
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kRedundantImeCompositionClearing,
+              "RedundantImeCompositionClearing",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -234,7 +234,7 @@ CONSTINIT const base::Feature kExperimentalFlingAnimat
               "ExperimentalFlingAnimation",
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -9,7 +18,7 @@
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
       !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -315,7 +315,7 @@ CONSTINIT const base::Feature kEyeDropper(
+@@ -346,7 +346,7 @@ CONSTINIT const base::Feature kEyeDropper(
  // milestones.
  CONSTINIT const base::Feature kEyeDropper(
               "EyeDropper",
@@ -18,3 +27,12 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
+@@ -565,7 +565,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() {
+   return level;
+ }
+ 
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kWebUiSystemFont,
+              "WebUiSystemFont",
+              base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h
new file mode 100644
index 000000000000..b987c796364c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__features.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/ui/base/ui_base_features.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/ui/base/ui_base_features.h
+@@ -138,7 +138,7 @@ BASE_DECLARE_FEATURE(kSupportF11AndF12KeyShortcuts);
+ COMPONENT_EXPORT(UI_BASE_FEATURES) bool AreF11AndF12ShortcutsEnabled();
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ BASE_DECLARE_FEATURE(kRedundantImeCompositionClearing);
+ #endif  // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+@@ -273,7 +273,7 @@ enum class ChromeRefresh2023Level {
+ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ ChromeRefresh2023Level GetChromeRefresh2023Level();
+ 
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kWebUiSystemFont);
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc
new file mode 100644
index 000000000000..77cebb838ff9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.cc
@@ -0,0 +1,18 @@
+--- src/3rdparty/chromium/ui/base/ui_base_switches.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/ui/base/ui_base_switches.cc
+@@ -31,13 +31,13 @@ const char kShowMacOverlayBorders[] = "show-mac-overla
+ const char kEnableResourcesFileSharing[] = "enable-resources-file-sharing";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Specifies system font family name. Improves determenism when rendering
+ // pages in headless mode.
+ const char kSystemFontFamily[] = "system-font-family";
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Specify the toolkit used to construct the Linux GUI.
+ const char kUiToolkitFlag[] = "ui-toolkit";
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h
new file mode 100644
index 000000000000..4c9288b0f702
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_ui__base__switches.h
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/ui/base/ui_base_switches.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/ui/base/ui_base_switches.h
+@@ -27,11 +27,11 @@ COMPONENT_EXPORT(UI_BASE) extern const char kShowMacOv
+ COMPONENT_EXPORT(UI_BASE) extern const char kEnableResourcesFileSharing[];
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE) extern const char kSystemFontFamily[];
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE) extern const char kUiToolkitFlag[];
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc
index 12b5a81f1fd8..b5511aa3402b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc
@@ -1,6 +1,15 @@
---- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc
-@@ -214,7 +214,7 @@ std::string GetFontFamily() {
+@@ -41,7 +41,7 @@ std::string GetFontFamilyMd() {
+ constexpr float kMaxScaleFactor = 1000.0f;
+ 
+ std::string GetFontFamilyMd() {
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   if (base::FeatureList::IsEnabled(features::kWebUiSystemFont)) {
+     return GetFontFamily();
+   }
+@@ -221,7 +221,7 @@ std::string GetFontFamily() {
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc
index 05cf581b5e9e..0553168d37d7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.cc
 @@ -13,7 +13,7 @@
  #include "ui/gfx/geometry/point.h"
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -60,7 +60,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create
+@@ -62,7 +62,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create
  }
  
  void X11CursorFactory::ObserveThemeChanges() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h
index f9b74e96aca2..650ac821a0cb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__factory.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/ui/base/x/x11_cursor_factory.h
 @@ -20,7 +20,7 @@ namespace ui {
  class X11Cursor;
@@ -9,7 +9,7 @@
  class LinuxUi;
  #endif
  
-@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory
+@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory
  
    std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc
index e016355a3077..d525415d88bc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__cursor__loader.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig	2022-10-24 13:33:33 UTC
+--- src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/base/x/x11_cursor_loader.cc
 @@ -32,7 +32,7 @@
  #include "ui/gfx/x/xproto.h"
@@ -13,7 +13,7 @@
      void operator()(void* ptr) const { dlclose(ptr); }
    };
  
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so", RTLD_LAZY));
 +#else
    std::unique_ptr<void, DlCloser> lib(dlopen("libXcursor.so.1", RTLD_LAZY));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h
index 647b25e49a43..6abcc24d15b8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_color_color__id.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/color/color_id.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/color/color_id.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/color/color_id.h
-@@ -435,7 +435,7 @@
+@@ -567,7 +567,7 @@
    E_CPONLY(kColorNativeColor6) \
    E_CPONLY(kColorNativeBaseColor) \
    E_CPONLY(kColorNativeSecondaryColor)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc
index 6f1bdae0e629..f5f4dcb524d1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/compositor/compositor.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/compositor/compositor.cc
-@@ -886,7 +886,7 @@ void Compositor::OnResume() {
+@@ -896,7 +896,7 @@ void Compositor::OnResume() {
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h
index 268a48a59e0d..73b1e1444a7c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/compositor/compositor.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/compositor/compositor.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/ui/compositor/compositor.h
-@@ -453,7 +453,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -458,7 +458,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc
index 6d82a0c801b0..a3c44d8dc29d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_devices_x11_device__data__manager__x11.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/ui/events/devices/x11/device_data_manager_x11.cc
-@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
  }
  
  void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) {
 +  NOTIMPLEMENTED();
    blocked_devices_.set(static_cast<uint32_t>(deviceid), true);
    // TODO(rsadam@): Support blocking touchscreen devices.
-   std::vector<InputDevice> keyboards = GetKeyboardDevices();
+   std::vector<KeyboardDevice> keyboards = GetKeyboardDevices();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc
index eb84a2adffd6..a25d4a145c88 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_event.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/events/event.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/events/event.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/events/event.cc
-@@ -419,7 +419,7 @@ std::string LocatedEvent::ToString() const {
+@@ -427,7 +427,7 @@ std::string LocatedEvent::ToString() const {
  MouseEvent::MouseEvent(const PlatformEvent& native_event)
      : LocatedEvent(native_event),
        changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
@@ -9,7 +9,7 @@
        movement_(GetMouseMovementFromNative(native_event)),
  #endif
        pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
-@@ -674,7 +674,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const 
+@@ -676,7 +676,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const 
    return std::make_unique<MouseWheelEvent>(*this);
  }
  
@@ -18,7 +18,7 @@
  // This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on
  // Linux.
  // static
-@@ -923,7 +923,7 @@ void KeyEvent::InitializeNative() {
+@@ -936,7 +936,7 @@ void KeyEvent::InitializeNative() {
    if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent()))
      set_flags(flags() | EF_IS_REPEAT);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h
new file mode 100644
index 000000000000..a67968ebae51
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_events_gesture__detection_motion__event__generic.h
@@ -0,0 +1,10 @@
+--- src/3rdparty/chromium/ui/events/gesture_detection/motion_event_generic.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/events/gesture_detection/motion_event_generic.h
+@@ -7,6 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <vector>
+ 
+ #include "base/time/time.h"
+ #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn
index e508661c0172..5dfb92dcf6f8 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gfx/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gfx/BUILD.gn
-@@ -611,7 +611,7 @@ jumbo_source_set("memory_buffer_sources") {
+@@ -646,7 +646,7 @@ jumbo_source_set("memory_buffer_sources") {
      deps += [ "//build/config/linux/libdrm" ]
    }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc
index 58dab0f666d0..e8d0097a48fd 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_canvas__skia.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/ui/gfx/canvas_skia.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/gfx/canvas_skia.cc
-@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str
+@@ -212,7 +212,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str
      Range range = StripAcceleratorChars(flags, &adjusted_text);
      bool elide_text = ((flags & NO_ELLIPSIS) == 0);
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc
index 49c8a36f170a..9a21e49de835 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_codec_png__codec.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/ui/gfx/codec/png_codec.cc.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/ui/gfx/codec/png_codec.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/gfx/codec/png_codec.cc
-@@ -10,7 +10,7 @@
- #include "base/memory/raw_ptr.h"
+@@ -12,7 +12,7 @@
+ #include "base/metrics/histogram_macros.h"
  #include "base/notreached.h"
  #include "base/strings/string_util.h"
 -#include "third_party/libpng/png.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc
deleted file mode 100644
index ed0c71d87717..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__list.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/chromium/ui/gfx/font_list.cc.orig	2022-02-28 16:54:41 UTC
-+++ src/3rdparty/chromium/ui/gfx/font_list.cc
-@@ -27,7 +27,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>::
- bool g_default_impl_initialized = false;
- 
- bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle());
- #else
-   sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str()));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc
deleted file mode 100644
index d398efd7f79c..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_client__native__pixmap__dmabuf.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/3rdparty/chromium/ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig	2022-02-07 13:39:41 UTC
-+++ src/3rdparty/chromium/ui/gfx/linux/client_native_pixmap_dmabuf.cc
-@@ -5,7 +5,9 @@
- #include "ui/gfx/linux/client_native_pixmap_dmabuf.h"
- 
- #include <fcntl.h>
-+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
- #include <linux/version.h>
-+#endif
- #include <stddef.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-@@ -27,11 +29,7 @@
- #include "ui/gfx/buffer_format_util.h"
- #include "ui/gfx/switches.h"
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
--#include <linux/dma-buf.h>
--#else
--#include <linux/types.h>
--
-+#if defined(__OpenBSD__) || defined(__FreeBSD__)
- struct dma_buf_sync {
-   __u64 flags;
- };
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h
new file mode 100644
index 000000000000..2746d1e87073
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_linux_dmabuf__uapi.h
@@ -0,0 +1,36 @@
+--- src/3rdparty/chromium/ui/gfx/linux/dmabuf_uapi.h.orig	2023-12-12 22:08:45 UTC
++++ src/3rdparty/chromium/ui/gfx/linux/dmabuf_uapi.h
+@@ -5,12 +5,11 @@
+ #ifndef UI_GFX_LINUX_DMABUF_UAPI_H_
+ #define UI_GFX_LINUX_DMABUF_UAPI_H_
+ 
+-#include <linux/version.h>
++#include <sys/types.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+-#include <linux/dma-buf.h>
+-#else
+-#include <linux/types.h>
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef uint64_t __u64;
+ 
+ struct dma_buf_sync {
+   __u64 flags;
+@@ -26,9 +25,7 @@ constexpr unsigned long DMA_BUF_IOCTL_SYNC =
+ constexpr char DMA_BUF_BASE = 'b';
+ constexpr unsigned long DMA_BUF_IOCTL_SYNC =
+     _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync);
+-#endif
+ 
+-#ifndef DMA_BUF_IOCTL_EXPORT_SYNC_FILE
+ struct dma_buf_export_sync_file {
+   __u32 flags;
+   __s32 fd;
+@@ -43,6 +40,5 @@ constexpr unsigned long DMA_BUF_IOCTL_IMPORT_SYNC_FILE
+     _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file);
+ constexpr unsigned long DMA_BUF_IOCTL_IMPORT_SYNC_FILE =
+     _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file);
+-#endif
+ 
+ #endif  // UI_GFX_LINUX_DMABUF_UAPI_H_
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
index 650932b68276..d244dfdc7cfe 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc
 @@ -11,7 +11,7 @@
  #include "ui/gfx/buffer_format_util.h"
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h
index 401c8ea1d46b..de4ba874bf44 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__widget__types.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/ui/gfx/native_widget_types.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/gfx/native_widget_types.h
-@@ -106,7 +106,7 @@ class SkBitmap;
+@@ -103,7 +103,7 @@ class SkBitmap;
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -8,13 +8,13 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  extern "C" {
  struct _AtkObject;
- typedef struct _AtkObject AtkObject;
-@@ -209,7 +209,7 @@ typedef NSFont* NativeFont;
- typedef id NativeViewAccessible;
+ using AtkObject = struct _AtkObject;
+@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*;
+ #endif
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
  // Linux doesn't have a native font type.
- typedef AtkObject* NativeViewAccessible;
+ using NativeViewAccessible = AtkObject*;
  #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc
index 7b19c6ccc833..7e79bf0f77bb 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gfx/switches.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/gfx/switches.cc.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/ui/gfx/switches.cc
-@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
+@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
  // Run in headless mode, i.e., without a UI or display server dependencies.
  const char kHeadless[] = "headless";
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h
index cb08def77887..3f2994715608 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_switches.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gfx/switches.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/gfx/switches.h.orig	2023-07-16 15:47:57 UTC
 +++ src/3rdparty/chromium/ui/gfx/switches.h
-@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
+@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
  GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];
  GFX_SWITCHES_EXPORT extern const char kHeadless[];
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc
index 934f12ccb635..25f1781933fa 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gfx_x_xlib__support.cc
@@ -1,17 +1,17 @@
---- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gfx/x/xlib_support.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gfx/x/xlib_support.cc
 @@ -42,10 +42,18 @@ void InitXlib() {
    if (xlib_loader->loaded())
      return;
  
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  CHECK(xlib_loader->Load("libX11.so"));
 +#else
    CHECK(xlib_loader->Load("libX11.so.6"));
 +#endif
  
    auto* xlib_xcb_loader = GetXlibXcbLoader();
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  CHECK(xlib_xcb_loader->Load("libX11-xcb.so"));
 +#else
    CHECK(xlib_xcb_loader->Load("libX11-xcb.so.1"));
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn
index b75fb8ce4836..4173ed9ea7cf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gl/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gl/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gl/BUILD.gn
-@@ -172,8 +172,6 @@ jumbo_component("gl") {
+@@ -165,8 +165,6 @@ jumbo_component("gl") {
      defines += [ "GPU_ENABLE_SERVICE_LOGGING" ]
    }
  
@@ -9,7 +9,7 @@
    all_dependent_configs = [ ":gl_config" ]
  
    public_configs = [ "//third_party/khronos:khronos_headers" ]
-@@ -190,7 +188,6 @@ jumbo_component("gl") {
+@@ -183,7 +181,6 @@ jumbo_component("gl") {
    ]
    public_deps = [
      "//base",
@@ -17,7 +17,7 @@
      "//ui/events/platform",
      "//ui/gfx",
      "//ui/gfx/geometry",
-@@ -455,7 +452,6 @@ jumbo_component("gl") {
+@@ -433,7 +430,6 @@ jumbo_component("gl") {
      data_deps += [
        "//third_party/angle:libEGL",
        "//third_party/angle:libGLESv2",
@@ -25,7 +25,7 @@
      ]
      if (enable_swiftshader) {
        data_deps += [
-@@ -709,7 +705,6 @@ test("gl_unittests") {
+@@ -648,7 +644,6 @@ test("gl_unittests") {
  
    data_deps = [
      "//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc
index 41a4c19bebb3..100b11319b17 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__context.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gl/gl_context.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/gl/gl_context.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gl/gl_context.cc
-@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -445,7 +445,7 @@ bool GLContext::MakeVirtuallyCurrent(
    DCHECK(virtual_context->IsCurrent(surface));
  
    if (switched_real_contexts || virtual_context != current_virtual_context_) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc
new file mode 100644
index 000000000000..6f776755ee17
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__fence.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/ui/gl/gl_fence.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/gl/gl_fence.cc
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #if defined(USE_EGL)
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC
+ #include "ui/gl/gl_fence_android_native_fence_sync.h"
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc
index 4a3afa687cde..bae39201ddc7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gl/gl_implementation.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gl/gl_implementation.cc
-@@ -288,7 +288,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -291,7 +291,7 @@ GetRequestedGLImplementationFromCommandLine(
    *fallback_to_software_gl = false;
    bool overrideUseSoftwareGL =
        command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc
index c918d5c71f4a..71aa3de0060b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/ui/gl/gl_switches.cc.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/ui/gl/gl_switches.cc
 @@ -12,7 +12,7 @@
  #include "base/android/build_info.h"
@@ -9,7 +9,7 @@
  #include <vulkan/vulkan_core.h>
  #include "third_party/angle/src/gpu_info_util/SystemInfo.h"  // nogncheck
  #endif
-@@ -298,7 +298,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -297,7 +297,7 @@ bool IsDefaultANGLEVulkan() {
        base::android::SDK_VERSION_Q)
      return false;
  #endif  // BUILDFLAG(IS_ANDROID)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc
index 5e60d9bccb3f..fdd51d2768de 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__compat.cc
@@ -1,10 +1,10 @@
---- src/3rdparty/chromium/ui/gtk/gtk_compat.cc.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/ui/gtk/gtk_compat.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/gtk/gtk_compat.cc
 @@ -62,27 +62,47 @@ auto DlCast(void* symbol) {
  }
  
  void* GetLibGio() {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  static void* libgio = DlOpen("libgio-2.0.so");
 +#else
    static void* libgio = DlOpen("libgio-2.0.so.0");
@@ -13,7 +13,7 @@
  }
  
  void* GetLibGdkPixbuf() {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so");
 +#else
    static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
@@ -22,7 +22,7 @@
  }
  
  void* GetLibGdk3() {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  static void* libgdk3 = DlOpen("libgdk-3.so");
 +#else
    static void* libgdk3 = DlOpen("libgdk-3.so.0");
@@ -31,7 +31,7 @@
  }
  
  void* GetLibGtk3(bool check = true) {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  static void* libgtk3 = DlOpen("libgtk-3.so", check);
 +#else
    static void* libgtk3 = DlOpen("libgtk-3.so.0", check);
@@ -40,7 +40,7 @@
  }
  
  void* GetLibGtk4(bool check = true) {
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
 +  static void* libgtk4 = DlOpen("libgtk-4.so", check);
 +#else
    static void* libgtk4 = DlOpen("libgtk-4.so.1", check);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc
new file mode 100644
index 000000000000..777ee2dbd431
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_gtk__ui.cc
@@ -0,0 +1,22 @@
+--- src/3rdparty/chromium/ui/gtk/gtk_ui.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/gtk/gtk_ui.cc
+@@ -955,11 +955,19 @@ ui::DisplayConfig GtkUi::GetDisplayConfig() const {
+     GdkRectangle geometry;
+     gdk_monitor_get_geometry(monitor, &geometry);
+     int monitor_scale = std::max(1, gdk_monitor_get_scale_factor(monitor));
++#if defined(__clang__) && (__clang_major__ >= 16)
+     config.display_geometries.emplace_back(
+         gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
+                   monitor_scale * geometry.width,
+                   monitor_scale * geometry.height),
+         monitor_scale * font_scale);
++#else
++    config.display_geometries.emplace_back() = {
++        gfx::Rect(monitor_scale * geometry.x, monitor_scale * geometry.y,
++                  monitor_scale * geometry.width,
++                  monitor_scale * geometry.height),
++        static_cast<float>(monitor_scale * font_scale)};
++#endif
+   }
+   return config;
+ }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc
index b6194b735755..2d08cd914c58 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_gtk_printing_print__dialog__gtk.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/gtk/printing/print_dialog_gtk.cc
-@@ -403,7 +403,7 @@ void PrintDialogGtk::ShowDialog(
+@@ -440,7 +440,7 @@ void PrintDialogGtk::ShowDialog(
    GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>(
        GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET |
        GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h
index dac2cd783482..3fa0142466ac 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig	2022-03-25 21:59:56 UTC
+--- src/3rdparty/chromium/ui/native_theme/native_theme.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/native_theme/native_theme.h
-@@ -59,7 +59,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -62,7 +62,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
      kCheckbox,
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc
index 9f5cbc157524..07bb9392d23e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_native__theme_native__theme__base.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig	2023-02-08 09:03:45 UTC
+--- src/3rdparty/chromium/ui/native_theme/native_theme_base.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/native_theme/native_theme_base.cc
-@@ -273,7 +273,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
+@@ -275,7 +275,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas,
        break;
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
      case kFrameTopArea:
-       PaintFrameTopArea(canvas, state, rect, extra.frame_top_area,
-                         color_scheme);
+       PaintFrameTopArea(canvas, state, rect,
+                         absl::get<FrameTopAreaExtraParams>(extra),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc
new file mode 100644
index 000000000000..9d319f36638e
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_common_features.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/ui/ozone/common/features.cc.orig	2023-05-31 08:12:17 UTC
++++ src/3rdparty/chromium/ui/ozone/common/features.cc
+@@ -30,7 +30,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat
+ // enabled.
+ BASE_FEATURE(kWaylandFractionalScaleV1,
+              "WaylandFractionalScaleV1",
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+              base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc
index 33e247782197..91765f7c1d9e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_headless_vulkan__implementation__headless.cc
@@ -1,6 +1,24 @@
---- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/headless/vulkan_implementation_headless.cc
-@@ -155,7 +155,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory
+@@ -117,7 +117,7 @@ VulkanImplementationHeadless::ExportVkFenceToGpuFence(
+ 
+ VkExternalSemaphoreHandleTypeFlagBits
+ VulkanImplementationHeadless::GetExternalSemaphoreHandleType() {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT;
+ #else
+   return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
+@@ -127,7 +127,7 @@ VulkanImplementationHeadless::GetExternalSemaphoreHand
+ bool VulkanImplementationHeadless::CanImportGpuMemoryBuffer(
+     gpu::VulkanDeviceQueue* device_queue,
+     gfx::GpuMemoryBufferType memory_buffer_type) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   const auto& enabled_extensions = device_queue->enabled_extensions();
+   return gfx::HasExtension(enabled_extensions,
+                            VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME) &&
+@@ -150,7 +150,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory
        VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT |
        VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
    auto tiling = VK_IMAGE_TILING_OPTIMAL;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
index 8ee267a44110..028006979cbc 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -448,7 +448,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
+@@ -539,7 +539,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
    const bool did_active_change = is_active_ != window_states.is_activated;
    is_active_ = window_states.is_activated;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h
index 8ae031564f3a..f3e424c41695 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__toplevel__window.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_toplevel_window.h
-@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow,
+@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow,
    // Contains the previous state of the window.
    PlatformWindowState previous_state_ = PlatformWindowState::kUnknown;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc
new file mode 100644
index 000000000000..c53ee9f8d1ce
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.cc
@@ -0,0 +1,44 @@
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.cc
+@@ -233,7 +233,7 @@ void WaylandWindow::OnPointerFocusChanged(bool focused
+   // Whenever the window gets the pointer focus back, the cursor shape must be
+   // updated. Otherwise, it is invalidated upon wl_pointer::leave and is not
+   // restored by the Wayland compositor.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   if (focused && async_cursor_) {
+     async_cursor_->AddCursorLoadedCallback(
+         base::BindOnce(&WaylandWindow::OnCursorLoaded,
+@@ -490,7 +490,7 @@ bool WaylandWindow::ShouldUseNativeFrame() const {
+ void WaylandWindow::SetCursor(scoped_refptr<PlatformCursor> platform_cursor) {
+   DCHECK(platform_cursor);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   auto async_cursor = WaylandAsyncCursor::FromPlatformCursor(platform_cursor);
+ 
+   if (async_cursor_ == async_cursor) {
+@@ -661,7 +661,7 @@ std::string WaylandWindow::WindowStates::ToString() co
+   } else {
+     base::TrimString(states, " ", &states);
+   }
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   states += "; tiled_edges: ";
+   std::string tiled = "";
+   if (tiled_edges.left) {
+@@ -1111,12 +1111,12 @@ void WaylandWindow::UpdateCursorShape(scoped_refptr<Bi
+         cursor->bitmaps(), hotspot_in_dips,
+         std::ceil(cursor->cursor_image_scale_factor()));
+   }
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+   cursor_ = cursor;
+ #endif
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void WaylandWindow::OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
+                                    scoped_refptr<BitmapCursor> bitmap_cursor) {
+   if (HasPointerFocus() && async_cursor_ == cursor && bitmap_cursor) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h
index 4dd51dee4908..eb31e1e1535d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_wayland__window.h
@@ -1,6 +1,15 @@
---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/wayland_window.h
-@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -39,7 +39,7 @@
+ #include "ui/platform_window/platform_window_init_properties.h"
+ #include "ui/platform_window/wm/wm_drag_handler.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/ozone/platform/wayland/host/wayland_async_cursor.h"
+ #endif
+ 
+@@ -241,7 +241,7 @@ class WaylandWindow : public PlatformWindow,
      bool is_snapped_primary = false;
      bool is_snapped_secondary = false;
      bool is_floated = false;
@@ -8,4 +17,22 @@
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
      WindowTiledEdges tiled_edges;
  #endif
-   };
+ 
+@@ -492,7 +492,7 @@ class WaylandWindow : public PlatformWindow,
+ 
+   void UpdateCursorShape(scoped_refptr<BitmapCursor> cursor);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void OnCursorLoaded(scoped_refptr<WaylandAsyncCursor> cursor,
+                       scoped_refptr<BitmapCursor> bitmap_cursor);
+ #endif
+@@ -551,7 +551,7 @@ class WaylandWindow : public PlatformWindow,
+ 
+   wl::Object<zaura_surface> aura_surface_;
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // The current asynchronously loaded cursor (Linux specific).
+   scoped_refptr<WaylandAsyncCursor> async_cursor_;
+ #else
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
index d46e1bcac45c..3c2a96a74fe6 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
@@ -1,11 +1,11 @@
---- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
-@@ -272,7 +272,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
+@@ -308,7 +308,7 @@ void XDGToplevelWrapperImpl::OnToplevelConfigure(void*
            CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED),
    };
  
 -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
-   if (xdg_toplevel_get_version(xdg_toplevel) >=
+   if (xdg_toplevel_get_version(toplevel) >=
        XDG_TOPLEVEL_STATE_TILED_LEFT_SINCE_VERSION) {
      // All four tiled states have the same since version, so it is enough to
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
new file mode 100644
index 000000000000..5f5cdc1f1626
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_host_zwp__text__input__wrapper__v1.cc
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/ui/ozone/platform/wayland/host/zwp_text_input_wrapper_v1.cc
+@@ -226,6 +226,10 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
+   // so if it exceeds 16 bits, it may be broken.
+   static constexpr size_t kSizeLimit = 60000;
+   if (HasAdvancedSurroundingTextSupport() && text.length() > kSizeLimit) {
++#if defined(__FreeBSD_version) && __FreeBSD_version < 1300048
++    PLOG(ERROR) << "memfd is not supported";
++    return;
++#else
+     base::ScopedFD memfd(memfd_create("surrounding_text", MFD_CLOEXEC));
+     if (!memfd.get()) {
+       PLOG(ERROR) << "Failed to create memfd";
+@@ -238,6 +242,7 @@ void ZWPTextInputWrapperV1::SetSurroundingText(
+     zcr_extended_text_input_v1_set_large_surrounding_text(
+         extended_obj_.get(), memfd.get(), text.length(),
+         selection_range.start(), selection_range.end());
++#endif
+   } else {
+     zwp_text_input_v1_set_surrounding_text(obj_.get(), text.c_str(),
+                                            selection_range.start(),
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc
index 223bac5db10c..07714b9614c1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_wayland_ozone__platform__wayland.cc
@@ -1,7 +1,14 @@
---- src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/wayland/ozone_platform_wayland.cc
-@@ -71,7 +71,7 @@
+@@ -66,13 +66,13 @@
+ #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
  #include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h"
+ #else
+ #include "ui/ozone/common/bitmap_cursor_factory.h"
  #endif
  
 -#if BUILDFLAG(IS_LINUX)
@@ -9,7 +16,16 @@
  #include "ui/ozone/platform/wayland/host/linux_ui_delegate_wayland.h"
  #endif
  
-@@ -246,7 +246,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -262,7 +262,7 @@ class OzonePlatformWayland : public OzonePlatform,
+ 
+     buffer_manager_connector_ = std::make_unique<WaylandBufferManagerConnector>(
+         connection_->buffer_manager_host());
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+     cursor_factory_ = std::make_unique<WaylandCursorFactory>(connection_.get());
+ #else
+     cursor_factory_ = std::make_unique<BitmapCursorFactory>();
+@@ -272,7 +272,7 @@ class OzonePlatformWayland : public OzonePlatform,
  
      supported_buffer_formats_ =
          connection_->buffer_manager_host()->GetSupportedBufferFormats();
@@ -18,7 +34,7 @@
      linux_ui_delegate_ =
          std::make_unique<LinuxUiDelegateWayland>(connection_.get());
  #endif
-@@ -470,7 +470,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -510,7 +510,7 @@ class OzonePlatformWayland : public OzonePlatform,
    DrmRenderNodePathFinder path_finder_;
  #endif
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc
index 77f27f258b14..69946fcd81ce 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_ozone__platform__x11.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/ozone/platform/x11/ozone_platform_x11.cc
 @@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform,
        properties->supports_global_application_menus = true;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc
new file mode 100644
index 000000000000..b28474d43445
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.cc
+@@ -235,7 +235,7 @@ base::Value::List X11ScreenOzone::GetGpuExtraInfo(
+   return result;
+ }
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void X11ScreenOzone::SetDisplayConfig(const DisplayConfig& display_config) {
+   display_config_ = &display_config;
+   // See DesktopScreenLinux, which sets the |device_scale_factor| before |this|
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h
new file mode 100644
index 000000000000..052a328150d7
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_platform_x11_x11__screen__ozone.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/ozone/platform/x11/x11_screen_ozone.h
+@@ -61,7 +61,7 @@ class X11ScreenOzone : public PlatformScreen,
+   std::string GetCurrentWorkspace() override;
+   base::Value::List GetGpuExtraInfo(
+       const gfx::GpuExtraInfo& gpu_extra_info) override;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   void SetDisplayConfig(const DisplayConfig& display_config) override;
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h
index 69ac9d2ee115..a51739fee085 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_ozone__platform.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig	2022-11-30 08:12:58 UTC
+--- src/3rdparty/chromium/ui/ozone/public/ozone_platform.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/ui/ozone/public/ozone_platform.h
-@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+@@ -143,7 +143,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
      // back via gpu extra info.
      bool fetch_buffer_formats_for_gmb_on_gpu = false;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc
new file mode 100644
index 000000000000..a81db05108b1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/ui/ozone/public/platform_screen.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/ozone/public/platform_screen.cc
+@@ -61,7 +61,7 @@ display::TabletState PlatformScreen::GetTabletState() 
+ }
+ #endif
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void PlatformScreen::SetDisplayConfig(const DisplayConfig& display_config) {}
+ #endif
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h
new file mode 100644
index 000000000000..0527962d31c0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_ozone_public_platform__screen.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/ui/ozone/public/platform_screen.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/ui/ozone/public/platform_screen.h
+@@ -15,7 +15,7 @@
+ #include "ui/gfx/gpu_extra_info.h"
+ #include "ui/gfx/native_widget_types.h"
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/linux/linux_ui.h"
+ #endif
+ 
+@@ -136,7 +136,7 @@ class COMPONENT_EXPORT(OZONE_BASE) PlatformScreen {
+   virtual base::Value::List GetGpuExtraInfo(
+       const gfx::GpuExtraInfo& gpu_extra_info);
+ 
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+   // Sets device scale factor received from external sources such as toolkits.
+   virtual void SetDisplayConfig(const DisplayConfig& display_config);
+ #endif
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc
index 3e295b22fc60..a234f6b09567 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.cc
-@@ -29,7 +29,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
+@@ -36,7 +36,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
  
  PlatformWindowDelegate::~PlatformWindowDelegate() = default;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h
index 6c4c24b12e2f..8078b0e1a956 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/ui/platform_window/platform_window_delegate.h
-@@ -130,7 +130,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -134,7 +134,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
    virtual void OnWindowStateChanged(PlatformWindowState old_state,
                                      PlatformWindowState new_state) = 0;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc
index aab08dfe6cb7..b7f5e5968daf 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.cc
-@@ -74,7 +74,7 @@
+@@ -79,7 +79,7 @@
  #include "base/win/win_util.h"
  #endif
  
@@ -9,7 +9,7 @@
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/linux/linux_ui.h"
  #endif
-@@ -168,7 +168,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -173,7 +173,7 @@ bool IsControlKeyModifier(int flags) {
  // Control-modified key combination, but we cannot extend it to other platforms
  // as Control has different meanings and behaviors.
  // https://crrev.com/2580483002/#msg46
@@ -18,7 +18,7 @@
    return flags & ui::EF_CONTROL_DOWN;
  #else
    return false;
-@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -742,7 +742,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
    if (!textfield)
      return handled;
  
@@ -27,7 +27,7 @@
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
    if (!handled && linux_ui &&
-@@ -878,7 +878,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -924,7 +924,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
  }
  
  bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -36,7 +36,7 @@
    // Skip any accelerator handling that conflicts with custom keybindings.
    auto* linux_ui = ui::LinuxUi::instance();
    std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1831,7 +1831,7 @@ bool Textfield::ShouldDoLearning() {
+@@ -1929,7 +1929,7 @@ bool Textfield::ShouldDoLearning() {
    return false;
  }
  
@@ -45,7 +45,7 @@
  // TODO(https://crbug.com/952355): Implement this method to support Korean IME
  // reconversion feature on native text fields (e.g. find bar).
  bool Textfield::SetCompositionFromExistingText(
-@@ -2344,14 +2344,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2442,14 +2442,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
  #endif
          return ui::TextEditCommand::DELETE_BACKWARD;
        }
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h
index a18da2326123..f57e7d05b71f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_controls_textfield_textfield.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/views/controls/textfield/textfield.h.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/controls/textfield/textfield.h
-@@ -42,7 +42,7 @@
+@@ -44,7 +44,7 @@
  #include "ui/views/view.h"
  #include "ui/views/word_lookup_client.h"
  
@@ -9,7 +9,7 @@
  #include <vector>
  #endif
  
-@@ -450,7 +450,7 @@ class VIEWS_EXPORT Textfield : public View,
+@@ -452,7 +452,7 @@ class VIEWS_EXPORT Textfield : public View,
    // Set whether the text should be used to improve typing suggestions.
    void SetShouldDoLearning(bool value) { should_do_learning_ = value; }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc
index 658dfa312d5e..20dd34306bb6 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/ui/views/corewm/tooltip_aura.cc
-@@ -51,7 +51,7 @@ constexpr int kVerticalPaddingBottom = 5;
+@@ -38,7 +38,7 @@ namespace {
  bool CanUseTranslucentTooltipWidget() {
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc
index 01f65e8da5fa..56647f4fc04d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_focus_focus__manager.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/views/focus/focus_manager.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/ui/views/focus/focus_manager.cc
-@@ -625,7 +625,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -577,7 +577,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -9,7 +9,7 @@
    // Processing an accelerator can delete things. Because we
    // need these objects afterwards on Linux, save widget_ as weak pointer and
    // save the close_on_deactivate property value of widget_delegate in a
-@@ -642,7 +642,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
+@@ -594,7 +594,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
index c60c14fcaaa5..07d81668aa10 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
 @@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
    return drag_operation_;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
index 27dde6a0455b..bf67f7ad257b 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
  #include "ui/wm/core/window_util.h"
  #include "ui/wm/public/window_move_client.h"
  
@@ -9,7 +9,7 @@
  #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
  #endif
  
-@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
+@@ -265,7 +265,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
    if (params.type == Widget::InitParams::TYPE_WINDOW)
      GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
  
@@ -18,7 +18,7 @@
    const bool requires_accelerated_widget = params.requires_accelerated_widget;
  #else
    const bool requires_accelerated_widget = false;
-@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -346,7 +346,7 @@ std::unique_ptr<aura::client::DragDropClient>
  DesktopWindowTreeHostPlatform::CreateDragDropClient() {
    ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
    std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
@@ -27,7 +27,7 @@
        std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler);
  #else
        std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler);
-@@ -1039,7 +1039,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis
+@@ -1081,7 +1081,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg
  // DesktopWindowTreeHost:
  
  // Linux subclasses this host and adds some Linux specific bits.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc
index 90f4d3025dd4..819ebb710d6d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/widget/widget.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/ui/views/widget/widget.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/widget/widget.cc
-@@ -52,7 +52,7 @@
+@@ -54,7 +54,7 @@
  #include "ui/views/window/custom_frame_view.h"
  #include "ui/views/window/dialog_delegate.h"
  
@@ -9,7 +9,7 @@
  #include "ui/linux/linux_ui.h"
  #endif
  
-@@ -1989,7 +1989,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
+@@ -2041,7 +2041,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const 
    if (parent_)
      return parent_->GetNativeTheme();
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h
index 84a4e98c1e40..53a8abcb720d 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_widget.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/widget/widget.h.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/ui/views/widget/widget.h.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/ui/views/widget/widget.h
-@@ -408,7 +408,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+@@ -410,7 +410,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
      // If set, the widget was created in headless mode.
      bool headless_mode = false;
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
index 5afcd6af4470..f4d7dfbe9cb1 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc
-@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget(
  
  // static
  bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
index 4f644ce8b9bc..b34d95a6105f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig	2022-02-28 16:54:41 UTC
+--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/ui/views/window/frame_background.cc
 @@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv
                                       int width) const {
@@ -7,5 +7,5 @@
 -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
 +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
      BUILDFLAG(ENABLE_DESKTOP_AURA)
-   ui::NativeTheme::ExtraParams params;
-   params.frame_top_area.use_custom_frame = use_custom_frame_;
+   ui::NativeTheme::FrameTopAreaExtraParams frame_top_area;
+   frame_top_area.use_custom_frame = use_custom_frame_;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn
index 14c7a8d8a55c..13e4649ae0be 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_BUILD.gn
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/BUILD.gn.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/v8/BUILD.gn.orig	2023-12-12 22:08:45 UTC
 +++ src/3rdparty/chromium/v8/BUILD.gn
-@@ -1305,6 +1305,14 @@ config("toolchain") {
+@@ -1418,6 +1418,14 @@ config("toolchain") {
    } else if (target_os == "chromeos") {
      defines += [ "V8_HAVE_TARGET_OS" ]
      defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -15,7 +15,20 @@
    }
  
    # TODO(infra): Support v8_enable_prof on Windows.
-@@ -5777,7 +5785,7 @@ v8_component("v8_libbase") {
+@@ -2381,6 +2389,12 @@ template("run_mksnapshot") {
+       if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) {
+         args += [ "--reorder-builtins" ]
+       }
++
++      if (v8_current_cpu == "x86") {
++        args -= [
++          "--abort-on-bad-builtin-profile-data",
++        ]
++      }
+     }
+ 
+     # This is needed to distinguish between generating code for the simulator
+@@ -6173,7 +6187,7 @@ v8_component("v8_libbase") {
      }
    }
  
@@ -24,7 +37,7 @@
      sources += [
        "src/base/debug/stack_trace_posix.cc",
        "src/base/platform/platform-linux.cc",
-@@ -5788,6 +5796,18 @@ v8_component("v8_libbase") {
+@@ -6184,6 +6198,18 @@ v8_component("v8_libbase") {
        "dl",
        "rt",
      ]
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h
index 3e0eecb4313f..0c56f6f4652e 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_include_v8-internal.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/include/v8-internal.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/v8/include/v8-internal.h.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/v8/include/v8-internal.h
-@@ -176,7 +176,7 @@ using SandboxedPointer_t = Address;
+@@ -172,7 +172,7 @@ using SandboxedPointer_t = Address;
  #ifdef V8_ENABLE_SANDBOX
  
  // Size of the sandbox, excluding the guard regions surrounding it.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
index 3254a55f7306..9f96f37381e7 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc
@@ -1,15 +1,15 @@
---- src/3rdparty/chromium/v8/src/api/api.cc.orig	2023-08-16 19:50:41 UTC
+--- src/3rdparty/chromium/v8/src/api/api.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/v8/src/api/api.cc
-@@ -142,7 +142,7 @@
+@@ -141,7 +141,7 @@
  #include "src/wasm/wasm-serialization.h"
  #endif  // V8_ENABLE_WEBASSEMBLY
  
 -#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD
 +#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD
  #include <signal.h>
+ #include <unistd.h>
  
- #if V8_ENABLE_WEBASSEMBLY
-@@ -6354,7 +6354,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6352,7 +6352,7 @@ bool v8::V8::Initialize(const int build_config) {
    return true;
  }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h
index 446117838b0a..51d11ee69264 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_atomicops.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/v8/src/base/atomicops.h.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/v8/src/base/atomicops.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/v8/src/base/atomicops.h
 @@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64;
  using Atomic8 = char;
@@ -13,7 +13,7 @@
  using Atomic64 = int64_t;
  #else
  using Atomic64 = intptr_t;
-@@ -258,7 +258,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p
+@@ -266,7 +266,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p
                                     std::memory_order_seq_cst);
  }
  
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc
index 3e8509780585..bf245be77f38 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-openbsd.cc
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig	2022-02-07 13:39:41 UTC
+--- src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc.orig	2023-04-28 17:01:32 UTC
 +++ src/3rdparty/chromium/v8/src/base/platform/platform-openbsd.cc
 @@ -6,6 +6,7 @@
  // POSIX-compatible parts, the implementation is in platform-posix.cc.
@@ -14,7 +14,7 @@
  void OS::AdjustSchedulingParams() {}
 +
 +// static
-+Stack::StackSlot Stack::GetStackStart() {
++Stack::StackSlot Stack::ObtainCurrentThreadStackStart() {
 +  stack_t ss;
 +  void *base;
 +  if (pthread_stackseg_np(pthread_self(), &ss) != 0)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc
index a6ab51a09133..b08c34559dd2 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig	2023-03-09 06:31:50 UTC
+--- src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
-@@ -53,7 +53,7 @@
+@@ -55,7 +55,7 @@
  #if V8_OS_DARWIN
  #include <mach/mach.h>
  #include <malloc/malloc.h>
@@ -9,7 +9,7 @@
  #include <malloc.h>
  #endif
  
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
  #include <sys/syscall.h>
  #endif
  
@@ -18,7 +18,7 @@
  #define MAP_ANONYMOUS MAP_ANON
  #endif
  
-@@ -297,8 +297,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
+@@ -305,8 +305,15 @@ void OS::SetRandomMmapSeed(int64_t seed) {
    }
  }
  
@@ -34,7 +34,7 @@
    uintptr_t raw_addr;
    {
      MutexGuard guard(rng_mutex.Pointer());
-@@ -393,6 +400,7 @@ void* OS::GetRandomMmapAddr() {
+@@ -401,6 +408,7 @@ void* OS::GetRandomMmapAddr() {
  #endif
    return reinterpret_cast<void*>(raw_addr);
  }
@@ -42,7 +42,7 @@
  
  // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
  #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
-@@ -661,7 +669,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
+@@ -674,7 +682,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
  
  // static
  bool OS::HasLazyCommits() {
@@ -51,12 +51,12 @@
    return true;
  #else
    // TODO(bbudge) Return true for all POSIX platforms.
-@@ -1238,7 +1246,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
+@@ -1281,7 +1289,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
  // keep this version in POSIX as most Linux-compatible derivatives will
  // support it. MacOS and FreeBSD are different here.
  #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \
 -    !defined(V8_OS_SOLARIS)
 +    !defined(V8_OS_SOLARIS) && !defined(V8_OS_OPENBSD)
  
- // static
- Stack::StackSlot Stack::GetStackStart() {
+ namespace {
+ #if DEBUG
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h
new file mode 100644
index 000000000000..a21a55072cd9
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_baseline_x64_baseline-assembler-x64-inl.h
@@ -0,0 +1,13 @@
+--- src/3rdparty/chromium/v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/baseline/x64/baseline-assembler-x64-inl.h
+@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand() 
+ 
+ void BaselineAssembler::Bind(Label* label) { __ bind(label); }
+ 
+-void BaselineAssembler::JumpTarget() {
+-  // NOP on x64.
+-}
++void BaselineAssembler::JumpTarget() { __ endbr64(); }
+ 
+ void BaselineAssembler::Jump(Label* target, Label::Distance distance) {
+   __ jmp(target, distance);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc
new file mode 100644
index 000000000000..8aa573e775b6
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_builtins_x64_builtins-x64.cc
@@ -0,0 +1,46 @@
+--- src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/v8/src/builtins/x64/builtins-x64.cc
+@@ -44,6 +44,8 @@ namespace internal {
+ #define __ ACCESS_MASM(masm)
+ 
+ void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) {
++  __ CodeEntry();
++
+   __ LoadAddress(kJavaScriptCallExtraArg1Register,
+                  ExternalReference::Create(address));
+   __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame),
+@@ -430,7 +432,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta
+   // Jump to a faked try block that does the invoke, with a faked catch
+   // block that sets the pending exception.
+   __ jmp(&invoke);
+-  __ bind(&handler_entry);
++  __ BindExceptionHandler(&handler_entry);
+ 
+   // Store the current pc as the handler offset. It's used later to create the
+   // handler table.
+@@ -3327,6 +3329,9 @@ void SwitchBackAndReturnPromise(MacroAssembler* masm, 
+ void GenerateExceptionHandlingLandingPad(MacroAssembler* masm,
+                                          Label* return_promise) {
+   int catch_handler = __ pc_offset();
++
++  __ endbr64();
++
+   // Restore rsp to free the reserved stack slots for the sections.
+   __ leaq(rsp, MemOperand(rbp, StackSwitchFrameConstants::kLastSpillOffset));
+ 
+@@ -3658,6 +3663,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma
+   LoadJumpBuffer(masm, jmpbuf, true);
+   __ Trap();
+   __ bind(&resume);
++  __ endbr64();
+   __ LeaveFrame(StackFrame::STACK_SWITCH);
+   __ ret(0);
+ }
+@@ -3790,6 +3796,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w
+   }
+   __ Trap();
+   __ bind(&suspend);
++  __ endbr64();
+   __ LeaveFrame(StackFrame::STACK_SWITCH);
+   // Pop receiver + parameter.
+   __ ret(2 * kSystemPointerSize);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc
new file mode 100644
index 000000000000..294357791729
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.cc
@@ -0,0 +1,42 @@
+--- src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.cc
+@@ -1316,6 +1316,14 @@ void Assembler::hlt() {
+   emit(0xF4);
+ }
+ 
++void Assembler::endbr64() {
++  EnsureSpace ensure_space(this);
++  emit(0xF3);
++  emit(0x0f);
++  emit(0x1e);
++  emit(0xfa);
++}
++
+ void Assembler::emit_idiv(Register src, int size) {
+   EnsureSpace ensure_space(this);
+   emit_rex(src, size);
+@@ -1583,16 +1591,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo
+   emitl(code_target_index);
+ }
+ 
+-void Assembler::jmp(Register target) {
++void Assembler::jmp(Register target, bool notrack) {
+   EnsureSpace ensure_space(this);
++  if (notrack) {
++    emit(0x3e);
++  }
+   // Opcode FF/4 r64.
+   emit_optional_rex_32(target);
+   emit(0xFF);
+   emit_modrm(0x4, target);
+ }
+ 
+-void Assembler::jmp(Operand src) {
++void Assembler::jmp(Operand src, bool notrack) {
+   EnsureSpace ensure_space(this);
++  if (notrack) {
++    emit(0x3e);
++  }
+   // Opcode FF/4 m64.
+   emit_optional_rex_32(src);
+   emit(0xFF);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h
new file mode 100644
index 000000000000..f455280dc92b
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_assembler-x64.h
@@ -0,0 +1,21 @@
+--- src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/codegen/x64/assembler-x64.h
+@@ -860,6 +860,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
+   void ret(int imm16);
+   void ud2();
+   void setcc(Condition cc, Register reg);
++  void endbr64();
+ 
+   void pblendw(XMMRegister dst, Operand src, uint8_t mask);
+   void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask);
+@@ -917,8 +918,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
+   void jmp(Handle<Code> target, RelocInfo::Mode rmode);
+ 
+   // Jump near absolute indirect (r64)
+-  void jmp(Register adr);
+-  void jmp(Operand src);
++  void jmp(Register adr, bool notrack = false);
++  void jmp(Operand src, bool notrack = false);
+ 
+   // Unconditional jump relative to the current address. Low-level routine,
+   // use with caution!
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc
new file mode 100644
index 000000000000..26cc3ba91684
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.cc
+@@ -51,6 +51,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int
+   return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize);
+ }
+ 
++void MacroAssembler::CodeEntry() { endbr64(); }
++
+ void MacroAssembler::Load(Register destination, ExternalReference source) {
+   if (root_array_available_ && options().enable_root_relative_access) {
+     intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source);
+@@ -2046,7 +2048,7 @@ void MacroAssembler::Switch(Register scratch, Register
+   cmpq(reg, Immediate(num_labels));
+   j(above_equal, &fallthrough);
+   leaq(table, MemOperand(&jump_table));
+-  jmp(MemOperand(table, reg, times_8, 0));
++  jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true);
+   // Emit the jump table inline, under the assumption that it's not too big.
+   Align(kSystemPointerSize);
+   bind(&jump_table);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h
new file mode 100644
index 000000000000..e230f6225052
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_x64_macro-assembler-x64.h
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.h.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/v8/src/codegen/x64/macro-assembler-x64.h
+@@ -646,11 +646,14 @@ class V8_EXPORT_PRIVATE MacroAssembler
+ 
+   // Define a function entrypoint. This doesn't emit any code for this
+   // architecture, as control-flow integrity is not supported for it.
+-  void CodeEntry() {}
++  void CodeEntry();
+   // Define an exception handler.
+-  void ExceptionHandler() {}
++  void ExceptionHandler() { CodeEntry(); }
+   // Define an exception handler and bind a label.
+-  void BindExceptionHandler(Label* label) { bind(label); }
++  void BindExceptionHandler(Label* label) {
++    bind(label);
++    CodeEntry();
++  }
+ 
+   // ---------------------------------------------------------------------------
+   // Pointer compression support
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc
deleted file mode 100644
index 080323f60714..000000000000
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_ia32_instruction-selector-ia32.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig	2022-11-30 08:12:58 UTC
-+++ src/3rdparty/chromium/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
-@@ -3034,6 +3034,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node
-   Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps);
- }
- 
-+#if V8_ENABLE_WEBASSEMBLY
- void InstructionSelector::VisitI8x16Swizzle(Node* node) {
-   InstructionCode op = kIA32I8x16Swizzle;
- 
-@@ -3087,6 +3088,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node
- void InstructionSelector::VisitF32x4Pmin(Node* node) {
-   VisitMinOrMax(this, node, kIA32Minps, true);
- }
-+#else
-+void InstructionSelector::VisitI8x16Swizzle(Node* node) { UNREACHABLE(); }
-+#endif  // V8_ENABLE_WEBASSEMBLY
- 
- void InstructionSelector::VisitF32x4Pmax(Node* node) {
-   VisitMinOrMax(this, node, kIA32Maxps, true);
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc
new file mode 100644
index 000000000000..92ad4b47ce7f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_compiler_backend_x64_code-generator-x64.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/v8/src/compiler/backend/x64/code-generator-x64.cc.orig	2023-10-11 18:22:24 UTC
++++ src/3rdparty/chromium/v8/src/compiler/backend/x64/code-generator-x64.cc
+@@ -6828,11 +6828,11 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio
+     // target = table + (target - table)
+     __ addq(input, kScratchRegister);
+     // Jump to the target.
+-    __ jmp(input);
++    __ jmp(input, /*notrack=*/true);
+   } else {
+     // For non builtins, the value in the table is 'target_address' (8 bytes)
+     // jmp [table + index*8]
+-    __ jmp(Operand(kScratchRegister, input, times_8, 0));
++    __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true);
+   }
+ }
+ 
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc
new file mode 100644
index 000000000000..0fcb108f05d5
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_deoptimizer_x64_deoptimizer-x64.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/deoptimizer/x64/deoptimizer-x64.cc
+@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy);
+ #undef ASSERT_OFFSET
+ 
+ const int Deoptimizer::kEagerDeoptExitSize = 4;
+-const int Deoptimizer::kLazyDeoptExitSize = 4;
++const int Deoptimizer::kLazyDeoptExitSize = 8;
+ 
+ Float32 RegisterValues::GetFloatRegister(unsigned n) const {
+   return Float32::FromBits(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc
index 6b2abb31d0dd..fbe7e994da93 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_diagnostics_perf-jit.cc
@@ -1,7 +1,7 @@
---- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig	2022-06-17 14:20:10 UTC
+--- src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/v8/src/diagnostics/perf-jit.cc
-@@ -30,7 +30,7 @@
- #include "src/common/assert-scope.h"
+@@ -31,7 +31,7 @@
+ #include "src/flags/flags.h"
  
  // Only compile the {LinuxPerfJitLogger} on Linux.
 -#if V8_OS_LINUX
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc
index 25ea084c2370..b10e18c34b65 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_execution_isolate.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/v8/src/execution/isolate.cc.orig	2023-10-11 18:22:24 UTC
 +++ src/3rdparty/chromium/v8/src/execution/isolate.cc
-@@ -146,6 +146,10 @@
+@@ -147,6 +147,10 @@
  #include "src/execution/simulator-base.h"
  #endif
  
@@ -11,7 +11,7 @@
  extern "C" const uint8_t v8_Default_embedded_blob_code_[];
  extern "C" uint32_t v8_Default_embedded_blob_code_size_;
  extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -3849,6 +3853,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -4034,6 +4038,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
    uint32_t code_size = DefaultEmbeddedBlobCodeSize();
    const uint8_t* data = DefaultEmbeddedBlobData();
    uint32_t data_size = DefaultEmbeddedBlobDataSize();
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc
new file mode 100644
index 000000000000..a704bb280780
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_flags_flags.cc
@@ -0,0 +1,36 @@
+--- src/3rdparty/chromium/v8/src/flags/flags.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/flags/flags.cc
+@@ -12,6 +12,10 @@
+ #include <iomanip>
+ #include <sstream>
+ 
++#if V8_OS_OPENBSD
++#include <sys/mman.h>
++#endif
++
+ #include "src/base/functional.h"
+ #include "src/base/logging.h"
+ #include "src/base/platform/platform.h"
+@@ -31,7 +35,11 @@
+ namespace v8::internal {
+ 
+ // Define {v8_flags}, declared in flags.h.
++#if V8_OS_OPENBSD
++FlagValues v8_flags __attribute__((section(".openbsd.mutable")));
++#else
+ FlagValues v8_flags;
++#endif
+ 
+ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a
+ // multiple of a page size. This is required for memory-protection of the memory
+@@ -824,6 +832,10 @@ void FlagList::FreezeFlags() {
+   // Note that for string flags we only protect the pointer itself, but not the
+   // string storage. TODO(12887): Fix this.
+   base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
++#if V8_OS_OPENBSD
++  if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1)
++    FATAL("unable to set immutability of v8_flags");
++#endif
+ }
+ 
+ // static
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h
new file mode 100644
index 000000000000..a38884e12313
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64-inl.h
@@ -0,0 +1,14 @@
+--- src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64-inl.h
+@@ -229,7 +229,10 @@ void MaglevAssembler::PushReverse(T... vals) {
+   detail::PushAllHelper<T...>::PushReverse(this, vals...);
+ }
+ 
+-inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); }
++inline void MaglevAssembler::BindJumpTarget(Label* label) {
++  bind(label);
++  endbr64();
++}
+ 
+ inline void MaglevAssembler::BindBlock(BasicBlock* block) {
+   bind(block->label());
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc
new file mode 100644
index 000000000000..20252707ee65
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_maglev_x64_maglev-assembler-x64.cc
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/v8/src/maglev/x64/maglev-assembler-x64.cc
+@@ -433,10 +433,12 @@ void MaglevAssembler::OSRPrologue(Graph* graph) {
+ void MaglevAssembler::Prologue(Graph* graph) {
+   DCHECK(!graph->is_osr());
+ 
++  CodeEntry();
++
+   BailoutIfDeoptimized(rbx);
+ 
+   if (graph->has_recursive_calls()) {
+-    bind(code_gen_state()->entry_label());
++    BindJumpTarget(code_gen_state()->entry_label());
+   }
+ 
+   // Tiering support.
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc
new file mode 100644
index 000000000000..8c27106d5ad1
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.cc
@@ -0,0 +1,22 @@
+--- src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.cc
+@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola
+       backtrack_label_(),
+       exit_label_() {
+   DCHECK_EQ(0, registers_to_save % 2);
++  __ CodeEntry();
+   __ jmp(&entry_label_);   // We'll write the entry code when we know more.
+   __ bind(&start_label_);  // And then continue from here.
+ }
+@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges(
+       // Match any character.
+       return true;
+   }
++}
++
++void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) {
++  Bind(label);
++  __ CodeEntry();
+ }
+ 
+ void RegExpMacroAssemblerX64::Fail() {
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h
new file mode 100644
index 000000000000..43fbe6a20691
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_regexp_x64_regexp-macro-assembler-x64.h
@@ -0,0 +1,12 @@
+--- src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/regexp/x64/regexp-macro-assembler-x64.h
+@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64
+   void CheckPosition(int cp_offset, Label* on_outside_input) override;
+   bool CheckSpecialClassRanges(StandardCharacterSet type,
+                                Label* on_no_match) override;
++
++  void BindJumpTarget(Label* label) override;
++
+   void Fail() override;
+   Handle<HeapObject> GetCode(Handle<String> source) override;
+   void GoTo(Label* label) override;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
index 956817daf095..8f34904e9bbe 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
@@ -1,8 +1,8 @@
---- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig	2023-08-17 07:33:31 UTC
 +++ src/3rdparty/chromium/v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
 @@ -9,6 +9,10 @@
  
- #include "src/objects/code.h"
+ #include "src/objects/instruction-stream.h"
  
 +#if V8_OS_OPENBSD
 +#include <sys/param.h>
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc
index dc0542162ea5..7ec4e44c855f 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig	2023-01-11 09:17:16 UTC
+--- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc
-@@ -55,6 +55,8 @@ namespace trap_handler {
+@@ -59,6 +59,8 @@ namespace trap_handler {
  #define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg
  #elif V8_OS_FREEBSD
  #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg
@@ -9,7 +9,7 @@
  #else
  #error "Unsupported platform."
  #endif
-@@ -64,8 +66,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
+@@ -68,8 +70,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
    // si_code at its default of 0 for signals that don’t originate in hardware.
    // The other conditions are only relevant for Linux.
    return info->si_code > 0 && info->si_code != SI_USER &&
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h
index d9d610892469..b22dfb97260a 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h
@@ -1,4 +1,4 @@
---- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig	2022-04-21 18:48:31 UTC
+--- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig	2023-05-31 08:12:17 UTC
 +++ src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h
 @@ -20,7 +20,7 @@ namespace trap_handler {
  // X64 on Linux, Windows, MacOS, FreeBSD.
@@ -7,5 +7,5 @@
 -     V8_OS_FREEBSD)
 +     V8_OS_FREEBSD || V8_OS_OPENBSD)
  #define V8_TRAP_HANDLER_SUPPORTED true
- // Arm64 (non-simulator) on Mac.
- #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_DARWIN
+ // Arm64 (non-simulator) on Mac and Linux.
+ #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
index 174870543e59..3dc87904205c 100644
--- a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h
@@ -1,6 +1,6 @@
---- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig	2023-04-05 11:05:06 UTC
+--- src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig	2023-09-13 12:11:42 UTC
 +++ src/3rdparty/chromium/v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
-@@ -424,7 +424,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -491,7 +491,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
  }
  
  void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
                              LoadType type, uint32_t* protected_load_pc,
                              bool /* is_load_mem */, bool /* i64_offset */,
                              bool needs_shift) {
-@@ -504,7 +504,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -571,7 +571,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
  }
  
  void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
                               StoreType type, LiftoffRegList pinned,
                               uint32_t* protected_store_pc,
                               bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -573,7 +573,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -651,7 +651,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
  }
  
  void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
                                    LoadType type, LiftoffRegList /* pinned */,
                                    bool /* i64_offset */) {
    if (type.value() != LoadType::kI64Load) {
-@@ -593,7 +593,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -671,7 +671,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
  }
  
  void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
                                     StoreType type, LiftoffRegList pinned,
                                     bool /* i64_offset */) {
    DCHECK_NE(offset_reg, no_reg);
-@@ -663,7 +663,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -741,7 +741,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
  
  inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
                                         Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
                                         LiftoffRegister value,
                                         LiftoffRegister result, StoreType type) {
    DCHECK_EQ(value, result);
-@@ -730,7 +730,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -808,7 +808,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
  }
  
  inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
                            LiftoffRegister value, LiftoffRegister result,
                            StoreType type) {
    DCHECK_EQ(value, result);
-@@ -842,7 +842,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -920,7 +920,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
  }
  
  inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
                            LiftoffRegister value, LiftoffRegister result) {
    // We need {ebx} here, which is the root register. As the root register it
    // needs special treatment. As we use {ebx} directly in the code below, we
-@@ -934,7 +934,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -1012,7 +1012,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
  }  // namespace liftoff
  
  void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -948,7 +948,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -1026,7 +1026,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -1039,7 +1039,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -975,7 +975,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -1053,7 +1053,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
                                  LiftoffRegister result, StoreType type,
                                  bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -989,7 +989,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -1067,7 +1067,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
  }
  
  void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
                                   LiftoffRegister result, StoreType type,
                                   bool /* i64_offset */) {
    if (type.value() == StoreType::kI64Store) {
-@@ -1003,7 +1003,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -1081,7 +1081,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
  }
  
  void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
                                        LiftoffRegister value,
                                        LiftoffRegister result, StoreType type,
                                        bool /* i64_offset */) {
-@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1096,7 +1096,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
  }
  
  void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc
new file mode 100644
index 000000000000..57c26827fc25
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.cc
@@ -0,0 +1,51 @@
+--- src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.cc.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.cc
+@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT
+ #if V8_TARGET_ARCH_X64
+ void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index,
+                                                  Address lazy_compile_target) {
++  intptr_t displacement =
++      static_cast<intptr_t>(reinterpret_cast<uint8_t*>(lazy_compile_target) -
++                            (pc_ + 9) - kNearJmpInstrSize);
++  if (!is_int32(displacement)) return;
++  CodeEntry();  // 4 bytes
+   // Use a push, because mov to an extended register takes 6 bytes.
+-  pushq_imm32(func_index);            // 5 bytes
+-  EmitJumpSlot(lazy_compile_target);  // 5 bytes
++  pushq_imm32(func_index);                     // 5 bytes
++  near_jmp(displacement, RelocInfo::NO_INFO);  // 5 bytes
+ }
+ 
+ bool JumpTableAssembler::EmitJumpSlot(Address target) {
+   intptr_t displacement = static_cast<intptr_t>(
+-      reinterpret_cast<uint8_t*>(target) - pc_ - kNearJmpInstrSize);
++      reinterpret_cast<uint8_t*>(target) - (pc_ + 4) - kNearJmpInstrSize);
+   if (!is_int32(displacement)) return false;
++  CodeEntry();                                 // 4 bytes
+   near_jmp(displacement, RelocInfo::NO_INFO);  // 5 bytes
+   return true;
+ }
+@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target) 
+ void JumpTableAssembler::EmitFarJumpSlot(Address target) {
+   Label data;
+   int start_offset = pc_offset();
++  CodeEntry();          // 4 bytes
+   jmp(Operand(&data));  // 6 bytes
+-  Nop(2);               // 2 bytes
++  Nop(6);               // 6 bytes
+   // The data must be properly aligned, so it can be patched atomically (see
+   // {PatchFarJumpSlot}).
+-  DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset());
++  DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset());
+   USE(start_offset);
+   bind(&data);
+   dq(target);  // 8 bytes
+@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot
+   // The slot needs to be pointer-size aligned so we can atomically update it.
+   DCHECK(IsAligned(slot, kSystemPointerSize));
+   // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}.
+-  reinterpret_cast<std::atomic<Address>*>(slot + kSystemPointerSize)
++  reinterpret_cast<std::atomic<Address>*>(slot + kFarJumpTableSlotOffset)
+       ->store(target, std::memory_order_relaxed);
+   // The update is atomic because the address is properly aligned.
+   // Because of cache coherence, the data update will eventually be seen by all
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h
new file mode 100644
index 000000000000..b1f3d1d5539f
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_v8_src_wasm_jump-table-assembler.h
@@ -0,0 +1,16 @@
+--- src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.h.orig	2023-07-16 15:47:57 UTC
++++ src/3rdparty/chromium/v8/src/wasm/jump-table-assembler.h
+@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma
+ // boundaries. The jump table line size has been chosen to satisfy this.
+ #if V8_TARGET_ARCH_X64
+   static constexpr int kJumpTableLineSize = 64;
+-  static constexpr int kJumpTableSlotSize = 5;
+-  static constexpr int kFarJumpTableSlotSize = 16;
+-  static constexpr int kLazyCompileTableSlotSize = 10;
++  static constexpr int kJumpTableSlotSize = 5 + 4;
++  static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize;
++  static constexpr int kFarJumpTableSlotSize = 16 + 8;
++  static constexpr int kLazyCompileTableSlotSize = 10 + 4;
+ #elif V8_TARGET_ARCH_IA32
+   static constexpr int kJumpTableLineSize = 64;
+   static constexpr int kJumpTableSlotSize = 5;
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc
new file mode 100644
index 000000000000..bc76caba35f0
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/weblayer/browser/browser_main_parts_impl.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/weblayer/browser/browser_main_parts_impl.cc
+@@ -82,7 +82,7 @@
+ 
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+ #include "ui/base/ime/init/input_method_initializer.h"
+ #endif
+ 
+@@ -201,7 +201,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
+ 
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+   ui::InitializeInputMethodForTesting();
+ #endif
+ #if BUILDFLAG(IS_ANDROID)
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc
new file mode 100644
index 000000000000..e30491b9f28a
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.cc.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.cc
+@@ -154,7 +154,7 @@
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "content/public/common/content_descriptors.h"
+ #endif
+ 
+@@ -1025,7 +1025,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess(
+     const base::CommandLine& command_line,
+     int child_process_id,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h
new file mode 100644
index 000000000000..bcf8fe116242
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.h
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.h.orig	2023-09-13 12:11:42 UTC
++++ src/3rdparty/chromium/weblayer/browser/content_browser_client_impl.h
+@@ -184,7 +184,7 @@ class ContentBrowserClientImpl : public content::Conte
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
+-    BUILDFLAG(IS_ANDROID)
++    BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+   void GetAdditionalMappedFilesForChildProcess(
+       const base::CommandLine& command_line,
+       int child_process_id,
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc
new file mode 100644
index 000000000000..9b1ea960f8ef
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_browser_system__network__context__manager.cc
@@ -0,0 +1,11 @@
+--- src/3rdparty/chromium/weblayer/browser/system_network_context_manager.cc.orig	2022-03-25 21:59:56 UTC
++++ src/3rdparty/chromium/weblayer/browser/system_network_context_manager.cc
+@@ -69,7 +69,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw
+   network_context_params->user_agent = user_agent;
+ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
+ // complete.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+   // We're not configuring the cookie encryption on these platforms yet.
+   network_context_params->enable_encrypted_cookies = false;
+ #endif  // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ||
diff --git a/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc
new file mode 100644
index 000000000000..80c3836c307c
--- /dev/null
+++ b/www/qt6-webengine/files/patch-src_3rdparty_chromium_weblayer_common_weblayer__paths.cc
@@ -0,0 +1,20 @@
+--- src/3rdparty/chromium/weblayer/common/weblayer_paths.cc.orig	2022-03-25 21:59:56 UTC
++++ src/3rdparty/chromium/weblayer/common/weblayer_paths.cc
+@@ -18,7 +18,7 @@
+ 
+ #if BUILDFLAG(IS_WIN)
+ #include "base/base_paths_win.h"
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #include "base/nix/xdg_util.h"
+ #endif
+ 
+@@ -36,7 +36,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul
+     return false;
+   *result = result->AppendASCII("weblayer");
+   return true;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+   std::unique_ptr<base::Environment> env(base::Environment::Create());
+   base::FilePath config_dir(base::nix::GetXDGDirectory(
+       env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir));
diff --git a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt
index 2c1eeafc4734..ce8adebaa3df 100644
--- a/www/qt6-webengine/files/patch-src_core_CMakeLists.txt
+++ b/www/qt6-webengine/files/patch-src_core_CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/core/CMakeLists.txt.orig	2023-08-16 19:50:41 UTC
+--- src/core/CMakeLists.txt.orig	2023-12-12 22:08:45 UTC
 +++ src/core/CMakeLists.txt
-@@ -20,7 +20,7 @@ add_subdirectory(tools)
+@@ -20,7 +20,7 @@ add_subdirectory(tools/qwebengine_convert_dict)
  #   TOOLCHAIN SETUP
  ##
  
@@ -9,7 +9,7 @@
      setup_toolchains()
  endif()
  
-@@ -405,7 +405,7 @@ foreach(arch ${archs})
+@@ -409,7 +409,7 @@ foreach(arch ${archs})
              CONDITION QT_FEATURE_webengine_embedded_build
          )
  
@@ -18,7 +18,7 @@
              list(APPEND gnArgArg
                  use_gtk=false # GTK toolkit bindings
                  use_qt=false # Qt5 toolkit bindings
-@@ -415,7 +415,7 @@ foreach(arch ${archs})
+@@ -418,7 +418,7 @@ foreach(arch ${archs})
                  use_bundled_fontconfig=false
                  use_glib=false
                  use_bluez=false
@@ -27,7 +27,7 @@
                  is_cfi=false
                  use_ozone=true
                  ozone_auto_platforms=false
-@@ -474,6 +474,10 @@ foreach(arch ${archs})
+@@ -477,6 +477,10 @@ foreach(arch ${archs})
              extend_gn_list(gnArgArg
                  ARGS use_pulseaudio
                  CONDITION QT_FEATURE_webengine_system_pulseaudio
@@ -37,4 +37,4 @@
 +                CONDITION QT_FEATURE_webengine_system_sndio
              )
              extend_gn_list(gnArgArg
-                 ARGS use_vaapi
+                 ARGS use_system_minigbm
diff --git a/www/qt6-webengine/files/patch-src_core_api_configure.cmake b/www/qt6-webengine/files/patch-src_core_api_configure.cmake
index 37bf6d26192b..ddeccc69e5bb 100644
--- a/www/qt6-webengine/files/patch-src_core_api_configure.cmake
+++ b/www/qt6-webengine/files/patch-src_core_api_configure.cmake
@@ -1,14 +1,14 @@
---- src/core/api/configure.cmake.orig	2023-11-20 16:08:07 UTC
+--- src/core/api/configure.cmake.orig	2023-12-12 22:08:45 UTC
 +++ src/core/api/configure.cmake
 @@ -10,6 +10,7 @@ if(NOT QT_CONFIGURE_RUNNING)
-     if(PkgConfig_FOUND)
+     if(PkgConfig_FOUND AND QT_FEATURE_pkg_config)
          pkg_check_modules(ALSA alsa IMPORTED_TARGET)
          pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib)
 +        pkg_check_modules(SNDIO libsndio)
          pkg_check_modules(XDAMAGE xdamage)
          pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET)
          pkg_check_modules(GBM gbm)
-@@ -84,6 +85,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE
+@@ -90,6 +91,11 @@ qt_feature("webengine-printing-and-pdf" PRIVATE
      CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND
      (CUPS_FOUND OR WIN32)
  )
@@ -20,7 +20,7 @@
  qt_feature("webengine-pepper-plugins" PRIVATE
      LABEL "Pepper Plugins"
      PURPOSE "Enables use of Pepper plugins."
-@@ -164,7 +170,7 @@ qt_feature("webengine-vaapi" PRIVATE
+@@ -170,7 +176,7 @@ qt_feature("webengine-vaapi" PRIVATE
      PURPOSE "Enables support for VA-API hardware acceleration"
      AUTODETECT GBM_FOUND AND LIBVA_FOUND AND QT_FEATURE_vulkan
      # hardware accelerated encoding requires bundled libvpx
@@ -29,7 +29,7 @@
  )
  # internal testing feature
  qt_feature("webengine-system-poppler" PRIVATE
-@@ -199,15 +205,19 @@ qt_configure_add_summary_entry(
+@@ -205,15 +211,19 @@ qt_configure_add_summary_entry(
  )
  qt_configure_add_summary_entry(
      ARGS "webengine-vaapi"
diff --git a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt
index 02f80b1dfddd..c5fd9473264d 100644
--- a/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt
+++ b/www/qt6-webengine/files/patch-src_pdf_CMakeLists.txt
@@ -1,16 +1,16 @@
---- src/pdf/CMakeLists.txt.orig	2023-10-03 19:49:54 UTC
+--- src/pdf/CMakeLists.txt.orig	2023-12-12 22:08:45 UTC
 +++ src/pdf/CMakeLists.txt
 @@ -71,7 +71,7 @@ add_dependencies(docs generate_pdf_attributions)
  #   TOOLCHAIN SETUP
  ##
  
--if(LINUX OR MINGW)
-+if(LINUX OR MINGW OR FREEBSD)
+-if(LINUX OR MINGW OR ANDROID)
++if(LINUX OR MINGW OR ANDROID OR FREEBSD)
      setup_toolchains()
  endif()
  
-@@ -134,7 +134,7 @@ foreach(arch ${archs})
-           strip_absolute_paths_from_debug_symbols=false
+@@ -138,7 +138,7 @@ foreach(arch ${archs})
+           v8_enable_webassembly=false
          )
  
 -        if(LINUX OR ANDROID)
diff --git a/www/qt6-webengine/pkg-plist b/www/qt6-webengine/pkg-plist
index 3a88087a9a7c..983f4fcbaaed 100644
--- a/www/qt6-webengine/pkg-plist
+++ b/www/qt6-webengine/pkg-plist
@@ -2,6 +2,7 @@
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecoreglobal_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecontextmenurequest_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecookiestore_p.h
+%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginedesktopmediarequest_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginedownloadrequest_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineglobalsettings_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginehistory_p.h
@@ -11,11 +12,13 @@
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineprofile_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginescriptcollection_p.h
 %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h
+%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginewebauthuxrequest_p.h
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCertificateError
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateSelection
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateStore
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineContextMenuRequest
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCookieStore
+%%QT_INCDIR%%/QtWebEngineCore/QWebEngineDesktopMediaRequest
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineDownloadRequest
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFileSystemAccessRequest
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineFindTextResult
@@ -41,6 +44,8 @@
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineUrlRequestJob
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineUrlScheme
 %%QT_INCDIR%%/QtWebEngineCore/QWebEngineUrlSchemeHandler
+%%QT_INCDIR%%/QtWebEngineCore/QWebEngineWebAuthPinRequest
+%%QT_INCDIR%%/QtWebEngineCore/QWebEngineWebAuthUxRequest
 %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCore
 %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreDepends
 %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreVersion
@@ -52,6 +57,7 @@
 %%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebenginecontextmenurequest.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebenginecookiestore.h
+%%QT_INCDIR%%/QtWebEngineCore/qwebenginedesktopmediarequest.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebenginedownloadrequest.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebenginefilesystemaccessrequest.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebenginefindtextresult.h
@@ -75,6 +81,8 @@
 %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlrequestjob.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlscheme.h
 %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlschemehandler.h
+%%QT_INCDIR%%/QtWebEngineCore/qwebenginewebauthuxrequest.h
+%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengine_accessible_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineaction_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineaction_p_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h
@@ -96,31 +104,28 @@
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qquickwebengineview_p_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qtwebenginequick-config_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/qtwebenginequickglobal_p.h
+%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/render_widget_host_view_qt_delegate_quickwindow_p.h
+%%QT_INCDIR%%/QtWebEngineQuick/%%FULLVER%%/QtWebEngineQuick/private/ui_delegates_manager_p.h
 %%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineProfile
-%%QT_INCDIR%%/QtWebEngineQuick/QQuickWebEngineViewAccessible
 %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuick
 %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickDepends
 %%QT_INCDIR%%/QtWebEngineQuick/QtWebEngineQuickVersion
-%%QT_INCDIR%%/QtWebEngineQuick/qquickwebengine_accessible.h
 %%QT_INCDIR%%/QtWebEngineQuick/qquickwebengineprofile.h
 %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequick-config.h
 %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickglobal.h
 %%QT_INCDIR%%/QtWebEngineQuick/qtwebenginequickversion.h
-%%QT_INCDIR%%/QtWebEngineQuick/render_widget_host_view_qt_delegate_quickwindow.h
-%%QT_INCDIR%%/QtWebEngineQuick/ui_delegates_manager.h
 %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/autofillpopupwidget_p.h
+%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengine_accessible_p.h
 %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h
 %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineview_p.h
 %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchhandlewidget_p.h
 %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/touchselectionmenuwidget_p.h
 %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineView
-%%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineViewAccessible
 %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgets
 %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsDepends
 %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsVersion
 %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsglobal.h
 %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsversion.h
-%%QT_INCDIR%%/QtWebEngineWidgets/qwebengine_accessible.h
 %%QT_INCDIR%%/QtWebEngineWidgets/qwebengineview.h
 lib/cmake/Qt6/FindGPerf.cmake
 lib/cmake/Qt6/FindGn.cmake
@@ -243,11 +248,13 @@ libdata/pkgconfig/Qt6WebEngineQuickDelegatesQml.pc
 libdata/pkgconfig/Qt6WebEngineWidgets.pc
 %%QT_TOOLDIR%%/QtWebEngineProcess
 %%QT_TOOLDIR%%/qwebengine_convert_dict
+%%DRIVER%%%%QT_TOOLDIR%%/webenginedriver
 %%QT_DATADIR%%/modules/WebEngineCore.json
 %%QT_DATADIR%%/modules/WebEngineQuick.json
 %%QT_DATADIR%%/modules/WebEngineQuickDelegatesQml.json
 %%QT_DATADIR%%/modules/WebEngineWidgets.json
 %%QT_DATADIR%%/resources/icudtl.dat
+@dir %%QT_DATADIR%%/resources/locales
 %%QT_DATADIR%%/resources/qtwebengine_devtools_resources.pak
 %%QT_DATADIR%%/resources/qtwebengine_resources.pak
 %%QT_DATADIR%%/resources/qtwebengine_resources_100p.pak
diff --git a/www/qt6-websockets/distinfo b/www/qt6-websockets/distinfo
index 9cfc02d380e7..bcff1dbc96cc 100644
--- a/www/qt6-websockets/distinfo
+++ b/www/qt6-websockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664653
-SHA256 (KDE/Qt/6.6.3/qtwebsockets-everywhere-src-6.6.3.tar.xz) = 16f481765794dd66e4538a1074fbc9a68e2091eda5f99868cc27d9b1a931a036
-SIZE (KDE/Qt/6.6.3/qtwebsockets-everywhere-src-6.6.3.tar.xz) = 455068
+TIMESTAMP = 1718779150
+SHA256 (KDE/Qt/6.7.2/qtwebsockets-everywhere-src-6.7.2.tar.xz) = 5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f
+SIZE (KDE/Qt/6.7.2/qtwebsockets-everywhere-src-6.7.2.tar.xz) = 459636
diff --git a/www/qt6-webview/distinfo b/www/qt6-webview/distinfo
index 96032685854f..cced1aa68a28 100644
--- a/www/qt6-webview/distinfo
+++ b/www/qt6-webview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664655
-SHA256 (KDE/Qt/6.6.3/qtwebview-everywhere-src-6.6.3.tar.xz) = 206463df560746b9ddfee3d5aae4a50831b5660510f862998e7b319ee2ef4c02
-SIZE (KDE/Qt/6.6.3/qtwebview-everywhere-src-6.6.3.tar.xz) = 138776
+TIMESTAMP = 1718779151
+SHA256 (KDE/Qt/6.7.2/qtwebview-everywhere-src-6.7.2.tar.xz) = 4ce1096903d4fec39bfcd95d4015acbf105eddf66a384303cb0fe899dd24e4fe
+SIZE (KDE/Qt/6.7.2/qtwebview-everywhere-src-6.7.2.tar.xz) = 138764
diff --git a/www/redmine51/files/patch-Gemfile b/www/redmine51/files/patch-Gemfile
index d1fa8fd8b2b1..52565c361211 100644
--- a/www/redmine51/files/patch-Gemfile
+++ b/www/redmine51/files/patch-Gemfile
@@ -1,5 +1,14 @@
---- Gemfile.orig	2024-03-04 19:55:03 UTC
+--- Gemfile.orig	2024-06-07 04:26:14 UTC
 +++ Gemfile
+@@ -2,7 +2,7 @@ ruby '>= 2.7.0', '< 3.3.0'
+ 
+ ruby '>= 2.7.0', '< 3.3.0'
+ 
+-gem 'rails', '6.1.7.7'
++gem 'rails', '~> 6.1.7'
+ gem 'rouge', '~> 4.2.0'
+ gem 'request_store', '~> 1.5.0'
+ gem 'mini_mime', '~> 1.1.0'
 @@ -10,17 +10,17 @@ gem 'mail', '~> 2.8.1'
  gem 'roadie-rails', '~> 3.1.0'
  gem 'marcel'
diff --git a/www/remark42/Makefile b/www/remark42/Makefile
index edc6033db529..88cd5e4fefc4 100644
--- a/www/remark42/Makefile
+++ b/www/remark42/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	remark42
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.12.1
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/delphij:npmcache
 DISTFILES=	${PORTNAME}-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache
diff --git a/www/reproxy/Makefile b/www/reproxy/Makefile
index 6046946ec297..85984d4087c6 100644
--- a/www/reproxy/Makefile
+++ b/www/reproxy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	reproxy
 PORTVERSION=	0.11.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	danfe@FreeBSD.org
diff --git a/www/rt50/Makefile b/www/rt50/Makefile
index 1652e8507ae4..07d13e4b5ad7 100644
--- a/www/rt50/Makefile
+++ b/www/rt50/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	rt
-DISTVERSION=	5.0.5
-PORTREVISION=	1
+DISTVERSION=	5.0.7
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	50
diff --git a/www/rt50/distinfo b/www/rt50/distinfo
index e0d4d8f8282b..580586fb9d1e 100644
--- a/www/rt50/distinfo
+++ b/www/rt50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697786825
-SHA256 (rt-5.0.5.tar.gz) = 90f845daaa436198c334b6e9cf5afb1df9f4445dcc165d0bcae35de9eb9be8ef
-SIZE (rt-5.0.5.tar.gz) = 19055361
+TIMESTAMP = 1718092458
+SHA256 (rt-5.0.7.tar.gz) = 1a1a4838979f08c58e67642686e4fd980e1f4ee98e144ff8a56f870f37162cce
+SIZE (rt-5.0.7.tar.gz) = 19782235
diff --git a/www/rt50/pkg-plist b/www/rt50/pkg-plist
index ffbb0f9947bb..76f70fea3047 100644
--- a/www/rt50/pkg-plist
+++ b/www/rt50/pkg-plist
@@ -2,8 +2,6 @@
 bin/rt
 bin/rt-crontool
 bin/rt-mailgate
-sbin/rt-clean-shorteners
-sbin/rt-email-expiring-auth-tokens
 @dir(root,rt,0750) %%RT_ETC_DIR%%
 @dir(root,rt,0750) %%RT_ETC_DIR%%/RT_SiteConfig.d
 @mode 0440
@@ -357,10 +355,12 @@ sbin/rt-email-expiring-auth-tokens
 sbin/rt-attributes-viewer
 sbin/rt-clean-attributes
 sbin/rt-clean-sessions
+sbin/rt-clean-shorteners
 sbin/rt-dump-initialdata
 sbin/rt-dump-metadata
 sbin/rt-email-dashboards
 sbin/rt-email-digest
+sbin/rt-email-expiring-auth-tokens
 sbin/rt-email-group-admin
 sbin/rt-externalize-attachments
 sbin/rt-fulltext-indexer
diff --git a/www/rubygem-actioncable61/Makefile b/www/rubygem-actioncable61/Makefile
index e62c97315b87..6b4a17b71c13 100644
--- a/www/rubygem-actioncable61/Makefile
+++ b/www/rubygem-actioncable61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actioncable
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/www/rubygem-actioncable61/distinfo b/www/rubygem-actioncable61/distinfo
index 204f851f94b7..66b815ac7b5a 100644
--- a/www/rubygem-actioncable61/distinfo
+++ b/www/rubygem-actioncable61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391012
-SHA256 (rubygem/actioncable-6.1.7.7.gem) = 741a109243b807f1709b737d6a475f1c4b9a5949d9a48b20dc2f441db6dc24af
-SIZE (rubygem/actioncable-6.1.7.7.gem) = 42496
+TIMESTAMP = 1717568538
+SHA256 (rubygem/actioncable-6.1.7.8.gem) = 2d39334cbbf34464e34572b7a817bedefd0cac445881ed91c1291ae9ba2ebcbf
+SIZE (rubygem/actioncable-6.1.7.8.gem) = 42496
diff --git a/www/rubygem-actioncable70/Makefile b/www/rubygem-actioncable70/Makefile
index 8eead46e5b17..398e304efad6 100644
--- a/www/rubygem-actioncable70/Makefile
+++ b/www/rubygem-actioncable70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actioncable
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/www/rubygem-actioncable70/distinfo b/www/rubygem-actioncable70/distinfo
index 2010f2f6a04c..7ece11c4365b 100644
--- a/www/rubygem-actioncable70/distinfo
+++ b/www/rubygem-actioncable70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391038
-SHA256 (rubygem/actioncable-7.0.8.1.gem) = bc5eddc8c6412d067b9fecec6a53dd14f3bd83baca96762eb864f01fb4c40649
-SIZE (rubygem/actioncable-7.0.8.1.gem) = 44544
+TIMESTAMP = 1717568564
+SHA256 (rubygem/actioncable-7.0.8.4.gem) = 7997fbc32d49c2cffbfe050540a316c96d287b9ef09fa6fe659821373dc186b0
+SIZE (rubygem/actioncable-7.0.8.4.gem) = 44544
diff --git a/www/rubygem-actioncable71/Makefile b/www/rubygem-actioncable71/Makefile
index 082ecf819367..5a48a8f3a32a 100644
--- a/www/rubygem-actioncable71/Makefile
+++ b/www/rubygem-actioncable71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actioncable
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/www/rubygem-actioncable71/distinfo b/www/rubygem-actioncable71/distinfo
index d8afadc83348..b32a7308c67d 100644
--- a/www/rubygem-actioncable71/distinfo
+++ b/www/rubygem-actioncable71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391064
-SHA256 (rubygem/actioncable-7.1.3.2.gem) = e162ce4094368e86237cbf8345cc78c2c7cf1fddaf5d8aacf86428d32cf9d145
-SIZE (rubygem/actioncable-7.1.3.2.gem) = 48128
+TIMESTAMP = 1717568590
+SHA256 (rubygem/actioncable-7.1.3.4.gem) = 787ba8651caaa93d5c161f0d1110105300974be65e89483071146fc42d4bd310
+SIZE (rubygem/actioncable-7.1.3.4.gem) = 48128
diff --git a/www/rubygem-actionpack61/Makefile b/www/rubygem-actionpack61/Makefile
index 0066833c7cd8..2a21c922c4be 100644
--- a/www/rubygem-actionpack61/Makefile
+++ b/www/rubygem-actionpack61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionpack
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/www/rubygem-actionpack61/distinfo b/www/rubygem-actionpack61/distinfo
index e09f093d93e1..ac08749de3ec 100644
--- a/www/rubygem-actionpack61/distinfo
+++ b/www/rubygem-actionpack61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391014
-SHA256 (rubygem/actionpack-6.1.7.7.gem) = 47f23d97e3322b353e7464abad85b52970705a320f69144c951dfd57834a5796
-SIZE (rubygem/actionpack-6.1.7.7.gem) = 226816
+TIMESTAMP = 1717568540
+SHA256 (rubygem/actionpack-6.1.7.8.gem) = fcb09de3c4fa9df2f96f9dd5fbbaeeb9ec69c0415c9ddbd0eb7bdd5307d293de
+SIZE (rubygem/actionpack-6.1.7.8.gem) = 226816
diff --git a/www/rubygem-actionpack70/Makefile b/www/rubygem-actionpack70/Makefile
index 22bf095f2803..f1243762ba19 100644
--- a/www/rubygem-actionpack70/Makefile
+++ b/www/rubygem-actionpack70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionpack
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/www/rubygem-actionpack70/distinfo b/www/rubygem-actionpack70/distinfo
index b3a49a09f287..bc25e822d399 100644
--- a/www/rubygem-actionpack70/distinfo
+++ b/www/rubygem-actionpack70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391040
-SHA256 (rubygem/actionpack-7.0.8.1.gem) = 5dcd2b39cb69abe899edc9faf878fb667a64a9fe306a2e56d09e3ed3701e084a
-SIZE (rubygem/actionpack-7.0.8.1.gem) = 233984
+TIMESTAMP = 1717568566
+SHA256 (rubygem/actionpack-7.0.8.4.gem) = 2e4809808c176b0dd35d3b9a23cb4896596ff50d15740accf6af83588a2a60a2
+SIZE (rubygem/actionpack-7.0.8.4.gem) = 233984
diff --git a/www/rubygem-actionpack71/Makefile b/www/rubygem-actionpack71/Makefile
index f23569d85bdf..f8cc7409d567 100644
--- a/www/rubygem-actionpack71/Makefile
+++ b/www/rubygem-actionpack71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	actionpack
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/www/rubygem-actionpack71/distinfo b/www/rubygem-actionpack71/distinfo
index 174de4cee663..11bf46fbd7e3 100644
--- a/www/rubygem-actionpack71/distinfo
+++ b/www/rubygem-actionpack71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391066
-SHA256 (rubygem/actionpack-7.1.3.2.gem) = b8f958d5d77e17b0fcbcd21f03eedac0405b0bf17421479be38529cf4a263b58
-SIZE (rubygem/actionpack-7.1.3.2.gem) = 244736
+TIMESTAMP = 1717568592
+SHA256 (rubygem/actionpack-7.1.3.4.gem) = dcafc71bec6a975c3984a1ed8e698e2f9afeeb441c838766c16c29633705edd2
+SIZE (rubygem/actionpack-7.1.3.4.gem) = 244736
diff --git a/www/rubygem-rails61/Makefile b/www/rubygem-rails61/Makefile
index 0b1a29c3c709..9290feb5a565 100644
--- a/www/rubygem-rails61/Makefile
+++ b/www/rubygem-rails61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rails
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/www/rubygem-rails61/distinfo b/www/rubygem-rails61/distinfo
index 96d9d7937a3e..f922707ae5d5 100644
--- a/www/rubygem-rails61/distinfo
+++ b/www/rubygem-rails61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391016
-SHA256 (rubygem/rails-6.1.7.7.gem) = 94f30e3f732bf78f26793528b59eb97ff29d8b3c8a7b0d33a972f5f99e2b174b
-SIZE (rubygem/rails-6.1.7.7.gem) = 6656
+TIMESTAMP = 1717568542
+SHA256 (rubygem/rails-6.1.7.8.gem) = 412c094da9e1a8435c03d5e8c43da2ddf90f52fee6df8aa7633e00ee4ed64432
+SIZE (rubygem/rails-6.1.7.8.gem) = 6656
diff --git a/www/rubygem-rails70/Makefile b/www/rubygem-rails70/Makefile
index 2f1f497cc777..174544032674 100644
--- a/www/rubygem-rails70/Makefile
+++ b/www/rubygem-rails70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rails
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/www/rubygem-rails70/distinfo b/www/rubygem-rails70/distinfo
index 2cb696103bb5..5cc6cc46f086 100644
--- a/www/rubygem-rails70/distinfo
+++ b/www/rubygem-rails70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391042
-SHA256 (rubygem/rails-7.0.8.1.gem) = 7deb37884ac5e9afeaeb6ad503c56e819f68e53746d621b2187322f874ba2ded
-SIZE (rubygem/rails-7.0.8.1.gem) = 7168
+TIMESTAMP = 1717568568
+SHA256 (rubygem/rails-7.0.8.4.gem) = 7e418423a57ffde4466422f0afab676fbd8f23a7b47f5431fb38ab3dda9765eb
+SIZE (rubygem/rails-7.0.8.4.gem) = 7168
diff --git a/www/rubygem-rails71/Makefile b/www/rubygem-rails71/Makefile
index ba9bbd5f6931..b68c6edb281d 100644
--- a/www/rubygem-rails71/Makefile
+++ b/www/rubygem-rails71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	rails
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/www/rubygem-rails71/distinfo b/www/rubygem-rails71/distinfo
index 0c5548b8ab27..778656e2199d 100644
--- a/www/rubygem-rails71/distinfo
+++ b/www/rubygem-rails71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391068
-SHA256 (rubygem/rails-7.1.3.2.gem) = 2d787a65e87b70ee65f9d1cb644aaa5bb80eea12298982f474da949772c1bfa0
-SIZE (rubygem/rails-7.1.3.2.gem) = 7168
+TIMESTAMP = 1717568594
+SHA256 (rubygem/rails-7.1.3.4.gem) = 3a7fca9df74ee641dc1e89b8302ac6d03f22883de771e786a0e9f3094e5aa6ad
+SIZE (rubygem/rails-7.1.3.4.gem) = 7168
diff --git a/www/rubygem-railties61/Makefile b/www/rubygem-railties61/Makefile
index 4aca60613ec5..2f791a7e2675 100644
--- a/www/rubygem-railties61/Makefile
+++ b/www/rubygem-railties61/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	railties
-PORTVERSION=	6.1.7.7
+PORTVERSION=	6.1.7.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
diff --git a/www/rubygem-railties61/distinfo b/www/rubygem-railties61/distinfo
index 86e903fe3060..529aa85dd20d 100644
--- a/www/rubygem-railties61/distinfo
+++ b/www/rubygem-railties61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391018
-SHA256 (rubygem/railties-6.1.7.7.gem) = 37a24b27281696d3b0da4ffb7e50efa135b9e923a5ff9a2763007b915a7e1d1f
-SIZE (rubygem/railties-6.1.7.7.gem) = 457216
+TIMESTAMP = 1717568544
+SHA256 (rubygem/railties-6.1.7.8.gem) = 8b7ad9846eb6999f6078bd6ef56bed7c854a47302b8f827568a576aad6f16612
+SIZE (rubygem/railties-6.1.7.8.gem) = 457216
diff --git a/www/rubygem-railties70/Makefile b/www/rubygem-railties70/Makefile
index aa02dfd46995..d7dff4624a86 100644
--- a/www/rubygem-railties70/Makefile
+++ b/www/rubygem-railties70/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	railties
-PORTVERSION=	7.0.8.1
+PORTVERSION=	7.0.8.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	70
diff --git a/www/rubygem-railties70/distinfo b/www/rubygem-railties70/distinfo
index 636b0c599644..a9e686dbb656 100644
--- a/www/rubygem-railties70/distinfo
+++ b/www/rubygem-railties70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391044
-SHA256 (rubygem/railties-7.0.8.1.gem) = c2e4e3617defafad5c1c2c5761d697873197422ec49f58a96d6728f3a729ea21
-SIZE (rubygem/railties-7.0.8.1.gem) = 161792
+TIMESTAMP = 1717568570
+SHA256 (rubygem/railties-7.0.8.4.gem) = 00ae09707da0b738071930a15a8196edc0b6748ac76cd2e6fd0b180f3aa6e70b
+SIZE (rubygem/railties-7.0.8.4.gem) = 161792
diff --git a/www/rubygem-railties71/Makefile b/www/rubygem-railties71/Makefile
index ad456401fb9a..cd247be2de43 100644
--- a/www/rubygem-railties71/Makefile
+++ b/www/rubygem-railties71/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	railties
-PORTVERSION=	7.1.3.2
+PORTVERSION=	7.1.3.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	71
diff --git a/www/rubygem-railties71/distinfo b/www/rubygem-railties71/distinfo
index a3ec010c88c0..51eeb2931ddf 100644
--- a/www/rubygem-railties71/distinfo
+++ b/www/rubygem-railties71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709391070
-SHA256 (rubygem/railties-7.1.3.2.gem) = 59fcd55cbfb90044ea4c3e9fdea2cf5687385c138cacc4a258a46508b7d36510
-SIZE (rubygem/railties-7.1.3.2.gem) = 181248
+TIMESTAMP = 1717568596
+SHA256 (rubygem/railties-7.1.3.4.gem) = 6c6049f3a788669d94f95c7bf6378204ae94098567cc25237e3c73dac4a21afc
+SIZE (rubygem/railties-7.1.3.4.gem) = 181760
diff --git a/www/s/Makefile b/www/s/Makefile
index 7d8c32976afd..e666e59344cd 100644
--- a/www/s/Makefile
+++ b/www/s/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	s
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.9
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/screego/Makefile b/www/screego/Makefile
index 003836d2a981..5cccbd714892 100644
--- a/www/screego/Makefile
+++ b/www/screego/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	screego
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.0
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 MASTER_SITES=	https://registry.yarnpkg.com/:yarn
 DISTFILES=	@babel/code-frame/-/code-frame-7.8.3.tgz:yarn \
diff --git a/www/shiori/Makefile b/www/shiori/Makefile
index 9b11fac7e77f..2c305afa4970 100644
--- a/www/shiori/Makefile
+++ b/www/shiori/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	shiori
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 3eea89be611b..e8881e7b2447 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.0-M19
+DISTVERSION=	11.0.0-M21
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index 7acb43e2c15c..3fe44ffd6617 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713281284
-SHA256 (apache-tomcat-11.0.0-M19.tar.gz) = ae4c72f0c265f7d9e0e4d43b0d6757cf514af797cf1715ebd0dedebf1b94d542
-SIZE (apache-tomcat-11.0.0-M19.tar.gz) = 12923761
+TIMESTAMP = 1718746617
+SHA256 (apache-tomcat-11.0.0-M21.tar.gz) = 7ec1b7a8cd750b362b9bd320aecfce8208a09094c5d762381b54d29b12ff8e15
+SIZE (apache-tomcat-11.0.0-M21.tar.gz) = 13000189
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index 4b828aaba363..142df7a0c801 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -27,7 +27,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.30.jar
+%%T%%/lib/ecj-4.31.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jakartaee-migration-1.0.8-shaded.jar
 %%T%%/lib/jasper-el.jar
@@ -105,6 +105,12 @@
 %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
 %%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
 %%DOCS%%%%T%%/webapps/docs/architecture/startup.html
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_catalina_load.svg
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/2_catalina_initliaze.svg
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/3_catalina_start_1.svg
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/4_catalina_start_2.svg
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/5_catalina_start_3.svg
+%%DOCS%%%%T%%/webapps/docs/architecture/startup/6_catalina_start_4.svg
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.pdf
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.txt
 %%DOCS%%%%T%%/webapps/docs/balancer-howto.html
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index 7ae0c6b24b3d..46c5b5771991 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	10.1.23
+DISTVERSION=	10.1.25
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
diff --git a/www/tomcat101/distinfo b/www/tomcat101/distinfo
index e0c1d5708410..28f3b80b7517 100644
--- a/www/tomcat101/distinfo
+++ b/www/tomcat101/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713910216
-SHA256 (apache-tomcat-10.1.23.tar.gz) = a5572c9e90ff81ea16681df97176bb6a9f537b1c3fbe0ffba5297fee59c398aa
-SIZE (apache-tomcat-10.1.23.tar.gz) = 12992318
+TIMESTAMP = 1718809015
+SHA256 (apache-tomcat-10.1.25.tar.gz) = f1240a32b879c445a4a4419c9b6dd87581bdb96f8a51f7b0ca1935164bb1e842
+SIZE (apache-tomcat-10.1.25.tar.gz) = 13022098
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 7d4c38725e9b..2a917eca7cc0 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-PORTVERSION=	9.0.88
+PORTVERSION=	9.0.90
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo
index c6e2c88b915b..3ba35231b703 100644
--- a/www/tomcat9/distinfo
+++ b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713281043
-SHA256 (apache-tomcat-9.0.88.tar.gz) = bef81ccaa4f7d7c89ea86eb56f6343c51cd793374c8ecc2038b7a7f5e27d6628
-SIZE (apache-tomcat-9.0.88.tar.gz) = 11744294
+TIMESTAMP = 1718794600
+SHA256 (apache-tomcat-9.0.90.tar.gz) = 318491c4be43494e6872b5277c40cac8506901d744ad09d37df62e88543f6223
+SIZE (apache-tomcat-9.0.90.tar.gz) = 11768699
diff --git a/www/tusc/Makefile b/www/tusc/Makefile
index 5fdece66a197..61e7b91aa1de 100644
--- a/www/tusc/Makefile
+++ b/www/tusc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tusc
 DISTVERSION=	0.4.7
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	osa@FreeBSD.org
diff --git a/www/tusd/Makefile b/www/tusd/Makefile
index ad867a492eab..24cb8cc1371f 100644
--- a/www/tusd/Makefile
+++ b/www/tusd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	tusd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	www
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/www/uchiwa/Makefile b/www/uchiwa/Makefile
index 91118fa36576..2b8572e62e78 100644
--- a/www/uchiwa/Makefile
+++ b/www/uchiwa/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		uchiwa
 PORTVERSION=	0.18.2
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=		www
 MASTER_SITES=	http://uchiwa.io/
 
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index de755f18bdc4..38dd9c95b374 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ungoogled-chromium
-PORTVERSION=	124.0.6367.78
+PORTVERSION=	124.0.6367.207
 UGVERSION=	${DISTVERSION}-1
 CATEGORIES=	www wayland
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/ \
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index c679ff3e28dd..4a93c2f69d53 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1714079979
-SHA256 (chromium-124.0.6367.78.tar.xz) = 697ea9e8591e0a74deea260a50441711b1ea499ca19e91d6012c5b4d200d1acf
-SIZE (chromium-124.0.6367.78.tar.xz) = 3438644780
-SHA256 (ungoogled-chromium-124.0.6367.78-1.tar.gz) = 8dabdfa54e0293790d6299aff28aaeb25d61359b0f99321ddd20df9031877c5b
-SIZE (ungoogled-chromium-124.0.6367.78-1.tar.gz) = 667153
-SHA256 (chromium-124.0.6367.78-testdata.tar.xz) = 910629247cf98b81ec9b323612068b0ad9f49379605863960e9e3b44f2d5a4cd
-SIZE (chromium-124.0.6367.78-testdata.tar.xz) = 280902680
+TIMESTAMP = 1715673313
+SHA256 (chromium-124.0.6367.207.tar.xz) = 6d6dc8b943012573a244ddb013b281ecbc97f77fe1fc6f55a4118241d107eba5
+SIZE (chromium-124.0.6367.207.tar.xz) = 3450794132
+SHA256 (ungoogled-chromium-124.0.6367.207-1.tar.gz) = e109631651affdaae2ddc22cc1e81f56d8c7eb583f816c6ee7de21d97977315b
+SIZE (ungoogled-chromium-124.0.6367.207-1.tar.gz) = 667461
+SHA256 (chromium-124.0.6367.207-testdata.tar.xz) = d30386a73719a64fdd191f7b51709185e4d3fc49888b04a390506d4370e69b06
+SIZE (chromium-124.0.6367.207-testdata.tar.xz) = 277899644
 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
index 0459ec4b8d77..56986599445b 100644
--- a/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig	2024-04-23 07:42:17 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2024-05-11 05:39:22 UTC
 +++ chrome/app/chrome_main_delegate.cc
 @@ -146,7 +146,7 @@
  #include "components/about_ui/credit_utils.h"
@@ -34,7 +34,7 @@
  #include "chrome/browser/policy/policy_path_parser.h"
  #include "components/crash/core/app/crashpad.h"
  #endif
-@@ -346,7 +346,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -349,7 +349,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
  // and resources loaded.
  bool SubprocessNeedsResourceBundle(const std::string& process_type) {
    return
@@ -43,7 +43,7 @@
        // The zygote process opens the resources for the renderers.
        process_type == switches::kZygoteProcess ||
  #endif
-@@ -431,7 +431,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -434,7 +434,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
  
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -52,7 +52,7 @@
  // Show the man page if --help or -h is on the command line.
  void HandleHelpSwitches(const base::CommandLine& command_line) {
    if (command_line.HasSwitch(switches::kHelp) ||
-@@ -477,7 +477,7 @@ void SetCrashpadUploadConsentPostLogin() {
+@@ -480,7 +480,7 @@ void SetCrashpadUploadConsentPostLogin() {
  }
  #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -61,7 +61,7 @@
  void SIGTERMProfilingShutdown(int signal) {
    content::Profiling::Stop();
    struct sigaction sigact;
-@@ -559,7 +559,7 @@ std::optional<int> AcquireProcessSingleton(
+@@ -562,7 +562,7 @@ std::optional<int> AcquireProcessSingleton(
    // process can be exited.
    ChromeProcessSingleton::CreateInstance(user_data_dir);
  
@@ -70,7 +70,7 @@
    // Read the xdg-activation token and set it in the command line for the
    // duration of the notification in order to ensure this is propagated to an
    // already running browser process if it exists.
-@@ -643,7 +643,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -646,7 +646,7 @@ void InitializeUserDataDir(base::CommandLine* command_
    std::string process_type =
        command_line->GetSwitchValueASCII(switches::kProcessType);
  
@@ -79,7 +79,7 @@
    // On Linux, Chrome does not support running multiple copies under different
    // DISPLAYs, so the profile directory can be specified in the environment to
    // support the virtual desktop use-case.
-@@ -770,7 +770,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -773,7 +773,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
  #endif
  
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -88,7 +88,7 @@
    // Record the startup process creation time on supported platforms. On Android
    // this is recorded in ChromeMainDelegateAndroid.
    startup_metric_utils::GetCommon().RecordStartupProcessCreationTime(
-@@ -1155,7 +1155,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+@@ -1162,7 +1162,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
        chrome::GetChannel() == version_info::Channel::DEV;
    const bool emit_crashes =
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -97,7 +97,7 @@
        is_canary_dev;
  #else
        false;
-@@ -1174,7 +1174,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
+@@ -1181,7 +1181,7 @@ void ChromeMainDelegate::CommonEarlyInitialization(Inv
    // for more context.
    base::sequence_manager::internal::ThreadController::InitializeFeatures(
        /*record_sample_metadata=*/is_canary_dev);
@@ -106,7 +106,7 @@
    base::MessagePumpLibevent::InitializeFeatures();
  #elif BUILDFLAG(IS_MAC)
    base::PlatformThread::InitFeaturesPostFieldTrial();
-@@ -1323,7 +1323,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
+@@ -1330,7 +1330,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  
    // TODO(crbug.com/1052397): Revisit the macro expression once build flag
    // switch of lacros-chrome is complete.
@@ -115,7 +115,7 @@
    // This will directly exit if the user asked for help.
    HandleHelpSwitches(command_line);
  #endif
-@@ -1353,7 +1353,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
+@@ -1360,7 +1360,7 @@ std::optional<int> ChromeMainDelegate::BasicStartupCom
  #if BUILDFLAG(IS_CHROMEOS)
    chromeos::dbus_paths::RegisterPathProvider();
  #endif
@@ -124,7 +124,7 @@
    nacl::RegisterPathProvider();
  #endif
  
-@@ -1750,7 +1750,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1757,7 +1757,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
      CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
    }
  
@@ -133,7 +133,7 @@
    // Zygote needs to call InitCrashReporter() in RunZygote().
    if (process_type != switches::kZygoteProcess) {
      if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1851,7 +1851,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1858,7 +1858,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
  
    // This entry is not needed on Linux, where the NaCl loader
    // process is launched via nacl_helper instead.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
index 54e29af84e54..7f44501ed5b4 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc
@@ -1,9 +1,9 @@
---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-04-23 07:42:17 UTC
+--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig	2024-05-11 05:39:22 UTC
 +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc
-@@ -169,7 +169,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt
- ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default;
+@@ -175,7 +175,7 @@ void ChromeBrowserMainExtraPartsLinux::PostBrowserStar
  
- void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() {
+ // static
+ void ChromeBrowserMainExtraPartsLinux::InitOzonePlatformHint() {
 -#if BUILDFLAG(IS_LINUX)
 +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
    // On the desktop, we fix the platform name if necessary.
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 7219cb6e234c..a115979b7fdb 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,4 +1,4 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2024-04-23 07:42:17 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2024-05-11 05:39:22 UTC
 +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 @@ -80,8 +80,10 @@
  
@@ -30,7 +30,7 @@
  #include "components/power_metrics/system_power_monitor.h"
  #endif
  
-@@ -858,7 +860,7 @@ void RecordStartupMetrics() {
+@@ -860,7 +862,7 @@ void RecordStartupMetrics() {
  
    // Record whether Chrome is the default browser or not.
    // Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -39,7 +39,7 @@
    shell_integration::DefaultWebClientState default_state =
        shell_integration::GetDefaultBrowser();
    base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -1162,11 +1164,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -1164,11 +1166,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
    }
  #endif  // !BUILDFLAG(IS_ANDROID)
  
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index e5ca4d4ae5e9..ae840bbf1d89 100644
--- a/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/ungoogled-chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/prefs/browser_prefs.cc.orig	2024-04-23 07:42:17 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig	2024-05-11 05:39:22 UTC
 +++ chrome/browser/prefs/browser_prefs.cc
 @@ -485,18 +485,18 @@
  #endif
@@ -31,7 +31,7 @@
  #include "ui/color/system_theme.h"
  #endif
  
-@@ -1711,7 +1711,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
+@@ -1718,7 +1718,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) 
    registry->RegisterBooleanPref(prefs::kOopPrintDriversAllowedByPolicy, true);
  #endif
  
@@ -40,7 +40,7 @@
    registry->RegisterBooleanPref(prefs::kChromeForTestingAllowed, true);
  #endif
  
-@@ -2053,12 +2053,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -2060,12 +2060,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
  #endif
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
index 3ac5967ad08e..1a7c6ba7ffe0 100644
--- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
+++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig	2024-04-23 07:42:17 UTC
+--- media/base/media_switches.cc.orig	2024-05-11 05:39:22 UTC
 +++ media/base/media_switches.cc
 @@ -21,7 +21,7 @@
  #include "ui/gl/gl_features.h"
@@ -92,7 +92,7 @@
               base::FEATURE_ENABLED_BY_DEFAULT
  #else
               base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1500,7 +1500,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
+@@ -1496,7 +1496,7 @@ BASE_FEATURE(kUseGTFOOutOfProcessVideoDecoding,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
  
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index 716193560c84..72a13e77567d 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2024-04-23 07:42:17 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig	2024-05-11 05:39:22 UTC
 +++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -321,7 +321,7 @@
+@@ -313,7 +313,7 @@
        name: "AppTitle",
        status: "experimental",
        origin_trial_feature_name: "AppTitle",
@@ -9,7 +9,7 @@
        base_feature: "WebAppEnableAppTitle",
      },
      {
-@@ -1978,7 +1978,7 @@
+@@ -1970,7 +1970,7 @@
        base_feature_status: "enabled",
        copied_from_base_feature_if: "overridden",
        origin_trial_feature_name: "FullscreenPopupWindows",
@@ -18,7 +18,7 @@
      },
      {
        name: "GamepadButtonAxisEvents",
-@@ -2899,7 +2899,7 @@
+@@ -2891,7 +2891,7 @@
        name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
        origin_trial_allows_third_party: true,
@@ -27,7 +27,7 @@
        status: "stable",
      },
      {
-@@ -3091,7 +3091,7 @@
+@@ -3083,7 +3083,7 @@
      {
        name: "PrivateNetworkAccessPermissionPrompt",
        origin_trial_feature_name: "PrivateNetworkAccessPermissionPrompt",
@@ -36,7 +36,7 @@
        status: "stable",
        public: true,
        base_feature: "none",
-@@ -3959,7 +3959,7 @@
+@@ -3951,7 +3951,7 @@
        name: "UnrestrictedSharedArrayBuffer",
        base_feature: "none",
        origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -45,7 +45,7 @@
      },
      // Enables using policy-controlled feature "usb-unrestricted" to allow
      // isolated context to access protected USB interface classes and to
-@@ -4119,7 +4119,7 @@
+@@ -4111,7 +4111,7 @@
      {
        name: "WebAppScopeExtensions",
        origin_trial_feature_name: "WebAppScopeExtensions",
diff --git a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
index acda9751c795..59184e5e4f85 100644
--- a/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
+++ b/www/ungoogled-chromium/files/patch-ui_base_ui__base__features.cc
@@ -1,6 +1,6 @@
---- ui/base/ui_base_features.cc.orig	2024-04-23 07:42:17 UTC
+--- ui/base/ui_base_features.cc.orig	2024-05-11 05:39:22 UTC
 +++ ui/base/ui_base_features.cc
-@@ -227,7 +227,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
+@@ -228,7 +228,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
               "ExperimentalFlingAnimation",
  // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
  // of lacros-chrome is complete.
@@ -9,7 +9,7 @@
      (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
       !BUILDFLAG(IS_CHROMEOS_LACROS))
               base::FEATURE_ENABLED_BY_DEFAULT
-@@ -326,7 +326,7 @@ bool IsForcedColorsEnabled() {
+@@ -327,7 +327,7 @@ bool IsForcedColorsEnabled() {
  BASE_FEATURE(kEyeDropper,
               "EyeDropper",
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/varnish_exporter/Makefile b/www/varnish_exporter/Makefile
index d10fcebb674c..3978f37f3de0 100644
--- a/www/varnish_exporter/Makefile
+++ b/www/varnish_exporter/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		varnish_exporter
 PORTVERSION=		1.6
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=		www
 
 MAINTAINER=		ports@zx23.net
diff --git a/www/vultr-cli/Makefile b/www/vultr-cli/Makefile
index f123ccbb787f..c1789fa37029 100644
--- a/www/vultr-cli/Makefile
+++ b/www/vultr-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	vultr-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.17.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www
 
 MAINTAINER=	antranigv@freebsd.am
diff --git a/www/webhook/Makefile b/www/webhook/Makefile
index 90e361a3b0ad..e1ea2d09c619 100644
--- a/www/webhook/Makefile
+++ b/www/webhook/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	webhook
 PORTVERSION=	2.8.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	stb@lassitu.de
diff --git a/www/websocketd/Makefile b/www/websocketd/Makefile
index 615de7222ed0..e373df1e5c7d 100644
--- a/www/websocketd/Makefile
+++ b/www/websocketd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	websocketd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.1
-PORTREVISION=	18
+PORTREVISION=	20
 CATEGORIES=	www
 
 MAINTAINER=	ygy@FreeBSD.org
diff --git a/www/writeas-cli/Makefile b/www/writeas-cli/Makefile
index 83efee057ccb..b4919fa3f0ca 100644
--- a/www/writeas-cli/Makefile
+++ b/www/writeas-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	writeas-cli
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-wf
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www textproc
 MASTER_SITES=	https://code.as/core/socks/archive/v1.0.0.tar.gz?dummy=/:core_socks
 DISTFILES=	core-socks-v1.0.0.tar.gz:core_socks
diff --git a/www/wuzz/Makefile b/www/wuzz/Makefile
index 526bcbdc5327..7c0a9377af68 100644
--- a/www/wuzz/Makefile
+++ b/www/wuzz/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	wuzz
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile
index 51f22d8ecbc2..70af39917517 100644
--- a/www/xcaddy/Makefile
+++ b/www/xcaddy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xcaddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.5
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www
 DIST_SUBDIR=	xcaddy
 
diff --git a/www/xurls/Makefile b/www/xurls/Makefile
index 9afa8b51b7c2..d04a4f7cee16 100644
--- a/www/xurls/Makefile
+++ b/www/xurls/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xurls
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/www/yarr/Makefile b/www/yarr/Makefile
index 43548e5429f1..9a2678600f69 100644
--- a/www/yarr/Makefile
+++ b/www/yarr/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	yarr
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.4
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	www
 
 MAINTAINER=	decke@FreeBSD.org
diff --git a/www/ytdl/Makefile b/www/ytdl/Makefile
index 1b3264f007db..e0baacb86bb9 100644
--- a/www/ytdl/Makefile
+++ b/www/ytdl/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ytdl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
-PORTREVISION=	19
+PORTREVISION=	21
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/www/zgrab2/Makefile b/www/zgrab2/Makefile
index 203bc613f811..8a32d28a22ac 100644
--- a/www/zgrab2/Makefile
+++ b/www/zgrab2/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	zgrab2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.7
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 045e61e53835..11ddd474cf3d 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	21.0.99.1-1044
-DISTVERSIONSUFFIX=	-g069ad69ef
+DISTVERSION=	21.0.99.1-1118
+DISTVERSIONSUFFIX=	-g05c63d2a0
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
@@ -43,10 +43,10 @@ MESON_ARGS=	-D${PORTNAME}=true \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
-		libdata/pkgconfig/xwayland.pc \
+		share/applications/org.freedesktop.Xwayland.desktop \
 		"@comment share/man/man1/Xserver.1.gz" \
 		share/man/man1/Xwayland.1.gz \
-		share/applications/org.freedesktop.Xwayland.desktop
+		share/pkgconfig/xwayland.pc
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 02a7403a522a..79af86d4a714 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1714637855
-SHA256 (xserver-xorg-server-21.0.99.1-1044-g069ad69ef.tar.bz2) = f073e2fd93c63a3abdfdfd8193496c32ef3591a61fae0b071a119e9ab7d0dcf3
-SIZE (xserver-xorg-server-21.0.99.1-1044-g069ad69ef.tar.bz2) = 3710158
+TIMESTAMP = 1719237191
+SHA256 (xserver-xorg-server-21.0.99.1-1118-g05c63d2a0.tar.bz2) = 3846a8e01e121ccfb7530d8646e1e7d6e43136f4b1e8aa3b6e5ed6e0330d7bfe
+SIZE (xserver-xorg-server-21.0.99.1-1118-g05c63d2a0.tar.bz2) = 3708850
 SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
 SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116
diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index 5b650cf2a302..cb5162e71dcc 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xwayland
-PORTVERSION=	23.2.6
+PORTVERSION=	23.2.7
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo
index 6b699d178722..ee923282ceab 100644
--- a/x11-servers/xwayland/distinfo
+++ b/x11-servers/xwayland/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1712666955
-SHA256 (xwayland-23.2.6.tar.xz) = 1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d
-SIZE (xwayland-23.2.6.tar.xz) = 1300092
+TIMESTAMP = 1715754215
+SHA256 (xwayland-23.2.7.tar.xz) = 769e5133929ca4a4141d8e8d34dbbceea1dceaa93cf7a0b90ad7e76965e40055
+SIZE (xwayland-23.2.7.tar.xz) = 1295016
 SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
 SIZE (cd6c9c1246af.patch) = 3730
 SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425
diff --git a/x11-themes/plasma5-breeze/Makefile b/x11-themes/plasma5-breeze/Makefile
index bcc32d466496..8188a48635bf 100644
--- a/x11-themes/plasma5-breeze/Makefile
+++ b/x11-themes/plasma5-breeze/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	breeze
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-themes kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-themes/plasma5-breeze/files/patch-CMakeLists.txt b/x11-themes/plasma5-breeze/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..292ee6598d1e
--- /dev/null
+++ b/x11-themes/plasma5-breeze/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2024-03-06 11:58:27 UTC
++++ CMakeLists.txt
+@@ -1,6 +1,6 @@ project(breeze)
+ cmake_minimum_required(VERSION 3.16)
+ project(breeze)
+-set(PROJECT_VERSION "5.27.10")
++set(PROJECT_VERSION "5.27.11")
+ set(PROJECT_VERSION_MAJOR 5)
+ 
+ set(KF5_MIN_VERSION "5.102.0")
diff --git a/x11-themes/plasma5-breeze/pkg-plist b/x11-themes/plasma5-breeze/pkg-plist
index 9f1bb5e1c85b..7954bcd59659 100644
--- a/x11-themes/plasma5-breeze/pkg-plist
+++ b/x11-themes/plasma5-breeze/pkg-plist
@@ -5,7 +5,7 @@ lib/kconf_update_bin/breezehighcontrasttobreezedark
 lib/kconf_update_bin/breezetobreezeclassic
 lib/kconf_update_bin/breezetobreezelight
 lib/libbreezecommon5.so.5
-lib/libbreezecommon5.so.5.27.10
+lib/libbreezecommon5.so.%%KDE_PLASMA_VERSION%%
 %%QT_PLUGINDIR%%/org.kde.kdecoration2/breezedecoration.so
 %%QT_PLUGINDIR%%/plasma/kcms/breeze/kcm_breezedecoration.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings_qwidgets/breezestyleconfig.so
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c20bd418a6cb..44bf101564a0 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gtk
-DISTVERSION=	3.24.41 # sync with x11-themes: adwaita-icon-theme, gnome-themes-standard and mate-themes
+DISTVERSION=	3.24.42 # sync with x11-themes: adwaita-icon-theme, gnome-themes-standard and mate-themes
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${DISTVERSION:R}
 PKGNAMESUFFIX=	3
@@ -37,7 +37,7 @@ MESON_ARGS=	-Dtests=false
 
 PORTSCOUT=	limit:1,even
 
-LIBVERSION=	0.2409.32
+LIBVERSION=	0.2410.32
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 OPTIONS_DEFINE=		ATK_BRIDGE COLORD CUPS DEBUG DOCS
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index b422633400ea..42b1cb057168 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706058874
-SHA256 (gnome/gtk+-3.24.41.tar.xz) = 47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa
-SIZE (gnome/gtk+-3.24.41.tar.xz) = 13188312
+TIMESTAMP = 1715806360
+SHA256 (gnome/gtk+-3.24.42.tar.xz) = 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2
+SIZE (gnome/gtk+-3.24.42.tar.xz) = 13226980
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 1cf420cf8636..e815fcbbeaa2 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1332,6 +1332,8 @@ share/locale/ja/LC_MESSAGES/gtk30-properties.mo
 share/locale/ja/LC_MESSAGES/gtk30.mo
 share/locale/ka/LC_MESSAGES/gtk30-properties.mo
 share/locale/ka/LC_MESSAGES/gtk30.mo
+share/locale/kab/LC_MESSAGES/gtk30-properties.mo
+share/locale/kab/LC_MESSAGES/gtk30.mo
 share/locale/kg/LC_MESSAGES/gtk30-properties.mo
 share/locale/kg/LC_MESSAGES/gtk30.mo
 share/locale/kk/LC_MESSAGES/gtk30-properties.mo
diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index 0e0b10233aaf..04ebc8e3351e 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gtk
-PORTVERSION=	4.14.2
+PORTVERSION=	4.14.4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	4
@@ -37,7 +37,7 @@ LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
-LIBVERSION=	1.1400.2
+LIBVERSION=	1.1400.4
 PLIST_SUB+=	LIBVERSION=${LIBVERSION}
 
 GLIB_SCHEMAS=	org.gtk.Demo4.gschema.xml \
diff --git a/x11-toolkits/gtk40/distinfo b/x11-toolkits/gtk40/distinfo
index c6bedb274256..0b42ee10ea75 100644
--- a/x11-toolkits/gtk40/distinfo
+++ b/x11-toolkits/gtk40/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712620699
-SHA256 (gnome/gtk-4.14.2.tar.xz) = 22604cef2898a79e5f2143bb7aee2b7d1fa2eb946989a9d1338ecf9c8ae0e072
-SIZE (gnome/gtk-4.14.2.tar.xz) = 18331244
+TIMESTAMP = 1714692806
+SHA256 (gnome/gtk-4.14.4.tar.xz) = 443518b97e8348f9f6430ac435b1010f9a6c5207f4dc6a7cd5d24e3820cee633
+SIZE (gnome/gtk-4.14.4.tar.xz) = 18306548
diff --git a/x11-toolkits/libadwaita/Makefile b/x11-toolkits/libadwaita/Makefile
index 83891a16e65d..9d1e3514d47e 100644
--- a/x11-toolkits/libadwaita/Makefile
+++ b/x11-toolkits/libadwaita/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libadwaita
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/libadwaita/distinfo b/x11-toolkits/libadwaita/distinfo
index c7ddc3ab8e9c..19e19d5b9bac 100644
--- a/x11-toolkits/libadwaita/distinfo
+++ b/x11-toolkits/libadwaita/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710515856
-SHA256 (libadwaita-1.5.0.tar.xz) = fd92287df9bb95c963654fb6e70d3e082e2bcb37b147e0e3c905567167993783
-SIZE (libadwaita-1.5.0.tar.xz) = 4352384
+TIMESTAMP = 1719579426
+SHA256 (libadwaita-1.5.2.tar.xz) = c9faee005cb4912bce34f69f1af26b01a364534e12ede5d9bac44d8226d72c16
+SIZE (libadwaita-1.5.2.tar.xz) = 4456060
diff --git a/x11-toolkits/libadwaita/pkg-plist b/x11-toolkits/libadwaita/pkg-plist
index b7d607b2525f..fc56a8021ea6 100644
--- a/x11-toolkits/libadwaita/pkg-plist
+++ b/x11-toolkits/libadwaita/pkg-plist
@@ -397,18 +397,6 @@ share/applications/org.gnome.Adwaita1.Demo.desktop
 %%PORTDOCS%%%%DOCSDIR%%-1/flat-header-bar.png
 %%PORTDOCS%%%%DOCSDIR%%-1/fonts.css
 %%PORTDOCS%%%%DOCSDIR%%-1/func.CHECK_VERSION.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_IN_1_1_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_IN_1_2_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_IN_1_3_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_IN_1_4_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_IN_1_5_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_TYPE_IN_1_1_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_TYPE_IN_1_2_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_TYPE_IN_1_3_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_TYPE_IN_1_4_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.DEPRECATED_TYPE_IN_1_5_FOR.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.ENCODE_VERSION.html
-%%PORTDOCS%%%%DOCSDIR%%-1/func.UNAVAILABLE.html
 %%PORTDOCS%%%%DOCSDIR%%-1/func.get_enable_animations.html
 %%PORTDOCS%%%%DOCSDIR%%-1/func.get_major_version.html
 %%PORTDOCS%%%%DOCSDIR%%-1/func.get_micro_version.html
diff --git a/x11-toolkits/libshumate/Makefile b/x11-toolkits/libshumate/Makefile
index 0a5cbf5a6f31..3ba163b80eb5 100644
--- a/x11-toolkits/libshumate/Makefile
+++ b/x11-toolkits/libshumate/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libshumate
-DISTVERSION=	1.2.1
+DISTVERSION=	1.2.2
 CATEGORIES=	x11-toolkits geography
 MASTER_SITES=	GNOME
 
diff --git a/x11-toolkits/libshumate/distinfo b/x11-toolkits/libshumate/distinfo
index badad12a2037..e8c924eb8600 100644
--- a/x11-toolkits/libshumate/distinfo
+++ b/x11-toolkits/libshumate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713602634
-SHA256 (libshumate-1.2.1.tar.xz) = 1105ee077e2147f2a039cddfa616fa5cb9438883dd940427e11699dcd6549c11
-SIZE (libshumate-1.2.1.tar.xz) = 321184
+TIMESTAMP = 1716621615
+SHA256 (libshumate-1.2.2.tar.xz) = 6f587579f7f2d60b38d3f4727eb1a8d2feac9cbdc018e53ff5f772a8608fa44b
+SIZE (libshumate-1.2.2.tar.xz) = 321216
diff --git a/x11-toolkits/py-qt6-chart/Makefile b/x11-toolkits/py-qt6-chart/Makefile
index 28359c0b8d68..f38512934c34 100644
--- a/x11-toolkits/py-qt6-chart/Makefile
+++ b/x11-toolkits/py-qt6-chart/Makefile
@@ -13,14 +13,11 @@ WWW=		https://riverbankcomputing.com/software/pyqtchart
 
 LICENSE=	${PYQT6_LICENSE}
 
-LIB_DEPENDS=	libqscintilla2_qt6.so:devel/qscintilla2-qt6
-
 USES=		gl pyqt:6 python qt:6
-USE_GL=		gl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYQT=	sip:build pyqt6 qtbuilder
 USE_PYTHON=	concurrent flavors
-USE_QT=		base charts declarative
+USE_QT=		base charts
 
 PLIST_SUB=	PYQTCHART_VERSION=${DISTVERSION}
 
diff --git a/x11-toolkits/py-qt6-chart/distinfo b/x11-toolkits/py-qt6-chart/distinfo
index 2a7e119613f9..7b736cb07cd8 100644
--- a/x11-toolkits/py-qt6-chart/distinfo
+++ b/x11-toolkits/py-qt6-chart/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698899792
-SHA256 (PyQt6_Charts-6.6.0.tar.gz) = 14cc6e5d19cae80129524a42fa6332d0d5dada4282a9423425e6b9ae1b6bc56d
-SIZE (PyQt6_Charts-6.6.0.tar.gz) = 41221
+TIMESTAMP = 1714272017
+SHA256 (PyQt6_Charts-6.7.0.tar.gz) = c4f7cf369928f7bf032e4e33f718d3b8fe66da176d4959fe30735a970d86f35c
+SIZE (PyQt6_Charts-6.7.0.tar.gz) = 41390
diff --git a/x11-toolkits/py-qt6-datavis3d/Makefile b/x11-toolkits/py-qt6-datavis3d/Makefile
index a2f0b35294a2..5bbd80b56c2b 100644
--- a/x11-toolkits/py-qt6-datavis3d/Makefile
+++ b/x11-toolkits/py-qt6-datavis3d/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Python bindings for the Qt6 data visualization library
 WWW=		https://riverbankcomputing.com/software/pyqtdatavisualization/
 
 USES=		gl pyqt:6 python qt:6
-USE_GL=		gl
-USE_LOCALE=	C.UTF-8
+USE_GL=		opengl
 USE_PYQT=	sip:build pyqt6 qtbuilder:build
 USE_PYTHON=	concurrent flavors
 USE_QT=		base datavis3d
diff --git a/x11-toolkits/py-qt6-datavis3d/distinfo b/x11-toolkits/py-qt6-datavis3d/distinfo
index 798540481cbe..deff4dcceb00 100644
--- a/x11-toolkits/py-qt6-datavis3d/distinfo
+++ b/x11-toolkits/py-qt6-datavis3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698900083
-SHA256 (PyQt6_DataVisualization-6.6.0.tar.gz) = 5ad62a0f9815eca3acdff1078cfc2c10f6542c1d5cfe53626c0015e854441479
-SIZE (PyQt6_DataVisualization-6.6.0.tar.gz) = 209892
+TIMESTAMP = 1714272032
+SHA256 (PyQt6_DataVisualization-6.7.0.tar.gz) = 8cbdd50326a2cda533bc5744c85a331c84047af121bdbd64f9c00dbc06588884
+SIZE (PyQt6_DataVisualization-6.7.0.tar.gz) = 210038
diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo
index bacc5c3d1b22..ad71dac624c1 100644
--- a/x11-toolkits/qt5-charts/distinfo
+++ b/x11-toolkits/qt5-charts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771168
-SHA256 (KDE/Qt/5.15.13/kde-qtcharts-5.15.13p0.tar.xz) = 65cd24c3423caf1f3420ad3eb6d8b0bf4c2fab2a3946533cd1e01e8c30ede8de
-SIZE (KDE/Qt/5.15.13/kde-qtcharts-5.15.13p0.tar.xz) = 4219188
+TIMESTAMP = 1716930669
+SHA256 (KDE/Qt/5.15.14/kde-qtcharts-5.15.14p0.tar.xz) = 4fdf16d9fc091a19b33c04b97844f70475b590f3de5ba31d40002451d54c8b7f
+SIZE (KDE/Qt/5.15.14/kde-qtcharts-5.15.14p0.tar.xz) = 4219228
diff --git a/x11-toolkits/qt5-datavis3d/distinfo b/x11-toolkits/qt5-datavis3d/distinfo
index 43159bfe38e0..39c76f7ca788 100644
--- a/x11-toolkits/qt5-datavis3d/distinfo
+++ b/x11-toolkits/qt5-datavis3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771169
-SHA256 (KDE/Qt/5.15.13/kde-qtdatavis3d-5.15.13p0.tar.xz) = 186f2dfb218f86af09d9400807d71cc7b4d5a35759f550b8b36903c290efeebe
-SIZE (KDE/Qt/5.15.13/kde-qtdatavis3d-5.15.13p0.tar.xz) = 5159904
+TIMESTAMP = 1716930670
+SHA256 (KDE/Qt/5.15.14/kde-qtdatavis3d-5.15.14p0.tar.xz) = db5b9d1d46cfdfc3c24d1e814f2f00faac582cdff0f578be6f7f132b94149944
+SIZE (KDE/Qt/5.15.14/kde-qtdatavis3d-5.15.14p0.tar.xz) = 5159880
diff --git a/x11-toolkits/qt5-declarative-test/distinfo b/x11-toolkits/qt5-declarative-test/distinfo
index e3313673b82c..a8b65754e899 100644
--- a/x11-toolkits/qt5-declarative-test/distinfo
+++ b/x11-toolkits/qt5-declarative-test/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771170
-SHA256 (KDE/Qt/5.15.13/kde-qtdeclarative-5.15.13p30.tar.xz) = eb92bd79904a4b922ec127c6bfe1960c5cdafad62ad25595793c8f15297ab8c0
-SIZE (KDE/Qt/5.15.13/kde-qtdeclarative-5.15.13p30.tar.xz) = 21387588
+TIMESTAMP = 1716930671
+SHA256 (KDE/Qt/5.15.14/kde-qtdeclarative-5.15.14p28.tar.xz) = f0358ec37e692d153e5de7d74271832eef1b441f35a1892464551785ee8936bf
+SIZE (KDE/Qt/5.15.14/kde-qtdeclarative-5.15.14p28.tar.xz) = 21390164
diff --git a/x11-toolkits/qt5-declarative/distinfo b/x11-toolkits/qt5-declarative/distinfo
index 376ea191cbdf..892230b42bb9 100644
--- a/x11-toolkits/qt5-declarative/distinfo
+++ b/x11-toolkits/qt5-declarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771171
-SHA256 (KDE/Qt/5.15.13/kde-qtdeclarative-5.15.13p30.tar.xz) = eb92bd79904a4b922ec127c6bfe1960c5cdafad62ad25595793c8f15297ab8c0
-SIZE (KDE/Qt/5.15.13/kde-qtdeclarative-5.15.13p30.tar.xz) = 21387588
+TIMESTAMP = 1716930672
+SHA256 (KDE/Qt/5.15.14/kde-qtdeclarative-5.15.14p28.tar.xz) = f0358ec37e692d153e5de7d74271832eef1b441f35a1892464551785ee8936bf
+SIZE (KDE/Qt/5.15.14/kde-qtdeclarative-5.15.14p28.tar.xz) = 21390164
diff --git a/x11-toolkits/qt5-gamepad/distinfo b/x11-toolkits/qt5-gamepad/distinfo
index f1c3de053e04..0a9c26a39c4c 100644
--- a/x11-toolkits/qt5-gamepad/distinfo
+++ b/x11-toolkits/qt5-gamepad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771172
-SHA256 (KDE/Qt/5.15.13/kde-qtgamepad-5.15.13p0.tar.xz) = 4b96809fafb8896551c8adfd5a503ece46397840aed223f86e7a8fe6e8983065
-SIZE (KDE/Qt/5.15.13/kde-qtgamepad-5.15.13p0.tar.xz) = 365456
+TIMESTAMP = 1716930673
+SHA256 (KDE/Qt/5.15.14/kde-qtgamepad-5.15.14p0.tar.xz) = f7d4764c6572c316559cdb40f5bce96796b4579a8c7855c718da745d7aad1895
+SIZE (KDE/Qt/5.15.14/kde-qtgamepad-5.15.14p0.tar.xz) = 365452
diff --git a/x11-toolkits/qt5-gui/distinfo b/x11-toolkits/qt5-gui/distinfo
index 56cf2f3cb010..88f259c1487e 100644
--- a/x11-toolkits/qt5-gui/distinfo
+++ b/x11-toolkits/qt5-gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771174
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716930674
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/x11-toolkits/qt5-quick3d/distinfo b/x11-toolkits/qt5-quick3d/distinfo
index 4851260cd518..85c9e024eba9 100644
--- a/x11-toolkits/qt5-quick3d/distinfo
+++ b/x11-toolkits/qt5-quick3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771175
-SHA256 (KDE/Qt/5.15.13/kde-qtquick3d-5.15.13p1.tar.xz) = 2d9e45333f5ab46b96909a125729bc51edb7ab6e35deef40e8938ef1f49bc565
-SIZE (KDE/Qt/5.15.13/kde-qtquick3d-5.15.13p1.tar.xz) = 55708128
+TIMESTAMP = 1716930675
+SHA256 (KDE/Qt/5.15.14/kde-qtquick3d-5.15.14p1.tar.xz) = a87c62059ca1bb48cafcb8e711d09e810943f0da37a80c00e2f34aa7838d1ed0
+SIZE (KDE/Qt/5.15.14/kde-qtquick3d-5.15.14p1.tar.xz) = 55720556
diff --git a/x11-toolkits/qt5-quickcontrols/distinfo b/x11-toolkits/qt5-quickcontrols/distinfo
index 101aa94a5b6b..c995fa4f5b9e 100644
--- a/x11-toolkits/qt5-quickcontrols/distinfo
+++ b/x11-toolkits/qt5-quickcontrols/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771176
-SHA256 (KDE/Qt/5.15.13/kde-qtquickcontrols-5.15.13p0.tar.xz) = 7bd6ebe30bda438c1c595ae1d0ab0531b050cfeb978410e6961c78a40f4739a8
-SIZE (KDE/Qt/5.15.13/kde-qtquickcontrols-5.15.13p0.tar.xz) = 5954816
+TIMESTAMP = 1716930675
+SHA256 (KDE/Qt/5.15.14/kde-qtquickcontrols-5.15.14p0.tar.xz) = b492a9a151829987fee3bd7fea23a7f1f4eab3a4a62327520c910144d482a685
+SIZE (KDE/Qt/5.15.14/kde-qtquickcontrols-5.15.14p0.tar.xz) = 5955820
diff --git a/x11-toolkits/qt5-quickcontrols2/distinfo b/x11-toolkits/qt5-quickcontrols2/distinfo
index 7b4ab3050896..19b0622f2481 100644
--- a/x11-toolkits/qt5-quickcontrols2/distinfo
+++ b/x11-toolkits/qt5-quickcontrols2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771177
-SHA256 (KDE/Qt/5.15.13/kde-qtquickcontrols2-5.15.13p5.tar.xz) = 13d582e28ddd5544d078c7fc25a1ab1a57b7d9cb4846db0036670153e0b4b8d4
-SIZE (KDE/Qt/5.15.13/kde-qtquickcontrols2-5.15.13p5.tar.xz) = 8250152
+TIMESTAMP = 1716930676
+SHA256 (KDE/Qt/5.15.14/kde-qtquickcontrols2-5.15.14p5.tar.xz) = d1b666c7d81728975ff42d05068895b466178d75bb018fddf67a2bed9e64b59a
+SIZE (KDE/Qt/5.15.14/kde-qtquickcontrols2-5.15.14p5.tar.xz) = 8250344
diff --git a/x11-toolkits/qt5-quicktimeline/distinfo b/x11-toolkits/qt5-quicktimeline/distinfo
index 346015a27a7c..7911f4228709 100644
--- a/x11-toolkits/qt5-quicktimeline/distinfo
+++ b/x11-toolkits/qt5-quicktimeline/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771178
-SHA256 (KDE/Qt/5.15.13/kde-qtquicktimeline-5.15.13p0.tar.xz) = df4ed9c56f7ef47b25dbe708bc1be142592788081cf0649f1040415d090a1fa4
-SIZE (KDE/Qt/5.15.13/kde-qtquicktimeline-5.15.13p0.tar.xz) = 82128
+TIMESTAMP = 1716930677
+SHA256 (KDE/Qt/5.15.14/kde-qtquicktimeline-5.15.14p0.tar.xz) = 206a0ce3cbbaf0c0e7581847d455dbdfe7c9e3de3496f4e6475338ec8f70256b
+SIZE (KDE/Qt/5.15.14/kde-qtquicktimeline-5.15.14p0.tar.xz) = 82152
diff --git a/x11-toolkits/qt5-uiplugin/distinfo b/x11-toolkits/qt5-uiplugin/distinfo
index a7dc15b5d797..f24537af1a46 100644
--- a/x11-toolkits/qt5-uiplugin/distinfo
+++ b/x11-toolkits/qt5-uiplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771179
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716930678
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/x11-toolkits/qt5-virtualkeyboard/distinfo b/x11-toolkits/qt5-virtualkeyboard/distinfo
index 2cb240d9d83f..d436338e52f3 100644
--- a/x11-toolkits/qt5-virtualkeyboard/distinfo
+++ b/x11-toolkits/qt5-virtualkeyboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771180
-SHA256 (KDE/Qt/5.15.13/kde-qtvirtualkeyboard-5.15.13p0.tar.xz) = 31dbfc505c1bd593f5f0c677ef1d2a48030501c2cb818fd6bccdc1edb5a30efe
-SIZE (KDE/Qt/5.15.13/kde-qtvirtualkeyboard-5.15.13p0.tar.xz) = 10934096
+TIMESTAMP = 1716930679
+SHA256 (KDE/Qt/5.15.14/kde-qtvirtualkeyboard-5.15.14p0.tar.xz) = 7cd8e7d467a155cf77c044d34031e2649eb4dc9b74822de70eb60a1f644551cf
+SIZE (KDE/Qt/5.15.14/kde-qtvirtualkeyboard-5.15.14p0.tar.xz) = 10930348
diff --git a/x11-toolkits/qt5-widgets/distinfo b/x11-toolkits/qt5-widgets/distinfo
index 7d0ed60996d2..23acbf5cebed 100644
--- a/x11-toolkits/qt5-widgets/distinfo
+++ b/x11-toolkits/qt5-widgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771182
-SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
-SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
+TIMESTAMP = 1716930680
+SHA256 (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 13384627ae80d566bac30cd84073c52abb7b7a62dda065ad8210a69ea0e21769
+SIZE (KDE/Qt/5.15.14/kde-qtbase-5.15.14p140.tar.xz) = 50421560
diff --git a/x11-toolkits/qt6-charts/distinfo b/x11-toolkits/qt6-charts/distinfo
index e8605b5c2c34..d6710049de36 100644
--- a/x11-toolkits/qt6-charts/distinfo
+++ b/x11-toolkits/qt6-charts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664677
-SHA256 (KDE/Qt/6.6.3/qtcharts-everywhere-src-6.6.3.tar.xz) = 50968886148fd2564ba52c702cfbf260e35956327a6bcd8001ae658eaa157fe5
-SIZE (KDE/Qt/6.6.3/qtcharts-everywhere-src-6.6.3.tar.xz) = 4660256
+TIMESTAMP = 1718779152
+SHA256 (KDE/Qt/6.7.2/qtcharts-everywhere-src-6.7.2.tar.xz) = 00f6a437458b7f2c4e81d748dbe2a077567a9e6ad8d8e3820b36c39dc5279bda
+SIZE (KDE/Qt/6.7.2/qtcharts-everywhere-src-6.7.2.tar.xz) = 4661448
diff --git a/x11-toolkits/qt6-datavis3d/distinfo b/x11-toolkits/qt6-datavis3d/distinfo
index cd8ad5d638ed..4d0d54eba4c7 100644
--- a/x11-toolkits/qt6-datavis3d/distinfo
+++ b/x11-toolkits/qt6-datavis3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664689
-SHA256 (KDE/Qt/6.6.3/qtdatavis3d-everywhere-src-6.6.3.tar.xz) = 9b1781e464901996b56f31a5cef3e50aac051906e0e535b21b36ca3ae140dfbf
-SIZE (KDE/Qt/6.6.3/qtdatavis3d-everywhere-src-6.6.3.tar.xz) = 3947424
+TIMESTAMP = 1718779153
+SHA256 (KDE/Qt/6.7.2/qtdatavis3d-everywhere-src-6.7.2.tar.xz) = c0ebc87d95deb595106fc68ed7e6de05149a18917d68cff40905c57fc6694e53
+SIZE (KDE/Qt/6.7.2/qtdatavis3d-everywhere-src-6.7.2.tar.xz) = 3947856
diff --git a/x11-toolkits/qt6-declarative/distinfo b/x11-toolkits/qt6-declarative/distinfo
index c11ecb6623de..62bddc368b7a 100644
--- a/x11-toolkits/qt6-declarative/distinfo
+++ b/x11-toolkits/qt6-declarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664769
-SHA256 (KDE/Qt/6.6.3/qtdeclarative-everywhere-src-6.6.3.tar.xz) = 05207b2cfcf2ca74321165e81fc382ca289340d52de74ca2bad4c2b124a792f3
-SIZE (KDE/Qt/6.6.3/qtdeclarative-everywhere-src-6.6.3.tar.xz) = 34374500
+TIMESTAMP = 1718779154
+SHA256 (KDE/Qt/6.7.2/qtdeclarative-everywhere-src-6.7.2.tar.xz) = 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999
+SIZE (KDE/Qt/6.7.2/qtdeclarative-everywhere-src-6.7.2.tar.xz) = 35629324
diff --git a/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake b/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake
index c2f2bd6291a7..17e786354692 100644
--- a/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake
+++ b/x11-toolkits/qt6-declarative/files/patch-src_qml_configure.cmake
@@ -1,11 +1,13 @@
---- src/qml/configure.cmake.orig	2023-07-26 19:30:31 UTC
+--- src/qml/configure.cmake.orig	2023-12-12 03:17:50 UTC
 +++ src/qml/configure.cmake
-@@ -117,7 +117,7 @@ qt_feature("qml-jit" PRIVATE
-     LABEL "QML just-in-time compiler"
-     PURPOSE "Provides a JIT for QML and JavaScript"
+@@ -96,8 +96,8 @@ qt_feature("qml-jit" PRIVATE
      AUTODETECT NOT IOS AND NOT TVOS
--    CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
-+    CONDITION ( ( ( TEST_architecture_arch STREQUAL i386 ) AND TEST_pointer_32bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL x86_64 ) AND TEST_pointer_64bit AND QT_FEATURE_sse2 ) OR ( ( TEST_architecture_arch STREQUAL arm ) AND TEST_pointer_32bit AND TEST_arm_fp AND TEST_arm_thumb AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR ( ( TEST_architecture_arch STREQUAL arm64 ) AND TEST_pointer_64bit AND TEST_arm_fp AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
+     CONDITION ( ( TEST_architecture_arch STREQUAL i386 AND QT_FEATURE_sse2 ) OR
+         ( TEST_architecture_arch STREQUAL x86_64 AND QT_FEATURE_sse2 ) OR
+-        ( TEST_architecture_arch STREQUAL arm AND TEST_arm_fp AND TEST_arm_thumb AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR
+-        ( TEST_architecture_arch STREQUAL arm64 AND TEST_arm_fp AND ( ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
++        ( TEST_architecture_arch STREQUAL arm AND TEST_arm_fp AND TEST_arm_thumb AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX ) ) OR
++        ( TEST_architecture_arch STREQUAL arm64 AND TEST_arm_fp AND ( FREEBSD OR ANDROID OR LINUX OR IOS OR TVOS OR QNX OR INTEGRITY ) ) )
  )
  # special case begin
  # When doing macOS universal builds, JIT needs to be disabled for the ARM slice.
diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist
index 7f60c3c7e7f2..0864b85e1a74 100644
--- a/x11-toolkits/qt6-declarative/pkg-plist
+++ b/x11-toolkits/qt6-declarative/pkg-plist
@@ -179,6 +179,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptblob_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptdata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlsignalnames_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlsourcecoordinate_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltcobjectcreationhelper_p.h
@@ -315,6 +316,8 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4writebarrier_p.h
 %%QT_INCDIR%%/QtQml/QJSEngine
 %%QT_INCDIR%%/QtQml/QJSList
+%%QT_INCDIR%%/QtQml/QJSListForInIterator
+%%QT_INCDIR%%/QtQml/QJSListForOfIterator
 %%QT_INCDIR%%/QtQml/QJSListIndexClamp
 %%QT_INCDIR%%/QtQml/QJSManagedValue
 %%QT_INCDIR%%/QtQml/QJSNumberCoercion
@@ -394,6 +397,13 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQml/qtqmlexports.h
 %%QT_INCDIR%%/QtQml/qtqmlglobal.h
 %%QT_INCDIR%%/QtQml/qtqmlversion.h
+%%QT_INCDIR%%/QtQmlBuiltins/%%FULLVER%%/QtQmlBuiltins/private/qqmlbuiltins_p.h
+%%QT_INCDIR%%/QtQmlBuiltins/%%FULLVER%%/QtQmlBuiltins/private/qtqmlbuiltins-config_p.h
+%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltins
+%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltinsDepends
+%%QT_INCDIR%%/QtQmlBuiltins/QtQmlBuiltinsVersion
+%%QT_INCDIR%%/QtQmlBuiltins/qtqmlbuiltins-config.h
+%%QT_INCDIR%%/QtQmlBuiltins/qtqmlbuiltinsversion.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qcoloroutput_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qdeferredpointer_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsannotation_p.h
@@ -401,6 +411,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscodegenerator_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompilepass_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscompiler_p.h
+%%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljscontextualtypes_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsfunctioninitializer_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsimporter_p.h
 %%QT_INCDIR%%/QtQmlCompiler/%%FULLVER%%/QtQmlCompiler/private/qqmljsimportvisitor_p.h
@@ -515,6 +526,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qlspcustomtypes_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlbasemodule_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcodemodel_p.h
+%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcompletioncontextstrings_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlcompletionsupport_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlfindusagessupport_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlformatting_p.h
@@ -523,6 +535,8 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllanguageserver_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllintsuggestions_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmllsutils_p.h
+%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlrangeformatting_p.h
+%%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qqmlrenamesymbolsupport_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextblock_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextcursor_p.h
 %%QT_INCDIR%%/QtQmlLS/%%FULLVER%%/QtQmlLS/private/qtextdocument_p.h
@@ -572,14 +586,28 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsexports.h
 %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsglobal.h
 %%QT_INCDIR%%/QtQmlModels/qtqmlmodelsversion.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlnetworkinformation_p.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslconfiguration_p.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslkey_p.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslnamespace_p.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qqmlsslsocketnamespace_p.h
+%%QT_INCDIR%%/QtQmlNetwork/%%FULLVER%%/QtQmlNetwork/private/qtqmlnetworkexports_p.h
+%%QT_INCDIR%%/QtQmlNetwork/QtQmlNetwork
+%%QT_INCDIR%%/QtQmlNetwork/QtQmlNetworkDepends
+%%QT_INCDIR%%/QtQmlNetwork/QtQmlNetworkVersion
+%%QT_INCDIR%%/QtQmlNetwork/qtqmlnetworkexports.h
+%%QT_INCDIR%%/QtQmlNetwork/qtqmlnetworkversion.h
 %%QT_INCDIR%%/QtQmlToolingSettings/%%FULLVER%%/QtQmlToolingSettings/private/qqmltoolingsettings_p.h
 %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettings
 %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsDepends
 %%QT_INCDIR%%/QtQmlToolingSettings/QtQmlToolingSettingsVersion
 %%QT_INCDIR%%/QtQmlToolingSettings/qtqmltoolingsettingsversion.h
+%%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qanystringviewutils_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qmetatypesjsonprocessor_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmljsstreamwriter_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltyperegistrar_p.h
+%%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltyperegistrarconstants_p.h
+%%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltyperegistrarutils_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltypesclassdescription_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/%%FULLVER%%/QtQmlTypeRegistrar/private/qqmltypescreator_p.h
 %%QT_INCDIR%%/QtQmlTypeRegistrar/QtQmlTypeRegistrar
@@ -608,6 +636,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qminimalflatset_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmldesignermetaobject_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquadpath_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickabstractpaletteprovider_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h
@@ -704,6 +733,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpincharea_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpincharea_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpinchhandler_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpixmap_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpixmapcache_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpointerdevicehandler_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickpointerdevicehandler_p_p.h
@@ -720,6 +750,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrendertarget_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrepeater_p_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickrhiitem_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickscalegrid_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickscreen_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickselectable_p.h
@@ -759,8 +790,8 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinput_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextinterface_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextmetrics_p.h
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextnodeengine_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextselection_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktextutil_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktimeline_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicktransition_p.h
@@ -775,6 +806,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwheelhandler_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindow_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowattached_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowcontainer_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowmodule_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickwindowmodule_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgabstractrenderer_p.h
@@ -790,6 +822,14 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcompressedtexture_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcontext_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcontextplugin_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurveabstractnode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurvefillnode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurvefillnode_p_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurveglyphatlas_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurveglyphnode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurveprocessor_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurvestrokenode_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgcurvestrokenode_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultcontext_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdefaultglyphnode_p_p.h
@@ -804,6 +844,8 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggeometry_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggradientcache_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsginternaltextnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialshader_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnodeupdater_p.h
@@ -813,6 +855,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrendernode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiatlastexture_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhidistancefieldglyphcache_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhiinternaltextnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhilayer_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhishadereffectnode_p.h
 %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgrhisupport_p.h
@@ -854,6 +897,8 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/QQuickPaintedItem
 %%QT_INCDIR%%/QtQuick/QQuickRenderControl
 %%QT_INCDIR%%/QtQuick/QQuickRenderTarget
+%%QT_INCDIR%%/QtQuick/QQuickRhiItem
+%%QT_INCDIR%%/QtQuick/QQuickRhiItemRenderer
 %%QT_INCDIR%%/QtQuick/QQuickTextDocument
 %%QT_INCDIR%%/QtQuick/QQuickTextureFactory
 %%QT_INCDIR%%/QtQuick/QQuickTransform
@@ -879,6 +924,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/QSGRootNode
 %%QT_INCDIR%%/QtQuick/QSGSimpleRectNode
 %%QT_INCDIR%%/QtQuick/QSGSimpleTextureNode
+%%QT_INCDIR%%/QtQuick/QSGTextNode
 %%QT_INCDIR%%/QtQuick/QSGTexture
 %%QT_INCDIR%%/QtQuick/QSGTextureMaterial
 %%QT_INCDIR%%/QtQuick/QSGTextureProvider
@@ -897,6 +943,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/qquickpainteditem.h
 %%QT_INCDIR%%/QtQuick/qquickrendercontrol.h
 %%QT_INCDIR%%/QtQuick/qquickrendertarget.h
+%%QT_INCDIR%%/QtQuick/qquickrhiitem.h
 %%QT_INCDIR%%/QtQuick/qquicktextdocument.h
 %%QT_INCDIR%%/QtQuick/qquickview.h
 %%QT_INCDIR%%/QtQuick/qquickwindow.h
@@ -913,6 +960,7 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuick/qsgrendernode.h
 %%QT_INCDIR%%/QtQuick/qsgsimplerectnode.h
 %%QT_INCDIR%%/QtQuick/qsgsimpletexturenode.h
+%%QT_INCDIR%%/QtQuick/qsgtextnode.h
 %%QT_INCDIR%%/QtQuick/qsgtexture.h
 %%QT_INCDIR%%/QtQuick/qsgtexture_platform.h
 %%QT_INCDIR%%/QtQuick/qsgtexturematerial.h
@@ -1147,19 +1195,13 @@ bin/qmlscene6
 %%QT_INCDIR%%/QtQuickParticles/QtQuickParticlesVersion
 %%QT_INCDIR%%/QtQuickParticles/qtquickparticlesexports.h
 %%QT_INCDIR%%/QtQuickParticles/qtquickparticlesversion.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquadpath_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshape_p_p.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapeabstractcurvenode_p.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurvenode_p_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurverenderer_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapecurverenderer_p_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapegenericrenderer_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesglobal_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapesoftwarerenderer_p.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapestrokenode_p.h
-%%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qquickshapestrokenode_p_p.h
 %%QT_INCDIR%%/QtQuickShapes/%%FULLVER%%/QtQuickShapes/private/qtquickshapesexports_p.h
 %%QT_INCDIR%%/QtQuickShapes/QtQuickShapes
 %%QT_INCDIR%%/QtQuickShapes/QtQuickShapesDepends
@@ -1384,6 +1426,12 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaConfigVersion.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaConfigVersionImpl.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlMetaTargets.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginConfig.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginConfigVersion.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginConfigVersionImpl.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6QmlNetworkpluginTargets.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QuickControlsTestUtilsPrivatepluginAdditionalTargetInfo.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QuickControlsTestUtilsPrivatepluginConfig.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6QuickControlsTestUtilsPrivatepluginConfigVersion.cmake
@@ -1696,6 +1744,13 @@ lib/cmake/Qt6Qml/Qt6QmlTargets.cmake
 lib/cmake/Qt6Qml/Qt6QmlVersionlessTargets.cmake
 lib/cmake/Qt6Qml/Qt6QmltcFileMappingTemplate.qrc.in
 lib/cmake/Qt6Qml/Qt6qmldirTemplate.cmake.in
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsAdditionalTargetInfo.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfig.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfigVersion.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsConfigVersionImpl.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsTargets.cmake
+lib/cmake/Qt6QmlBuiltins/Qt6QmlBuiltinsVersionlessTargets.cmake
 lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerAdditionalTargetInfo.cmake
 lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfig.cmake
 lib/cmake/Qt6QmlCompiler/Qt6QmlCompilerConfigVersion.cmake
@@ -1769,6 +1824,14 @@ lib/cmake/Qt6QmlModels/Qt6QmlModelsDependencies.cmake
 lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6QmlModels/Qt6QmlModelsTargets.cmake
 lib/cmake/Qt6QmlModels/Qt6QmlModelsVersionlessTargets.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkAdditionalTargetInfo.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfig.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfigVersion.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkConfigVersionImpl.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkDependencies.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkTargets.cmake
+lib/cmake/Qt6QmlNetwork/Qt6QmlNetworkVersionlessTargets.cmake
 lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateAdditionalTargetInfo.cmake
 lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfig.cmake
 lib/cmake/Qt6QmlToolingSettingsPrivate/Qt6QmlToolingSettingsPrivateConfigVersion.cmake
@@ -2053,6 +2116,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_LIBDIR%%/libQt6Qml.so
 %%QT_LIBDIR%%/libQt6Qml.so.6
 %%QT_LIBDIR%%/libQt6Qml.so.%%FULLVER%%
+%%QT_LIBDIR%%/libQt6QmlBuiltins.a
+%%QT_LIBDIR%%/libQt6QmlBuiltins.prl
 %%QT_LIBDIR%%/libQt6QmlCompiler.prl
 %%QT_LIBDIR%%/libQt6QmlCompiler.so
 %%QT_LIBDIR%%/libQt6QmlCompiler.so.6
@@ -2075,6 +2140,10 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_LIBDIR%%/libQt6QmlModels.so
 %%QT_LIBDIR%%/libQt6QmlModels.so.6
 %%QT_LIBDIR%%/libQt6QmlModels.so.%%FULLVER%%
+%%QT_LIBDIR%%/libQt6QmlNetwork.prl
+%%QT_LIBDIR%%/libQt6QmlNetwork.so
+%%QT_LIBDIR%%/libQt6QmlNetwork.so.6
+%%QT_LIBDIR%%/libQt6QmlNetwork.so.%%FULLVER%%
 %%QT_LIBDIR%%/libQt6QmlToolingSettings.a
 %%QT_LIBDIR%%/libQt6QmlToolingSettings.prl
 %%QT_LIBDIR%%/libQt6QmlTypeRegistrar.a
@@ -2191,6 +2260,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6labswavefrontmesh_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6packetprotocolprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qml_%%CMAKE_BUILD_TYPE%%_metatypes.json
+%%QT_LIBDIR%%/metatypes/qt6qmlbuiltins_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmlcompiler_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmlcore_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmldebugprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
@@ -2198,6 +2268,7 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6qmllocalstorage_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmllsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmlmodels_%%CMAKE_BUILD_TYPE%%_metatypes.json
+%%QT_LIBDIR%%/metatypes/qt6qmlnetwork_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmltoolingsettingsprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmltyperegistrarprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6qmlworkerscript_%%CMAKE_BUILD_TYPE%%_metatypes.json
@@ -2245,6 +2316,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmlbuiltins.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmlbuiltins_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlcompiler_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlcore.pri
@@ -2258,6 +2331,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlls_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmlmodels_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmlnetwork.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmlnetwork_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qmltoolingsettings_private.pri
@@ -2309,6 +2384,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_quicktestutilsprivate_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri
+%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
+%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
 %%QT_PLUGINDIR%%/qmllint/libquicklintplugin.so
 %%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so
 %%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so
@@ -2346,12 +2423,15 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir
 %%QT_QMLDIR%%/Qt/test/controls/QuickControlsTestUtilsPrivate.qmltypes
 %%QT_QMLDIR%%/Qt/test/controls/libquickcontrolstestutilsprivateplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Debug/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls.cpp.o
-%%NO_DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls.cpp.o
+%%DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Debug/QuickControlsTestUtilsPrivate_resources_1/.qt/rcc/qrc_qmake_Qt_test_controls_init.cpp.o
+%%NO_DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.qt/rcc/qrc_qmake_Qt_test_controls_init.cpp.o
 %%QT_QMLDIR%%/Qt/test/controls/qmldir
 %%QT_QMLDIR%%/QtCore/libqtqmlcoreplugin.so
 %%QT_QMLDIR%%/QtCore/plugins.qmltypes
 %%QT_QMLDIR%%/QtCore/qmldir
+%%QT_QMLDIR%%/QtNetwork/libqmlnetworkplugin.so
+%%QT_QMLDIR%%/QtNetwork/plugins.qmltypes
+%%QT_QMLDIR%%/QtNetwork/qmldir
 %%QT_QMLDIR%%/QtQml/Base/libqmlplugin.so
 %%QT_QMLDIR%%/QtQml/Base/plugins.qmltypes
 %%QT_QMLDIR%%/QtQml/Base/qmldir
@@ -2894,8 +2974,11 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultDial.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultFrame.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultGroupBox.qml
+%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultItemDelegate.qml
+%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultItemDelegateIconLabel.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultProgressBar.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultRadioButton.qml
+%%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultRadioDelegate.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultScrollBar.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultSlider.qml
 %%QT_QMLDIR%%/QtQuick/NativeStyle/controls/DefaultSpinBox.qml
@@ -2947,11 +3030,13 @@ libdata/pkgconfig/Qt6LabsSettings.pc
 libdata/pkgconfig/Qt6LabsSharedImage.pc
 libdata/pkgconfig/Qt6LabsWavefrontMesh.pc
 libdata/pkgconfig/Qt6Qml.pc
+libdata/pkgconfig/Qt6QmlBuiltins.pc
 libdata/pkgconfig/Qt6QmlCompiler.pc
 libdata/pkgconfig/Qt6QmlCore.pc
 libdata/pkgconfig/Qt6QmlIntegration.pc
 libdata/pkgconfig/Qt6QmlLocalStorage.pc
 libdata/pkgconfig/Qt6QmlModels.pc
+libdata/pkgconfig/Qt6QmlNetwork.pc
 libdata/pkgconfig/Qt6QmlWorkerScript.pc
 libdata/pkgconfig/Qt6QmlXmlListModel.pc
 libdata/pkgconfig/Qt6Quick.pc
@@ -2976,6 +3061,7 @@ libdata/pkgconfig/Qt6QuickTest.pc
 libdata/pkgconfig/Qt6QuickWidgets.pc
 %%QT_TOOLDIR%%/qmlcachegen
 %%QT_TOOLDIR%%/qmlimportscanner
+%%QT_TOOLDIR%%/qmljsrootgen
 %%QT_TOOLDIR%%/qmltyperegistrar
 %%QT_DATADIR%%/modules/LabsAnimation.json
 %%QT_DATADIR%%/modules/LabsFolderListModel.json
@@ -2985,6 +3071,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc
 %%QT_DATADIR%%/modules/LabsWavefrontMesh.json
 %%QT_DATADIR%%/modules/PacketProtocolPrivate.json
 %%QT_DATADIR%%/modules/Qml.json
+%%QT_DATADIR%%/modules/QmlBuiltins.json
 %%QT_DATADIR%%/modules/QmlCompiler.json
 %%QT_DATADIR%%/modules/QmlCore.json
 %%QT_DATADIR%%/modules/QmlDebugPrivate.json
@@ -2993,6 +3080,7 @@ libdata/pkgconfig/Qt6QuickWidgets.pc
 %%QT_DATADIR%%/modules/QmlLSPrivate.json
 %%QT_DATADIR%%/modules/QmlLocalStorage.json
 %%QT_DATADIR%%/modules/QmlModels.json
+%%QT_DATADIR%%/modules/QmlNetwork.json
 %%QT_DATADIR%%/modules/QmlToolingSettingsPrivate.json
 %%QT_DATADIR%%/modules/QmlTypeRegistrarPrivate.json
 %%QT_DATADIR%%/modules/QmlWorkerScript.json
diff --git a/x11-toolkits/qt6-graphs/distinfo b/x11-toolkits/qt6-graphs/distinfo
index 6c618ffe76ec..83cded00d7ac 100644
--- a/x11-toolkits/qt6-graphs/distinfo
+++ b/x11-toolkits/qt6-graphs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711664777
-SHA256 (KDE/Qt/6.6.3/qtgraphs-everywhere-src-6.6.3.tar.xz) = 22c25c34a75a57398d65a449fe8492d8cfe000edc7378e78325f08ba8c56edde
-SIZE (KDE/Qt/6.6.3/qtgraphs-everywhere-src-6.6.3.tar.xz) = 3819012
+TIMESTAMP = 1718779155
+SHA256 (KDE/Qt/6.7.2/qtgraphs-everywhere-src-6.7.2.tar.xz) = d8813a266e4a56367af6c3206670c908f64794e6806402142b2e028046128600
+SIZE (KDE/Qt/6.7.2/qtgraphs-everywhere-src-6.7.2.tar.xz) = 4395960
diff --git a/x11-toolkits/qt6-graphs/pkg-plist b/x11-toolkits/qt6-graphs/pkg-plist
index fd3c068354c9..5689ba3dfb86 100644
--- a/x11-toolkits/qt6-graphs/pkg-plist
+++ b/x11-toolkits/qt6-graphs/pkg-plist
@@ -1,66 +1,72 @@
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/abstract3dcontroller_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/abstractitemmodelhandler_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axishelper_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisgrid_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisline_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisrenderer_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/axisticker_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/barinstancing_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/baritemmodelhandler_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/bars3dcontroller_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/colorgradient_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativecolor_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativescene_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativeseries_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/declarativetheme_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/barsrenderer_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/charthelpers_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypes_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypesbars_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypesscatter_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/foreigntypessurface_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/graphsglobal_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dcamera_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/pointrenderer_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dinputhandler_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dlight_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dobject_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dscene_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/q3dtheme_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3daxis_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dinputhandler_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstract3dseries_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractaxis_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractbarseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractdataproxy_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qabstractseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbar3dseries_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbardataitem_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarcategoryaxis_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbardataproxy_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarseries_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qbarset_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcategory3daxis_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3ditem_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dlabel_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qcustom3dvolume_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qgraphsview_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qheightmapsurfacedataproxy_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelbardataproxy_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelscatterdataproxy_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qitemmodelsurfacedataproxy_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qlineseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qlogvalue3daxisformatter_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsbars_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsbarsseries_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphscolor_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsitem_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsscatter_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphsscatterseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssurface_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphssurfaceseries_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qquickgraphstexturedata_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatter3dseries_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterdataitem_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterdataproxy_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qscatterseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurface3dseries_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurfacedataitem_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qsurfacedataproxy_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtgraphs-config_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qtouch3dinputhandler_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/quickgraphstexturedata_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxis_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalue3daxisformatter_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatter3dcontroller_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qvalueaxis_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxypoint_p.h
+%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/qxyseries_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatterinstancing_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/scatteritemmodelhandler_p.h
-%%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surface3dcontroller_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceitemmodelhandler_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/surfaceselectioninstancing_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/thememanager_p.h
 %%QT_INCDIR%%/QtGraphs/%%FULLVER%%/QtGraphs/private/utils_p.h
 %%QT_INCDIR%%/QtGraphs/Q3DBars
-%%QT_INCDIR%%/QtGraphs/Q3DCamera
 %%QT_INCDIR%%/QtGraphs/Q3DInputHandler
-%%QT_INCDIR%%/QtGraphs/Q3DLight
-%%QT_INCDIR%%/QtGraphs/Q3DObject
 %%QT_INCDIR%%/QtGraphs/Q3DScatter
 %%QT_INCDIR%%/QtGraphs/Q3DScene
 %%QT_INCDIR%%/QtGraphs/Q3DSurface
@@ -69,36 +75,45 @@
 %%QT_INCDIR%%/QtGraphs/QAbstract3DGraph
 %%QT_INCDIR%%/QtGraphs/QAbstract3DInputHandler
 %%QT_INCDIR%%/QtGraphs/QAbstract3DSeries
+%%QT_INCDIR%%/QtGraphs/QAbstractAxis
+%%QT_INCDIR%%/QtGraphs/QAbstractBarSeries
 %%QT_INCDIR%%/QtGraphs/QAbstractDataProxy
+%%QT_INCDIR%%/QtGraphs/QAbstractSeries
 %%QT_INCDIR%%/QtGraphs/QBar3DSeries
+%%QT_INCDIR%%/QtGraphs/QBarCategoryAxis
 %%QT_INCDIR%%/QtGraphs/QBarDataItem
 %%QT_INCDIR%%/QtGraphs/QBarDataProxy
+%%QT_INCDIR%%/QtGraphs/QBarSeries
+%%QT_INCDIR%%/QtGraphs/QBarSet
 %%QT_INCDIR%%/QtGraphs/QCategory3DAxis
 %%QT_INCDIR%%/QtGraphs/QCustom3DItem
 %%QT_INCDIR%%/QtGraphs/QCustom3DLabel
 %%QT_INCDIR%%/QtGraphs/QCustom3DVolume
+%%QT_INCDIR%%/QtGraphs/QGraphTheme
 %%QT_INCDIR%%/QtGraphs/QHeightMapSurfaceDataProxy
 %%QT_INCDIR%%/QtGraphs/QItemModelBarDataProxy
 %%QT_INCDIR%%/QtGraphs/QItemModelScatterDataProxy
 %%QT_INCDIR%%/QtGraphs/QItemModelSurfaceDataProxy
+%%QT_INCDIR%%/QtGraphs/QLineSeries
 %%QT_INCDIR%%/QtGraphs/QLogValue3DAxisFormatter
 %%QT_INCDIR%%/QtGraphs/QScatter3DSeries
 %%QT_INCDIR%%/QtGraphs/QScatterDataItem
 %%QT_INCDIR%%/QtGraphs/QScatterDataProxy
+%%QT_INCDIR%%/QtGraphs/QScatterSeries
+%%QT_INCDIR%%/QtGraphs/QSeriesTheme
 %%QT_INCDIR%%/QtGraphs/QSurface3DSeries
 %%QT_INCDIR%%/QtGraphs/QSurfaceDataItem
 %%QT_INCDIR%%/QtGraphs/QSurfaceDataProxy
 %%QT_INCDIR%%/QtGraphs/QTouch3DInputHandler
 %%QT_INCDIR%%/QtGraphs/QValue3DAxis
 %%QT_INCDIR%%/QtGraphs/QValue3DAxisFormatter
+%%QT_INCDIR%%/QtGraphs/QValueAxis
+%%QT_INCDIR%%/QtGraphs/QXYSeries
 %%QT_INCDIR%%/QtGraphs/QtGraphs
 %%QT_INCDIR%%/QtGraphs/QtGraphsDepends
 %%QT_INCDIR%%/QtGraphs/QtGraphsVersion
 %%QT_INCDIR%%/QtGraphs/q3dbars.h
-%%QT_INCDIR%%/QtGraphs/q3dcamera.h
 %%QT_INCDIR%%/QtGraphs/q3dinputhandler.h
-%%QT_INCDIR%%/QtGraphs/q3dlight.h
-%%QT_INCDIR%%/QtGraphs/q3dobject.h
 %%QT_INCDIR%%/QtGraphs/q3dscatter.h
 %%QT_INCDIR%%/QtGraphs/q3dscene.h
 %%QT_INCDIR%%/QtGraphs/q3dsurface.h
@@ -107,33 +122,44 @@
 %%QT_INCDIR%%/QtGraphs/qabstract3dgraph.h
 %%QT_INCDIR%%/QtGraphs/qabstract3dinputhandler.h
 %%QT_INCDIR%%/QtGraphs/qabstract3dseries.h
+%%QT_INCDIR%%/QtGraphs/qabstractaxis.h
+%%QT_INCDIR%%/QtGraphs/qabstractbarseries.h
 %%QT_INCDIR%%/QtGraphs/qabstractdataproxy.h
+%%QT_INCDIR%%/QtGraphs/qabstractseries.h
 %%QT_INCDIR%%/QtGraphs/qbar3dseries.h
+%%QT_INCDIR%%/QtGraphs/qbarcategoryaxis.h
 %%QT_INCDIR%%/QtGraphs/qbardataitem.h
 %%QT_INCDIR%%/QtGraphs/qbardataproxy.h
+%%QT_INCDIR%%/QtGraphs/qbarseries.h
+%%QT_INCDIR%%/QtGraphs/qbarset.h
 %%QT_INCDIR%%/QtGraphs/qcategory3daxis.h
 %%QT_INCDIR%%/QtGraphs/qcustom3ditem.h
 %%QT_INCDIR%%/QtGraphs/qcustom3dlabel.h
 %%QT_INCDIR%%/QtGraphs/qcustom3dvolume.h
 %%QT_INCDIR%%/QtGraphs/qgraphsglobal.h
+%%QT_INCDIR%%/QtGraphs/qgraphtheme.h
 %%QT_INCDIR%%/QtGraphs/qheightmapsurfacedataproxy.h
 %%QT_INCDIR%%/QtGraphs/qitemmodelbardataproxy.h
 %%QT_INCDIR%%/QtGraphs/qitemmodelscatterdataproxy.h
 %%QT_INCDIR%%/QtGraphs/qitemmodelsurfacedataproxy.h
+%%QT_INCDIR%%/QtGraphs/qlineseries.h
 %%QT_INCDIR%%/QtGraphs/qlogvalue3daxisformatter.h
 %%QT_INCDIR%%/QtGraphs/qscatter3dseries.h
 %%QT_INCDIR%%/QtGraphs/qscatterdataitem.h
 %%QT_INCDIR%%/QtGraphs/qscatterdataproxy.h
+%%QT_INCDIR%%/QtGraphs/qscatterseries.h
+%%QT_INCDIR%%/QtGraphs/qseriestheme.h
 %%QT_INCDIR%%/QtGraphs/qsurface3dseries.h
 %%QT_INCDIR%%/QtGraphs/qsurfacedataitem.h
 %%QT_INCDIR%%/QtGraphs/qsurfacedataproxy.h
-%%QT_INCDIR%%/QtGraphs/qtgraphs-config.h
 %%QT_INCDIR%%/QtGraphs/qtgraphsexports.h
 %%QT_INCDIR%%/QtGraphs/qtgraphsversion.h
 %%QT_INCDIR%%/QtGraphs/qtouch3dinputhandler.h
 %%QT_INCDIR%%/QtGraphs/qutils.h
 %%QT_INCDIR%%/QtGraphs/qvalue3daxis.h
 %%QT_INCDIR%%/QtGraphs/qvalue3daxisformatter.h
+%%QT_INCDIR%%/QtGraphs/qvalueaxis.h
+%%QT_INCDIR%%/QtGraphs/qxyseries.h
 lib/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake
 lib/cmake/Qt6Graphs/Qt6GraphsAdditionalTargetInfo.cmake
 lib/cmake/Qt6Graphs/Qt6GraphsConfig.cmake
@@ -156,16 +182,34 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6graphs_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_MKSPECDIR%%/modules/qt_lib_graphs.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_graphs_private.pri
+%%QT_QMLDIR%%/QtGraphs/Graphs.qmltypes
+%%QT_QMLDIR%%/QtGraphs/designer/Bars3DSpecifics.qml
+%%QT_QMLDIR%%/QtGraphs/designer/GraphsCameraSection.qml
+%%QT_QMLDIR%%/QtGraphs/designer/GraphsSection.qml
+%%QT_QMLDIR%%/QtGraphs/designer/GraphsViewSpecifics.qml
+%%QT_QMLDIR%%/QtGraphs/designer/Scatter3DSpecifics.qml
+%%QT_QMLDIR%%/QtGraphs/designer/Surface3DSpecifics.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/BarSeries.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/Bars3D.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/LineSeries.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/Scatter3D.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/ScatterSeries.qml
+%%QT_QMLDIR%%/QtGraphs/designer/default/Surface3D.qml
+%%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon.png
+%%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon16.png
+%%QT_QMLDIR%%/QtGraphs/designer/qtgraphs.metainfo
+%%QT_QMLDIR%%/QtGraphs/designer/qtgraphs2d.metainfo
 %%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so
-%%QT_QMLDIR%%/QtGraphs/plugins.qmltypes
-%%QT_QMLDIR%%/QtGraphs/qml/designer/Bars3DSpecifics.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/GraphsCameraSection.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/GraphsSection.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/Scatter3DSpecifics.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/Surface3DSpecifics.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Bars3D.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Scatter3D.qml
-%%QT_QMLDIR%%/QtGraphs/qml/designer/default/Surface3D.qml
 %%QT_QMLDIR%%/QtGraphs/qmldir
 libdata/pkgconfig/Qt6Graphs.pc
 %%QT_DATADIR%%/modules/Graphs.json
diff --git a/x11-toolkits/qt6-quick3d/distinfo b/x11-toolkits/qt6-quick3d/distinfo
index 4df93890ca8d..fa1ef7504992 100644
--- a/x11-toolkits/qt6-quick3d/distinfo
+++ b/x11-toolkits/qt6-quick3d/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711665077
-SHA256 (KDE/Qt/6.6.3/qtquick3d-everywhere-src-6.6.3.tar.xz) = 997626f0b7fbaa168a7d227414bfe4068289aa8e767ffcc60bf754d83c2b9ae2
-SIZE (KDE/Qt/6.6.3/qtquick3d-everywhere-src-6.6.3.tar.xz) = 65597184
+TIMESTAMP = 1718779156
+SHA256 (KDE/Qt/6.7.2/qtquick3d-everywhere-src-6.7.2.tar.xz) = bb8ff9aec6da2e2d3b3986cc859333a98b2f3d4bbe564c5733e8f1a089d15270
+SIZE (KDE/Qt/6.7.2/qtquick3d-everywhere-src-6.7.2.tar.xz) = 66202160
diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist
index abe94e38ae42..269fcfbf50be 100644
--- a/x11-toolkits/qt6-quick3d/pkg-plist
+++ b/x11-toolkits/qt6-quick3d/pkg-plist
@@ -8,7 +8,6 @@
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3ddefaultmaterial_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3ddirectionallight_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3deffect_p.h
-%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dextensionhelpers_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dfog_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dfrustumcamera_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dgeometry_p.h
@@ -33,7 +32,6 @@
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dquaternionanimation_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dquaternionutils_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dreflectionprobe_p.h
-%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drenderextensions_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drenderstats_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3drepeater_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dresourceloader_p.h
@@ -52,10 +50,12 @@
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qquick3dviewport_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qtquick3dexports_p.h
 %%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/private/qtquick3dglobal_p.h
+%%QT_INCDIR%%/QtQuick3D/%%FULLVER%%/QtQuick3D/ssg/qquick3dextensionhelpers.h
 %%QT_INCDIR%%/QtQuick3D/QQuick3D
 %%QT_INCDIR%%/QtQuick3D/QQuick3DGeometry
 %%QT_INCDIR%%/QtQuick3D/QQuick3DInstancing
 %%QT_INCDIR%%/QtQuick3D/QQuick3DObject
+%%QT_INCDIR%%/QtQuick3D/QQuick3DRenderExtension
 %%QT_INCDIR%%/QtQuick3D/QQuick3DTextureData
 %%QT_INCDIR%%/QtQuick3D/QtQuick3D
 %%QT_INCDIR%%/QtQuick3D/QtQuick3DDepends
@@ -64,6 +64,7 @@
 %%QT_INCDIR%%/QtQuick3D/qquick3dgeometry.h
 %%QT_INCDIR%%/QtQuick3D/qquick3dinstancing.h
 %%QT_INCDIR%%/QtQuick3D/qquick3dobject.h
+%%QT_INCDIR%%/QtQuick3D/qquick3drenderextensions.h
 %%QT_INCDIR%%/QtQuick3D/qquick3dtexturedata.h
 %%QT_INCDIR%%/QtQuick3D/qtquick3dexports.h
 %%QT_INCDIR%%/QtQuick3D/qtquick3dglobal.h
@@ -192,14 +193,13 @@
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendercamera_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderclippingfrustum_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendercommands_p.h
-%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendercontextcore_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendercustommaterial_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderdefaultmaterial_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderdefaultmaterialshadergenerator_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendereffect_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderer_p.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendererimplshaders_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendererutil_p.h
-%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderextensions_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendergeometry_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrendergraphobject_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgrenderhelpers_p.h
@@ -244,13 +244,22 @@
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qssgvertexpipelineimpl_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qtquick3druntimerenderexports_p.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/private/qtquick3druntimerenderglobal_p.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssglightmapper.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrendercontextcore.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrenderextensions.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrendergraphobject.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrenderhelpers.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrenderpickresult.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/%%FULLVER%%/QtQuick3DRuntimeRender/ssg/qssgrhicontext.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/QtQuick3DRuntimeRender
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/QtQuick3DRuntimeRenderDepends
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/QtQuick3DRuntimeRenderVersion
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/qtquick3druntimerenderexports.h
+%%QT_INCDIR%%/QtQuick3DRuntimeRender/qtquick3druntimerenderglobal.h
 %%QT_INCDIR%%/QtQuick3DRuntimeRender/qtquick3druntimerenderversion.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qqsbcollection_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qquick3dprofiler_p.h
+%%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgaosettings_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgassert_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgbounds3_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgdataref_p.h
@@ -264,6 +273,7 @@
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qssgutils_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qtquick3dutilsexports_p.h
 %%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/private/qtquick3dutilsglobal_p.h
+%%QT_INCDIR%%/QtQuick3DUtils/%%FULLVER%%/QtQuick3DUtils/ssg/qssgrenderbasetypes.h
 %%QT_INCDIR%%/QtQuick3DUtils/QtQuick3DUtils
 %%QT_INCDIR%%/QtQuick3DUtils/QtQuick3DUtilsDepends
 %%QT_INCDIR%%/QtQuick3DUtils/QtQuick3DUtilsVersion
@@ -858,6 +868,7 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake
 %%QT_QMLDIR%%/QtQuick3D/Particles3D/libqtquick3dparticles3dplugin.so
 %%QT_QMLDIR%%/QtQuick3D/Particles3D/plugins.qmltypes
 %%QT_QMLDIR%%/QtQuick3D/Particles3D/qmldir
+%%QT_QMLDIR%%/QtQuick3D/Quick3D.qmltypes
 %%QT_QMLDIR%%/QtQuick3D/designer/AbstractLightSection.qml
 %%QT_QMLDIR%%/QtQuick3D/designer/BufferInputSection.qml
 %%QT_QMLDIR%%/QtQuick3D/designer/BufferInputSpecifics.qml
@@ -1046,7 +1057,6 @@ lib/cmake/Qt6Quick3DUtils/Qt6Quick3DUtilsVersionlessTargets.cmake
 %%QT_QMLDIR%%/QtQuick3D/designer/source/effect_template.qml
 %%QT_QMLDIR%%/QtQuick3D/designer/source/view3D_template.qml
 %%QT_QMLDIR%%/QtQuick3D/libqquick3dplugin.so
-%%QT_QMLDIR%%/QtQuick3D/plugins.qmltypes
 %%QT_QMLDIR%%/QtQuick3D/qmldir
 libdata/pkgconfig/Qt6Quick3D.pc
 libdata/pkgconfig/Qt6Quick3DAssetImport.pc
diff --git a/x11-toolkits/qt6-quicktimeline/distinfo b/x11-toolkits/qt6-quicktimeline/distinfo
index 3335087a1331..165e10f86a1d 100644
--- a/x11-toolkits/qt6-quicktimeline/distinfo
+++ b/x11-toolkits/qt6-quicktimeline/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711665079
-SHA256 (KDE/Qt/6.6.3/qtquicktimeline-everywhere-src-6.6.3.tar.xz) = d3b3dd6f81265f576eadcc59e37e240d14b5e834a07013ee5a0e24aa0e37462c
-SIZE (KDE/Qt/6.6.3/qtquicktimeline-everywhere-src-6.6.3.tar.xz) = 104788
+TIMESTAMP = 1718779157
+SHA256 (KDE/Qt/6.7.2/qtquicktimeline-everywhere-src-6.7.2.tar.xz) = 21eddea01cf095cede10362eea4fb8402ffd06868c88d50a757c8c1f6b0719eb
+SIZE (KDE/Qt/6.7.2/qtquicktimeline-everywhere-src-6.7.2.tar.xz) = 110200
diff --git a/x11-toolkits/qt6-quicktimeline/pkg-plist b/x11-toolkits/qt6-quicktimeline/pkg-plist
index a54587c60eea..c60c66f9aeb2 100644
--- a/x11-toolkits/qt6-quicktimeline/pkg-plist
+++ b/x11-toolkits/qt6-quicktimeline/pkg-plist
@@ -10,7 +10,24 @@
 %%QT_INCDIR%%/QtQuickTimeline/qtquicktimelineexports.h
 %%QT_INCDIR%%/QtQuickTimeline/qtquicktimelineglobal.h
 %%QT_INCDIR%%/QtQuickTimeline/qtquicktimelineversion.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qblendanimationnode_p.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qblendtreenode_p.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtimelineanimationnode_p.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtquicktimelineblendtreesexports_p.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/%%FULLVER%%/QtQuickTimelineBlendTrees/private/qtquicktimelineblendtreesglobal_p.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/QtQuickTimelineBlendTrees
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/QtQuickTimelineBlendTreesDepends
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/QtQuickTimelineBlendTreesVersion
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/qtquicktimelineblendtreesexports.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/qtquicktimelineblendtreesglobal.h
+%%QT_INCDIR%%/QtQuickTimelineBlendTrees/qtquicktimelineblendtreesversion.h
 lib/cmake/Qt6BuildInternals/StandaloneTests/QtQuickTimelineTestsConfig.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginConfig.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginConfigVersion.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginConfigVersionImpl.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelineblendtreespluginTargets.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelinepluginAdditionalTargetInfo.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelinepluginConfig.cmake
 lib/cmake/Qt6Qml/QmlPlugins/Qt6qtquicktimelinepluginConfigVersion.cmake
@@ -25,15 +42,35 @@ lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineDependencies.cmake
 lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineTargets.cmake
 lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineVersionlessTargets.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesAdditionalTargetInfo.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesConfig.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesConfigVersion.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesConfigVersionImpl.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesDependencies.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesTargets.cmake
+lib/cmake/Qt6QuickTimelineBlendTrees/Qt6QuickTimelineBlendTreesVersionlessTargets.cmake
 %%QT_LIBDIR%%/libQt6QuickTimeline.prl
 %%QT_LIBDIR%%/libQt6QuickTimeline.so
 %%QT_LIBDIR%%/libQt6QuickTimeline.so.6
 %%QT_LIBDIR%%/libQt6QuickTimeline.so.%%FULLVER%%
+%%QT_LIBDIR%%/libQt6QuickTimelineBlendTrees.prl
+%%QT_LIBDIR%%/libQt6QuickTimelineBlendTrees.so
+%%QT_LIBDIR%%/libQt6QuickTimelineBlendTrees.so.6
+%%QT_LIBDIR%%/libQt6QuickTimelineBlendTrees.so.%%FULLVER%%
 %%QT_LIBDIR%%/metatypes/qt6quicktimeline_%%CMAKE_BUILD_TYPE%%_metatypes.json
+%%QT_LIBDIR%%/metatypes/qt6quicktimelineblendtrees_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_MKSPECDIR%%/modules/qt_lib_quicktimeline.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_quicktimeline_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_quicktimelineblendtrees.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_quicktimelineblendtrees_private.pri
+%%QT_QMLDIR%%/QtQuick/Timeline/BlendTrees/libqtquicktimelineblendtreesplugin.so
+%%QT_QMLDIR%%/QtQuick/Timeline/BlendTrees/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Timeline/BlendTrees/qmldir
 %%QT_QMLDIR%%/QtQuick/Timeline/libqtquicktimelineplugin.so
 %%QT_QMLDIR%%/QtQuick/Timeline/plugins.qmltypes
 %%QT_QMLDIR%%/QtQuick/Timeline/qmldir
 libdata/pkgconfig/Qt6QuickTimeline.pc
+libdata/pkgconfig/Qt6QuickTimelineBlendTrees.pc
 %%QT_DATADIR%%/modules/QuickTimeline.json
+%%QT_DATADIR%%/modules/QuickTimelineBlendTrees.json
diff --git a/x11-toolkits/qt6-shadertools/distinfo b/x11-toolkits/qt6-shadertools/distinfo
index 5e853fbca9c3..8b91d00fe412 100644
--- a/x11-toolkits/qt6-shadertools/distinfo
+++ b/x11-toolkits/qt6-shadertools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711665083
-SHA256 (KDE/Qt/6.6.3/qtshadertools-everywhere-src-6.6.3.tar.xz) = 8c0909d63bb33cb863c0de5a823cd4ad3489858023ab81a7fe84080c3d3ca1e6
-SIZE (KDE/Qt/6.6.3/qtshadertools-everywhere-src-6.6.3.tar.xz) = 1054688
+TIMESTAMP = 1718779158
+SHA256 (KDE/Qt/6.7.2/qtshadertools-everywhere-src-6.7.2.tar.xz) = edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1
+SIZE (KDE/Qt/6.7.2/qtshadertools-everywhere-src-6.7.2.tar.xz) = 1111256
diff --git a/x11-toolkits/qt6-virtualkeyboard/distinfo b/x11-toolkits/qt6-virtualkeyboard/distinfo
index af1bfca271b2..58e93c5474b5 100644
--- a/x11-toolkits/qt6-virtualkeyboard/distinfo
+++ b/x11-toolkits/qt6-virtualkeyboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711665095
-SHA256 (KDE/Qt/6.6.3/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz) = 989f82a1fbf49af3264a18191430726588fa3664f0eab13a7234c7054c3fa134
-SIZE (KDE/Qt/6.6.3/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz) = 3719852
+TIMESTAMP = 1718779159
+SHA256 (KDE/Qt/6.7.2/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz) = 320664b55a0960ff79c1b822dcf6e8cebe3e08b791147d41b570996d81ce180f
+SIZE (KDE/Qt/6.7.2/qtvirtualkeyboard-everywhere-src-6.7.2.tar.xz) = 3722296
diff --git a/x11-toolkits/qt6pas/Makefile b/x11-toolkits/qt6pas/Makefile
index 30f90d96558e..278a50ac8a88 100644
--- a/x11-toolkits/qt6pas/Makefile
+++ b/x11-toolkits/qt6pas/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	qt6pas
-PORTVERSION=	6.2.7
-PORTREVISION=	1
+PORTVERSION=	6.2.8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	LOCAL/acm/
 
@@ -8,11 +7,17 @@ MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Qt6 binding for FreePascal
 WWW=		https://wiki.lazarus.freepascal.org/index.php/Qt6_Interface
 
-USES=		compiler:c++11-lang qmake qt:6
-USE_QT=		base:run declarative:build tools:build
+LICENSE=	LGPL3LE
+LICENSE_NAME=	GNU Lesser General Public License version 3 Link Exception
+LICENSE_FILE=	${WRKSRC}/COPYING.TXT
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USES=		compiler:c++11-lang gl qmake qt:6
+USE_GL=		opengl
+USE_QT=		base
 USE_LDCONFIG=	yes
 
-QT6_VER_MIN=	6.2.7
+QT6_VER_MIN=	6.2.8
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-mincoming-stack-boundary=2||g' ${WRKSRC}/Qt6Pas.pro
diff --git a/x11-toolkits/qt6pas/distinfo b/x11-toolkits/qt6pas/distinfo
index e0824f944a36..5269a103edf1 100644
--- a/x11-toolkits/qt6pas/distinfo
+++ b/x11-toolkits/qt6pas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698536718
-SHA256 (qt6pas-6.2.7.tar.gz) = ae28f09e7deb8372f3a0e9218d819236fa9fddd224749af6dbcc1d0916e73126
-SIZE (qt6pas-6.2.7.tar.gz) = 323251
+TIMESTAMP = 1714769795
+SHA256 (qt6pas-6.2.8.tar.gz) = 49b6d3939453a439fa98a511895195089b791ee78cd18a8035651375f88c61a7
+SIZE (qt6pas-6.2.8.tar.gz) = 378669
diff --git a/x11-toolkits/qt6pas/pkg-plist b/x11-toolkits/qt6pas/pkg-plist
index c72970e27384..ca7ac6bae767 100644
--- a/x11-toolkits/qt6pas/pkg-plist
+++ b/x11-toolkits/qt6pas/pkg-plist
@@ -1,4 +1,4 @@
 %%QT_LIBDIR%%/libQt6Pas.so
 %%QT_LIBDIR%%/libQt6Pas.so.6
 %%QT_LIBDIR%%/libQt6Pas.so.6.2
-%%QT_LIBDIR%%/libQt6Pas.so.6.2.7
+%%QT_LIBDIR%%/libQt6Pas.so.6.2.8
diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile
index d18b2841fa0a..d6e3b4933142 100644
--- a/x11-toolkits/wlroots-devel/Makefile
+++ b/x11-toolkits/wlroots-devel/Makefile
@@ -41,7 +41,8 @@ OPTIONS_DEFAULT=DRM OPENGL VULKAN X11
 OPTIONS_SUB=	yes
 
 DRM_DESC=		KMS console support
-DRM_BUILD_DEPENDS=	hwdata>0:misc/hwdata
+DRM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
+			hwdata>0:misc/hwdata
 DRM_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
 			libliftoff.so:graphics/libliftoff \
 			libdisplay-info.so:sysutils/libdisplay-info \
@@ -75,13 +76,5 @@ post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \
 		${WRKSRC}/include/wlr/meson.build
-# XXX Drop after FreeBSD 12.4 EOL around 2023-12-31
-# https://cgit.freebsd.org/src/commit/?id=d7535fb3e3cb
-	@if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1300515 ]; then \
-		${REINPLACE_CMD} -e '/POSIX/s/199309/200112/' \
-		${WRKSRC}/render/gles2/pass.c \
-		${WRKSRC}/render/gles2/renderer.c \
-		${WRKSRC}/types/wlr_presentation_time.c; \
-	fi
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots-devel/override.mk b/x11-toolkits/wlroots-devel/override.mk
index 45bd059006f2..f5d221efd5ca 100644
--- a/x11-toolkits/wlroots-devel/override.mk
+++ b/x11-toolkits/wlroots-devel/override.mk
@@ -1,7 +1,7 @@
 WLR_SUFFIX=	-devel
+WLR_SOVERSION=	13
 
-BUILD_DEPENDS:=	${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g}
-LIB_DEPENDS:=	${LIB_DEPENDS:S/wlroots$/&${WLR_SUFFIX}/}
+LIB_DEPENDS:=	${LIB_DEPENDS:S/wlroots.so/&.${WLR_SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/}
 
 USES+=		localbase # -isystem
 CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig"
diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index db6c60d6de1a..99a69aa034ea 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wlroots
-DISTVERSION=	0.17.3
+DISTVERSION=	0.17.4
 CATEGORIES=	x11-toolkits
 
 PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 272e55784dae..8e735fcee301 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1714156372
-SHA256 (wlroots-0.17.3.tar.bz2) = b916d9574367373d42334ea12ea3cead27ebc3b8de3bea375619e537d86b0757
-SIZE (wlroots-0.17.3.tar.bz2) = 453887
+TIMESTAMP = 1719512708
+SHA256 (wlroots-0.17.4.tar.bz2) = 76cea5143c966640000efad32d5961b1d2303744497d30ef5e78aaf50360288d
+SIZE (wlroots-0.17.4.tar.bz2) = 454301
 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
 SIZE (10f80a8f1bb2.patch) = 6097
 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile
index fac0a4d8bf25..8fe00201f74a 100644
--- a/x11-wm/chamfer/Makefile
+++ b/x11-wm/chamfer/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	chamfer
-DISTVERSION=	s20230310
+DISTVERSION=	s20240511
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -32,7 +32,7 @@ USE_GITHUB=	yes
 USE_XORG=	xcb
 GH_ACCOUNT=	jaelpark
 GH_PROJECT=	${PORTNAME}wm
-GH_TAGNAME=	93b8f79
+GH_TAGNAME=	4784d02
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \
diff --git a/x11-wm/chamfer/distinfo b/x11-wm/chamfer/distinfo
index 1f4588a5054f..f81e92c09f7d 100644
--- a/x11-wm/chamfer/distinfo
+++ b/x11-wm/chamfer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678487207
-SHA256 (jaelpark-chamferwm-s20230310-93b8f79_GH0.tar.gz) = c49da155463ed6dd1b676733e53bf5dc1046e9edfa16e22215f4cad22fbcdc41
-SIZE (jaelpark-chamferwm-s20230310-93b8f79_GH0.tar.gz) = 163415
+TIMESTAMP = 1715460062
+SHA256 (jaelpark-chamferwm-s20240511-4784d02_GH0.tar.gz) = 60b49513e92ed3990530759499c299fcc60d9a1a5f1bcaeb1e0b7e4c401a0845
+SIZE (jaelpark-chamferwm-s20240511-4784d02_GH0.tar.gz) = 163433
diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 15af6af00ffd..3b7b6fe479ef 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cosmic-comp
-PORTVERSION=	s20240503
+PORTVERSION=	s20240626
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -22,8 +22,8 @@ USE_GITHUB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
-GH_TAGNAME=	19ba568
-GH_TUPLE=	pop-os:iced:0.4.2-1941-g1d9bb7fd:iced/../${WRKSRC_crate_iced:T}/iced
+GH_TAGNAME=	9cd553e
+GH_TUPLE=	pop-os:iced:0.4.2-1997-gd0ba4985:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates
index 91c8aa016f74..7a31a27b58c9 100644
--- a/x11-wm/cosmic-comp/Makefile.crates
+++ b/x11-wm/cosmic-comp/Makefile.crates
@@ -1,71 +1,74 @@
-CARGO_CRATES=	ab_glyph-0.2.23 \
+CARGO_CRATES=	ab_glyph-0.2.26 \
 		ab_glyph_rasterizer-0.1.8 \
 		accesskit-0.11.2 \
-		addr2line-0.21.0 \
+		addr2line-0.22.0 \
 		adler-1.0.2 \
-		ahash-0.8.7 \
-		aho-corasick-1.1.2 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.3 \
 		aliasable-0.1.3 \
-		allocator-api2-0.2.16 \
+		allocator-api2-0.2.18 \
 		almost-0.2.0 \
-		android-activity-0.5.1 \
+		android-activity-0.6.0 \
 		android-properties-0.2.2 \
 		android-tzdata-0.1.1 \
 		android_system_properties-0.1.5 \
-		anyhow-1.0.79 \
+		anyhow-1.0.86 \
 		appendlist-1.4.0 \
 		apply-0.3.0 \
 		approx-0.4.0 \
 		approx-0.5.1 \
-		arc-swap-1.6.0 \
+		arc-swap-1.7.1 \
 		arrayref-0.3.7 \
 		arrayvec-0.7.4 \
 		as-raw-xcb-connection-1.0.1 \
 		ash-0.37.3+1.3.251 \
+		ash-0.38.0+1.3.281 \
 		async-broadcast-0.5.1 \
-		async-channel-2.2.0 \
-		async-executor-1.8.0 \
+		async-channel-2.3.1 \
+		async-executor-1.12.0 \
 		async-fs-1.6.0 \
 		async-io-1.13.0 \
-		async-io-2.3.1 \
+		async-io-2.3.2 \
 		async-lock-2.8.0 \
 		async-lock-3.3.0 \
 		async-process-1.8.1 \
-		async-recursion-1.0.5 \
-		async-signal-0.2.5 \
-		async-task-4.7.0 \
-		async-trait-0.1.77 \
+		async-recursion-1.1.1 \
+		async-signal-0.2.6 \
+		async-task-4.7.1 \
+		async-trait-0.1.80 \
 		atomic-waker-1.1.2 \
-		autocfg-1.1.0 \
-		backtrace-0.3.69 \
+		autocfg-1.3.0 \
+		backtrace-0.3.72 \
 		base64-0.13.1 \
 		base64-0.21.7 \
 		bit-set-0.5.3 \
 		bit-vec-0.6.3 \
 		bit_field-0.10.2 \
 		bitflags-1.3.2 \
-		bitflags-2.4.2 \
+		bitflags-2.5.0 \
 		block-0.1.6 \
 		block-buffer-0.10.4 \
-		block-sys-0.2.1 \
-		block2-0.3.0 \
-		blocking-1.5.1 \
-		bumpalo-3.14.0 \
-		bytemuck-1.14.0 \
-		bytemuck_derive-1.5.0 \
+		block2-0.5.1 \
+		blocking-1.6.1 \
+		bumpalo-3.16.0 \
+		by_address-1.2.1 \
+		bytemuck-1.16.0 \
+		bytemuck_derive-1.7.0 \
 		byteorder-1.5.0 \
-		bytes-1.5.0 \
+		bytes-1.6.0 \
 		calloop-0.12.4 \
 		calloop-0.13.0 \
+		calloop-0.14.0 \
 		calloop-wayland-source-0.2.0 \
-		cc-1.0.83 \
+		calloop-wayland-source-0.3.0 \
+		cc-1.0.98 \
 		cesu8-1.1.0 \
 		cfg-if-1.0.0 \
 		cfg_aliases-0.1.1 \
-		cfg_aliases-0.2.0 \
+		cfg_aliases-0.2.1 \
 		cgmath-0.18.0 \
-		chrono-0.4.35 \
-		clipboard-win-5.3.0 \
+		chrono-0.4.38 \
+		clipboard-win-5.3.1 \
 		cocoa-0.25.0 \
 		cocoa-foundation-0.1.2 \
 		codespan-reporting-0.11.1 \
@@ -73,29 +76,29 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		com-0.6.0 \
 		com_macros-0.6.0 \
 		com_macros_support-0.6.0 \
-		combine-4.6.6 \
-		concurrent-queue-2.4.0 \
+		combine-4.6.7 \
+		concurrent-queue-2.5.0 \
 		const-random-0.1.18 \
 		const-random-macro-0.1.16 \
 		core-foundation-0.9.4 \
 		core-foundation-sys-0.8.6 \
-		core-graphics-0.23.1 \
+		core-graphics-0.23.2 \
 		core-graphics-types-0.1.3 \
 		cpufeatures-0.2.12 \
-		crc32fast-1.3.2 \
-		crossbeam-channel-0.5.11 \
+		crc32fast-1.4.2 \
+		crossbeam-channel-0.5.13 \
 		crossbeam-deque-0.8.5 \
 		crossbeam-epoch-0.9.18 \
-		crossbeam-utils-0.8.19 \
+		crossbeam-utils-0.8.20 \
 		crunchy-0.2.2 \
 		crypto-common-0.1.6 \
-		css-color-0.2.5 \
+		css-color-0.2.8 \
 		csscolorparser-0.6.2 \
-		ctor-0.2.6 \
+		ctor-lite-0.1.0 \
 		cursor-icon-1.1.0 \
-		darling-0.20.3 \
-		darling_core-0.20.3 \
-		darling_macro-0.20.3 \
+		darling-0.20.9 \
+		darling_core-0.20.9 \
+		darling_macro-0.20.9 \
 		dashmap-5.5.3 \
 		data-url-0.2.0 \
 		data-url-0.3.1 \
@@ -109,20 +112,24 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		displaydoc-0.2.4 \
 		dlib-0.5.2 \
 		dlv-list-0.5.2 \
-		downcast-rs-1.2.0 \
+		downcast-rs-1.2.1 \
+		dpi-0.1.1 \
 		drm-0.11.1 \
+		drm-0.12.0 \
 		drm-ffi-0.7.1 \
+		drm-ffi-0.8.0 \
 		drm-fourcc-2.2.0 \
 		drm-sys-0.6.1 \
+		drm-sys-0.7.0 \
 		ecolor-0.23.0 \
 		edid-rs-0.1.0 \
 		egui-0.23.0 \
 		egui_extras-0.23.0 \
 		egui_glow-0.23.0 \
 		egui_plot-0.23.0 \
-		either-1.9.0 \
+		either-1.12.0 \
 		emath-0.23.0 \
-		encoding_rs-0.8.33 \
+		encoding_rs-0.8.34 \
 		enum-map-2.7.3 \
 		enum-map-derive-0.17.0 \
 		enumflags2-0.7.9 \
@@ -130,35 +137,35 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		enumn-0.1.13 \
 		epaint-0.23.0 \
 		equivalent-1.0.1 \
-		errno-0.3.8 \
+		errno-0.3.9 \
 		error-code-3.2.0 \
 		etagere-0.2.10 \
-		euclid-0.22.9 \
+		euclid-0.22.10 \
 		event-listener-2.5.3 \
 		event-listener-3.1.0 \
 		event-listener-4.0.3 \
-		event-listener-5.1.0 \
+		event-listener-5.3.1 \
 		event-listener-strategy-0.4.0 \
-		event-listener-strategy-0.5.0 \
-		exr-1.6.4 \
+		event-listener-strategy-0.5.2 \
+		exr-1.72.0 \
 		fast-srgb8-1.0.0 \
 		fastrand-1.9.0 \
-		fastrand-2.0.1 \
+		fastrand-2.1.0 \
 		fdeflate-0.3.4 \
 		filetime-0.2.23 \
 		find-crate-0.6.3 \
-		flate2-1.0.28 \
+		flate2-1.0.30 \
 		float-cmp-0.9.0 \
 		float_next_after-1.0.0 \
-		fluent-0.16.0 \
-		fluent-bundle-0.15.2 \
+		fluent-0.16.1 \
+		fluent-bundle-0.15.3 \
 		fluent-langneg-0.13.0 \
-		fluent-syntax-0.11.0 \
-		flume-0.10.14 \
+		fluent-syntax-0.11.1 \
+		flume-0.11.0 \
 		fnv-1.0.7 \
-		font-types-0.4.3 \
-		fontconfig-parser-0.5.3 \
-		fontdb-0.16.0 \
+		font-types-0.5.5 \
+		fontconfig-parser-0.5.6 \
+		fontdb-0.16.2 \
 		foreign-types-0.5.0 \
 		foreign-types-macros-0.2.3 \
 		foreign-types-shared-0.3.1 \
@@ -172,19 +179,20 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		futures-executor-0.3.30 \
 		futures-io-0.3.30 \
 		futures-lite-1.13.0 \
-		futures-lite-2.2.0 \
+		futures-lite-2.3.0 \
 		futures-macro-0.3.30 \
 		futures-sink-0.3.30 \
 		futures-task-0.3.30 \
 		futures-util-0.3.30 \
-		gbm-0.14.2 \
+		gbm-0.15.0 \
 		gbm-sys-0.3.0 \
-		generator-0.7.5 \
+		generator-0.8.1 \
 		generic-array-0.14.7 \
 		gethostname-0.4.3 \
-		getrandom-0.2.12 \
+		getrandom-0.2.15 \
 		gif-0.12.0 \
-		gimli-0.28.1 \
+		gif-0.13.1 \
+		gimli-0.29.0 \
 		gl_generator-0.14.0 \
 		glam-0.24.2 \
 		glow-0.12.3 \
@@ -197,11 +205,11 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		gpu-descriptor-types-0.1.2 \
 		grid-0.11.0 \
 		guillotiere-0.6.2 \
-		half-2.3.1 \
-		hashbrown-0.14.3 \
+		half-2.4.1 \
+		hashbrown-0.14.5 \
 		hassle-rs-0.11.0 \
 		heck-0.4.1 \
-		hermit-abi-0.3.4 \
+		hermit-abi-0.3.9 \
 		hex-0.4.3 \
 		hexf-parse-0.2.1 \
 		hmac-0.12.1 \
@@ -212,28 +220,27 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		i18n-embed-impl-0.8.3 \
 		iana-time-zone-0.1.60 \
 		iana-time-zone-haiku-0.1.2 \
-		icrate-0.0.4 \
 		ident_case-1.0.1 \
 		idna-0.5.0 \
-		image-0.24.8 \
+		image-0.24.9 \
 		imagesize-0.10.1 \
 		imagesize-0.12.0 \
-		indexmap-2.1.0 \
+		indexmap-2.2.6 \
 		inotify-0.9.6 \
 		inotify-sys-0.1.5 \
 		input-0.9.0 \
 		input-sys-1.18.0 \
-		instant-0.1.12 \
-		intl-memoizer-0.5.1 \
+		instant-0.1.13 \
+		intl-memoizer-0.5.2 \
 		intl_pluralrules-7.0.2 \
 		io-lifetimes-1.0.11 \
 		io-lifetimes-2.0.3 \
-		itoa-1.0.10 \
+		itoa-1.0.11 \
 		jni-0.21.1 \
 		jni-sys-0.3.0 \
-		jobserver-0.1.27 \
+		jobserver-0.1.31 \
 		jpeg-decoder-0.3.1 \
-		js-sys-0.3.67 \
+		js-sys-0.3.69 \
 		kamadak-exif-0.5.5 \
 		keyframe-1.1.1 \
 		khronos-egl-6.0.0 \
@@ -245,187 +252,201 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		kurbo-0.9.5 \
 		lazy_static-1.4.0 \
 		lebe-0.5.2 \
-		libc-0.2.153 \
+		libc-0.2.155 \
 		libloading-0.7.4 \
-		libloading-0.8.1 \
+		libloading-0.8.3 \
 		libm-0.2.8 \
-		libredox-0.0.1 \
 		libredox-0.0.2 \
+		libredox-0.1.3 \
 		libseat-0.2.1 \
 		libseat-sys-0.1.7 \
 		libsystemd-0.7.0 \
 		libudev-sys-0.1.4 \
 		linux-raw-sys-0.3.8 \
-		linux-raw-sys-0.4.13 \
+		linux-raw-sys-0.4.14 \
 		linux-raw-sys-0.6.4 \
 		locale_config-0.3.0 \
-		lock_api-0.4.11 \
-		log-0.4.20 \
+		lock_api-0.4.12 \
+		log-0.4.21 \
 		log-panics-2.1.0 \
-		loom-0.7.1 \
-		lru-0.12.1 \
+		loom-0.7.2 \
+		lru-0.12.3 \
 		lyon-1.0.1 \
 		lyon_algorithms-1.0.4 \
 		lyon_geom-1.0.5 \
-		lyon_path-1.0.4 \
-		lyon_tessellation-1.0.13 \
+		lyon_path-1.0.5 \
+		lyon_tessellation-1.0.15 \
 		malloc_buf-0.0.6 \
 		matchers-0.1.0 \
-		memchr-2.7.1 \
+		memchr-2.7.2 \
 		memmap2-0.8.0 \
-		memmap2-0.9.3 \
+		memmap2-0.9.4 \
 		memoffset-0.6.5 \
 		memoffset-0.7.1 \
-		memoffset-0.9.0 \
+		memoffset-0.9.1 \
 		metal-0.27.0 \
 		mime-0.3.17 \
 		mime_guess-2.0.4 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.7.1 \
+		miniz_oxide-0.7.3 \
 		mint-0.5.9 \
-		mio-0.8.10 \
+		mio-0.8.11 \
 		mutate_once-0.1.1 \
-		nanorand-0.7.0 \
-		ndk-0.8.0 \
+		ndk-0.9.0 \
 		ndk-context-0.1.1 \
-		ndk-sys-0.5.0+25.2.9519653 \
+		ndk-sys-0.6.0+11769913 \
 		nix-0.26.4 \
 		nix-0.27.1 \
 		nohash-hasher-0.2.0 \
 		nom-7.1.3 \
 		notify-6.1.1 \
 		nu-ansi-term-0.46.0 \
-		num-0.4.1 \
-		num-bigint-0.4.4 \
-		num-complex-0.4.4 \
-		num-integer-0.1.45 \
-		num-iter-0.1.43 \
-		num-rational-0.4.1 \
-		num-traits-0.2.17 \
+		num-0.4.3 \
+		num-bigint-0.4.5 \
+		num-complex-0.4.6 \
+		num-conv-0.1.0 \
+		num-integer-0.1.46 \
+		num-iter-0.1.45 \
+		num-rational-0.4.2 \
+		num-traits-0.2.19 \
 		num_cpus-1.16.0 \
 		num_enum-0.7.2 \
 		num_enum_derive-0.7.2 \
-		num_threads-0.1.6 \
+		num_threads-0.1.7 \
 		objc-0.2.7 \
 		objc-foundation-0.1.1 \
-		objc-sys-0.3.2 \
-		objc2-0.4.1 \
-		objc2-encode-3.0.0 \
+		objc-sys-0.3.5 \
+		objc2-0.5.2 \
+		objc2-app-kit-0.2.2 \
+		objc2-cloud-kit-0.2.2 \
+		objc2-contacts-0.2.2 \
+		objc2-core-data-0.2.2 \
+		objc2-core-image-0.2.2 \
+		objc2-core-location-0.2.2 \
+		objc2-encode-4.0.3 \
+		objc2-foundation-0.2.2 \
+		objc2-link-presentation-0.2.2 \
+		objc2-metal-0.2.2 \
+		objc2-quartz-core-0.2.2 \
+		objc2-symbols-0.2.2 \
+		objc2-ui-kit-0.2.2 \
+		objc2-uniform-type-identifiers-0.2.2 \
+		objc2-user-notifications-0.2.2 \
 		objc_exception-0.1.2 \
 		objc_id-0.1.1 \
-		object-0.32.2 \
+		object-0.35.0 \
 		once_cell-1.19.0 \
 		option-ext-0.2.0 \
 		orbclient-0.3.47 \
 		ordered-float-4.2.0 \
-		ordered-multimap-0.7.1 \
+		ordered-multimap-0.7.3 \
 		ordered-stream-0.2.0 \
 		ouroboros-0.17.2 \
 		ouroboros_macro-0.17.2 \
 		overload-0.1.1 \
-		owned_ttf_parser-0.20.0 \
-		palette-0.7.3 \
-		palette_derive-0.7.3 \
+		owned_ttf_parser-0.21.0 \
+		palette-0.7.6 \
+		palette_derive-0.7.6 \
 		parking-2.2.0 \
 		parking_lot-0.11.2 \
-		parking_lot-0.12.1 \
+		parking_lot-0.12.3 \
 		parking_lot_core-0.8.6 \
-		parking_lot_core-0.9.9 \
-		paste-1.0.14 \
+		parking_lot_core-0.9.10 \
+		paste-1.0.15 \
 		percent-encoding-2.3.1 \
 		phf-0.11.2 \
 		phf_generator-0.11.2 \
 		phf_macros-0.11.2 \
 		phf_shared-0.11.2 \
 		pico-args-0.5.0 \
-		pin-project-1.1.3 \
-		pin-project-internal-1.1.3 \
-		pin-project-lite-0.2.13 \
+		pin-project-1.1.5 \
+		pin-project-internal-1.1.5 \
+		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
-		piper-0.2.1 \
+		piper-0.2.2 \
 		pixman-0.1.0 \
 		pixman-sys-0.1.0 \
-		pkg-config-0.3.29 \
-		png-0.17.11 \
+		pkg-config-0.3.30 \
+		png-0.17.13 \
 		polling-2.8.0 \
-		polling-3.3.2 \
+		polling-3.7.0 \
 		powerfmt-0.2.0 \
 		ppv-lite86-0.2.17 \
 		presser-0.3.1 \
 		proc-macro-crate-1.3.1 \
-		proc-macro-crate-3.1.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.76 \
+		proc-macro2-1.0.84 \
 		profiling-1.0.15 \
 		profiling-procmacros-1.0.15 \
 		qoi-0.4.1 \
-		quick-xml-0.30.0 \
-		quote-1.0.35 \
+		quick-xml-0.31.0 \
+		quote-1.0.36 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		range-alloc-0.1.3 \
-		rangemap-1.4.0 \
-		raw-window-handle-0.6.0 \
-		rayon-1.8.1 \
+		rangemap-1.5.1 \
+		raw-window-handle-0.6.2 \
+		rayon-1.10.0 \
 		rayon-core-1.12.1 \
 		rctree-0.5.0 \
-		read-fonts-0.16.0 \
+		read-fonts-0.19.3 \
 		redox_syscall-0.2.16 \
-		redox_syscall-0.3.5 \
 		redox_syscall-0.4.1 \
-		redox_users-0.4.4 \
-		regex-1.10.2 \
+		redox_syscall-0.5.1 \
+		redox_users-0.4.5 \
+		regex-1.10.4 \
 		regex-automata-0.1.10 \
-		regex-automata-0.4.3 \
+		regex-automata-0.4.6 \
 		regex-syntax-0.6.29 \
-		regex-syntax-0.8.2 \
-		renderdoc-0.11.0 \
-		renderdoc-sys-1.0.0 \
+		regex-syntax-0.8.3 \
+		renderdoc-sys-1.1.0 \
 		resvg-0.28.0 \
 		resvg-0.37.0 \
 		rgb-0.8.37 \
 		ron-0.8.1 \
 		roxmltree-0.15.1 \
-		roxmltree-0.18.1 \
 		roxmltree-0.19.0 \
-		rust-embed-8.2.0 \
-		rust-embed-impl-8.2.0 \
-		rust-embed-utils-8.2.0 \
+		rust-embed-8.4.0 \
+		rust-embed-impl-8.4.0 \
+		rust-embed-utils-8.4.0 \
 		rust-ini-0.20.0 \
-		rustc-demangle-0.1.23 \
+		rustc-demangle-0.1.24 \
 		rustc-hash-1.1.0 \
 		rustix-0.37.27 \
-		rustix-0.38.32 \
-		rustversion-1.0.14 \
+		rustix-0.38.34 \
+		rustversion-1.0.17 \
 		rustybuzz-0.12.1 \
-		ryu-1.0.16 \
+		rustybuzz-0.14.1 \
+		ryu-1.0.18 \
 		same-file-1.0.6 \
 		sanitize-filename-0.5.0 \
 		scan_fmt-0.2.6 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.2.0 \
 		self_cell-0.10.3 \
-		self_cell-1.0.3 \
+		self_cell-1.0.4 \
 		sendfd-0.4.3 \
-		serde-1.0.195 \
-		serde_derive-1.0.195 \
-		serde_json-1.0.111 \
-		serde_repr-0.1.18 \
-		serde_spanned-0.6.5 \
+		serde-1.0.203 \
+		serde_derive-1.0.203 \
+		serde_json-1.0.117 \
+		serde_repr-0.1.19 \
+		serde_spanned-0.6.6 \
 		sha1-0.10.6 \
 		sha2-0.10.8 \
 		sharded-slab-0.1.7 \
-		signal-hook-registry-1.4.1 \
+		signal-hook-registry-1.4.2 \
 		simd-adler32-0.3.7 \
 		simplecss-0.2.1 \
 		siphasher-0.3.11 \
+		skrifa-0.19.3 \
 		slab-0.4.9 \
 		slotmap-1.0.7 \
-		smallvec-1.13.1 \
-		smithay-client-toolkit-0.18.0 \
-		smol_str-0.2.1 \
+		smallvec-1.13.2 \
+		smithay-client-toolkit-0.18.1 \
+		smithay-client-toolkit-0.19.1 \
+		smol_str-0.2.2 \
 		snowflake-1.3.0 \
 		socket2-0.4.10 \
 		spin-0.9.8 \
@@ -433,37 +454,38 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		static_assertions-1.1.0 \
 		strict-num-0.1.1 \
 		strsim-0.10.0 \
+		strsim-0.11.1 \
 		subtle-2.5.0 \
-		svg_fmt-0.4.1 \
+		svg_fmt-0.4.3 \
 		svgtypes-0.8.2 \
 		svgtypes-0.13.0 \
-		swash-0.1.13 \
+		swash-0.1.17 \
 		syn-1.0.109 \
-		syn-2.0.48 \
+		syn-2.0.66 \
 		sys-locale-0.3.1 \
-		tempfile-3.9.0 \
+		tempfile-3.10.1 \
 		termcolor-1.4.1 \
-		thiserror-1.0.56 \
-		thiserror-impl-1.0.56 \
-		thread_local-1.1.7 \
+		thiserror-1.0.61 \
+		thiserror-impl-1.0.61 \
+		thread_local-1.1.8 \
 		tiff-0.9.1 \
-		time-0.3.31 \
+		time-0.3.36 \
 		time-core-0.1.2 \
-		time-macros-0.2.16 \
+		time-macros-0.2.18 \
 		tiny-keccak-2.0.2 \
 		tiny-skia-0.8.4 \
-		tiny-skia-0.11.3 \
+		tiny-skia-0.11.4 \
 		tiny-skia-path-0.8.4 \
-		tiny-skia-path-0.11.3 \
-		tiny-xlib-0.2.2 \
-		tinystr-0.7.5 \
+		tiny-skia-path-0.11.4 \
+		tiny-xlib-0.2.3 \
+		tinystr-0.7.6 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
 		toml-0.5.11 \
-		toml-0.8.8 \
-		toml_datetime-0.6.5 \
+		toml-0.8.13 \
+		toml_datetime-0.6.6 \
 		toml_edit-0.19.15 \
-		toml_edit-0.21.0 \
+		toml_edit-0.22.13 \
 		tracing-0.1.40 \
 		tracing-attributes-0.1.27 \
 		tracing-core-0.1.32 \
@@ -473,24 +495,27 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		tracy-client-0.17.0 \
 		tracy-client-sys-0.22.2 \
 		ttf-parser-0.20.0 \
-		type-map-0.4.0 \
+		ttf-parser-0.21.1 \
+		type-map-0.5.0 \
 		typenum-1.17.0 \
 		udev-0.8.0 \
 		uds_windows-1.1.0 \
-		unic-langid-0.9.4 \
-		unic-langid-impl-0.9.4 \
+		unic-langid-0.9.5 \
+		unic-langid-impl-0.9.5 \
 		unicase-2.7.0 \
 		unicode-bidi-0.3.15 \
 		unicode-bidi-mirroring-0.1.0 \
+		unicode-bidi-mirroring-0.2.0 \
 		unicode-ccc-0.1.2 \
+		unicode-ccc-0.2.0 \
 		unicode-ident-1.0.12 \
 		unicode-linebreak-0.1.5 \
-		unicode-normalization-0.1.22 \
+		unicode-normalization-0.1.23 \
 		unicode-properties-0.1.1 \
-		unicode-script-0.5.5 \
-		unicode-segmentation-1.10.1 \
+		unicode-script-0.5.6 \
+		unicode-segmentation-1.11.0 \
 		unicode-vo-0.1.0 \
-		unicode-width-0.1.11 \
+		unicode-width-0.1.12 \
 		unicode-xid-0.2.4 \
 		url-2.5.0 \
 		usvg-0.28.0 \
@@ -498,107 +523,113 @@ CARGO_CRATES=	ab_glyph-0.2.23 \
 		usvg-parser-0.37.0 \
 		usvg-text-layout-0.37.0 \
 		usvg-tree-0.37.0 \
-		uuid-1.7.0 \
+		uuid-1.8.0 \
 		valuable-0.1.0 \
 		version_check-0.9.4 \
-		waker-fn-1.1.1 \
-		walkdir-2.4.0 \
+		waker-fn-1.2.0 \
+		walkdir-2.5.0 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
-		wasm-bindgen-0.2.90 \
-		wasm-bindgen-backend-0.2.90 \
-		wasm-bindgen-futures-0.4.40 \
-		wasm-bindgen-macro-0.2.90 \
-		wasm-bindgen-macro-support-0.2.90 \
-		wasm-bindgen-shared-0.2.90 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-futures-0.4.42 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
 		wasm-timer-0.2.5 \
-		wayland-backend-0.3.2 \
-		wayland-client-0.31.1 \
+		wayland-backend-0.3.4 \
+		wayland-client-0.31.3 \
 		wayland-csd-frame-0.3.0 \
-		wayland-cursor-0.31.0 \
-		wayland-egl-0.32.0 \
+		wayland-cursor-0.31.3 \
+		wayland-egl-0.32.1 \
 		wayland-protocols-0.31.2 \
-		wayland-protocols-misc-0.2.0 \
+		wayland-protocols-0.32.1 \
+		wayland-protocols-misc-0.3.1 \
 		wayland-protocols-plasma-0.2.0 \
 		wayland-protocols-wlr-0.2.0 \
-		wayland-scanner-0.31.0 \
-		wayland-server-0.31.0 \
-		wayland-sys-0.31.1 \
-		web-sys-0.3.67 \
+		wayland-protocols-wlr-0.3.1 \
+		wayland-scanner-0.31.2 \
+		wayland-server-0.31.2 \
+		wayland-sys-0.31.2 \
+		web-sys-0.3.69 \
 		web-time-0.2.4 \
-		weezl-0.1.7 \
-		widestring-1.0.2 \
+		web-time-1.1.0 \
+		weezl-0.1.8 \
+		widestring-1.1.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.6 \
+		winapi-util-0.1.8 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.48.0 \
-		windows-0.51.1 \
-		windows-core-0.51.1 \
+		windows-0.52.0 \
+		windows-0.54.0 \
+		windows-core-0.52.0 \
+		windows-core-0.54.0 \
+		windows-result-0.1.1 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
 		windows-targets-0.42.2 \
 		windows-targets-0.48.5 \
-		windows-targets-0.52.0 \
+		windows-targets-0.52.5 \
 		windows_aarch64_gnullvm-0.42.2 \
 		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_gnullvm-0.52.0 \
+		windows_aarch64_gnullvm-0.52.5 \
 		windows_aarch64_msvc-0.42.2 \
 		windows_aarch64_msvc-0.48.5 \
-		windows_aarch64_msvc-0.52.0 \
+		windows_aarch64_msvc-0.52.5 \
 		windows_i686_gnu-0.42.2 \
 		windows_i686_gnu-0.48.5 \
-		windows_i686_gnu-0.52.0 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
 		windows_i686_msvc-0.42.2 \
 		windows_i686_msvc-0.48.5 \
-		windows_i686_msvc-0.52.0 \
+		windows_i686_msvc-0.52.5 \
 		windows_x86_64_gnu-0.42.2 \
 		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnu-0.52.0 \
+		windows_x86_64_gnu-0.52.5 \
 		windows_x86_64_gnullvm-0.42.2 \
 		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_gnullvm-0.52.0 \
+		windows_x86_64_gnullvm-0.52.5 \
 		windows_x86_64_msvc-0.42.2 \
 		windows_x86_64_msvc-0.48.5 \
-		windows_x86_64_msvc-0.52.0 \
-		winit-0.29.10 \
-		winnow-0.5.34 \
-		wio-0.2.2 \
+		windows_x86_64_msvc-0.52.5 \
+		winit-0.30.3 \
+		winnow-0.5.40 \
+		winnow-0.6.9 \
 		x11-dl-2.21.0 \
-		x11rb-0.13.0 \
-		x11rb-protocol-0.13.0 \
+		x11rb-0.13.1 \
+		x11rb-protocol-0.13.1 \
 		xcursor-0.3.5 \
 		xdg-2.5.2 \
 		xdg-home-1.1.0 \
 		xdg-user-0.2.1 \
 		xkbcommon-0.7.0 \
-		xkbcommon-dl-0.4.1 \
+		xkbcommon-dl-0.4.2 \
 		xkeysym-0.2.0 \
-		xml-rs-0.8.19 \
+		xml-rs-0.8.20 \
 		xmlparser-0.13.6 \
 		xmlwriter-0.1.0 \
-		xxhash-rust-0.8.8 \
+		xxhash-rust-0.8.10 \
 		yazi-0.1.6 \
-		zbus-3.15.0 \
-		zbus_macros-3.15.0 \
-		zbus_names-2.6.0 \
+		zbus-3.15.2 \
+		zbus_macros-3.15.2 \
+		zbus_names-2.6.1 \
 		zeno-0.2.3 \
-		zerocopy-0.7.32 \
-		zerocopy-derive-0.7.32 \
+		zerocopy-0.7.34 \
+		zerocopy-derive-0.7.34 \
 		zune-inflate-0.2.54 \
-		zvariant-3.15.0 \
-		zvariant_derive-3.15.0 \
+		zvariant-3.15.2 \
+		zvariant_derive-3.15.2 \
 		zvariant_utils-1.0.1 \
-		clipboard_macos,clipboard_wayland,clipboard_x11,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-mime-types\#f65a6c303bbbd6c7bf88f9bc34421ec06d893bea \
+		cosmic-text@git+https://github.com/pop-os/cosmic-text.git\#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f \
 		taffy@git+https://github.com/DioxusLabs/taffy?rev=7781c70\#7781c70241f7f572130c13106f2a869a9cf80885 \
 		d3d12,naga,wgpu,wgpu-core,wgpu-hal,wgpu-types@git+https://github.com/gfx-rs/wgpu?rev=20fda69\#20fda698341efbdc870b8027d6d49f5bf3f36109 \
-		cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_style,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#cc439b2ceaf41226ab86416ae0ad3651c9a6e10a \
+		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#f16efccaffdbe60b81d1a500be6e81851dc1dad4 \
 		glyphon@git+https://github.com/pop-os/glyphon.git?tag=v0.5.0\#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8 \
+		cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_style,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#61760f8e4e33744a451e8e8fe09d581793c9c677 \
+		smithay-clipboard@git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5\#d099e82a4c1e7d3e88dc34b7333de21928b1b22c \
+		clipboard_macos,clipboard_wayland,clipboard_x11,dnd,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8\#7c59b07b9172d8e0401f7e06609e1050575309c9 \
 		atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \
 		id_tree@git+https://github.com/Drakulix/id-tree.git?branch=feature/copy_clone\#632a57d6d49160e18d7300fa7edae52281ec5482 \
+		smithay@git+https://github.com/smithay/smithay?rev=69b379d\#69b379d00af9e1bcc98dac2d452bfd86eafdaf34 \
 		softbuffer@git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0\#6e75b1ad7e98397d37cb187886d05969bc480995 \
-		smithay-egui@git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0\#cdc652e0d4823b16a5bd9badd288e38512789dc5 \
-		smithay-clipboard@git+https://github.com/pop-os/smithay-clipboard?tag=pop-mime-types\#cc0101c1f9ccc937a413bd3af3c0f6217f27e935 \
-		smithay@git+https://github.com/smithay/smithay?rev=eea0d9c\#eea0d9c171f30eb50247632fcddbb84f1dd147f0 \
-		cosmic-text@git+https://github.com/pop-os/cosmic-text.git\#ff5501d9a36e51c50d908413caf7632d8f7533b7 \
-		cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#1cc4a1393d0f8be4d444666e260fdb811b400f49
+		smithay-egui@git+https://github.com/Smithay/smithay-egui.git?rev=cdc652e0\#cdc652e0d4823b16a5bd9badd288e38512789dc5
diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo
index 20446f241874..0a0f1eef7a44 100644
--- a/x11-wm/cosmic-comp/distinfo
+++ b/x11-wm/cosmic-comp/distinfo
@@ -1,34 +1,34 @@
-TIMESTAMP = 1714739938
-SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225
-SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537
+TIMESTAMP = 1719412581
+SHA256 (rust/crates/ab_glyph-0.2.26.crate) = 2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd
+SIZE (rust/crates/ab_glyph-0.2.26.crate) = 19078
 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046
 SIZE (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = 11010
 SHA256 (rust/crates/accesskit-0.11.2.crate) = 76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8
 SIZE (rust/crates/accesskit-0.11.2.crate) = 27223
-SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
-SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+SHA256 (rust/crates/addr2line-0.22.0.crate) = 6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678
+SIZE (rust/crates/addr2line-0.22.0.crate) = 39156
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
-SHA256 (rust/crates/ahash-0.8.7.crate) = 77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01
-SIZE (rust/crates/ahash-0.8.7.crate) = 42894
-SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
-SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
 SHA256 (rust/crates/aliasable-0.1.3.crate) = 250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd
 SIZE (rust/crates/aliasable-0.1.3.crate) = 6169
-SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
-SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
+SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
 SHA256 (rust/crates/almost-0.2.0.crate) = 3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14
 SIZE (rust/crates/almost-0.2.0.crate) = 31976
-SHA256 (rust/crates/android-activity-0.5.1.crate) = 39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9
-SIZE (rust/crates/android-activity-0.5.1.crate) = 258268
+SHA256 (rust/crates/android-activity-0.6.0.crate) = ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046
+SIZE (rust/crates/android-activity-0.6.0.crate) = 258597
 SHA256 (rust/crates/android-properties-0.2.2.crate) = fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04
 SIZE (rust/crates/android-properties-0.2.2.crate) = 4563
 SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
 SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
 SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
 SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
-SHA256 (rust/crates/anyhow-1.0.79.crate) = 080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca
-SIZE (rust/crates/anyhow-1.0.79.crate) = 44931
+SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
+SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
 SHA256 (rust/crates/appendlist-1.4.0.crate) = e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2
 SIZE (rust/crates/appendlist-1.4.0.crate) = 7252
 SHA256 (rust/crates/apply-0.3.0.crate) = f47b57fc4521e3cae26a4d45b5227f8fadee4c345be0fefd8d5d1711afb8aeb9
@@ -37,8 +37,8 @@ SHA256 (rust/crates/approx-0.4.0.crate) = 3f2a05fd1bd10b2527e20a2cd32d8873d115b8
 SIZE (rust/crates/approx-0.4.0.crate) = 14280
 SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6
 SIZE (rust/crates/approx-0.5.1.crate) = 15100
-SHA256 (rust/crates/arc-swap-1.6.0.crate) = bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6
-SIZE (rust/crates/arc-swap-1.6.0.crate) = 67342
+SHA256 (rust/crates/arc-swap-1.7.1.crate) = 69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457
+SIZE (rust/crates/arc-swap-1.7.1.crate) = 68512
 SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545
 SIZE (rust/crates/arrayref-0.3.7.crate) = 9620
 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
@@ -47,38 +47,40 @@ SHA256 (rust/crates/as-raw-xcb-connection-1.0.1.crate) = 175571dd1d178ced59193a6
 SIZE (rust/crates/as-raw-xcb-connection-1.0.1.crate) = 6460
 SHA256 (rust/crates/ash-0.37.3+1.3.251.crate) = 39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a
 SIZE (rust/crates/ash-0.37.3+1.3.251.crate) = 449524
+SHA256 (rust/crates/ash-0.38.0+1.3.281.crate) = 0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f
+SIZE (rust/crates/ash-0.38.0+1.3.281.crate) = 457775
 SHA256 (rust/crates/async-broadcast-0.5.1.crate) = 7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b
 SIZE (rust/crates/async-broadcast-0.5.1.crate) = 20134
-SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
-SIZE (rust/crates/async-channel-2.2.0.crate) = 14307
-SHA256 (rust/crates/async-executor-1.8.0.crate) = 17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c
-SIZE (rust/crates/async-executor-1.8.0.crate) = 21870
+SHA256 (rust/crates/async-channel-2.3.1.crate) = 89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a
+SIZE (rust/crates/async-channel-2.3.1.crate) = 14576
+SHA256 (rust/crates/async-executor-1.12.0.crate) = c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0
+SIZE (rust/crates/async-executor-1.12.0.crate) = 28529
 SHA256 (rust/crates/async-fs-1.6.0.crate) = 279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06
 SIZE (rust/crates/async-fs-1.6.0.crate) = 16506
 SHA256 (rust/crates/async-io-1.13.0.crate) = 0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af
 SIZE (rust/crates/async-io-1.13.0.crate) = 37191
-SHA256 (rust/crates/async-io-2.3.1.crate) = 8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65
-SIZE (rust/crates/async-io-2.3.1.crate) = 49279
+SHA256 (rust/crates/async-io-2.3.2.crate) = dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884
+SIZE (rust/crates/async-io-2.3.2.crate) = 49298
 SHA256 (rust/crates/async-lock-2.8.0.crate) = 287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b
 SIZE (rust/crates/async-lock-2.8.0.crate) = 29944
 SHA256 (rust/crates/async-lock-3.3.0.crate) = d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b
 SIZE (rust/crates/async-lock-3.3.0.crate) = 33286
 SHA256 (rust/crates/async-process-1.8.1.crate) = ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88
 SIZE (rust/crates/async-process-1.8.1.crate) = 22758
-SHA256 (rust/crates/async-recursion-1.0.5.crate) = 5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0
-SIZE (rust/crates/async-recursion-1.0.5.crate) = 11890
-SHA256 (rust/crates/async-signal-0.2.5.crate) = 9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5
-SIZE (rust/crates/async-signal-0.2.5.crate) = 16743
-SHA256 (rust/crates/async-task-4.7.0.crate) = fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799
-SIZE (rust/crates/async-task-4.7.0.crate) = 38906
-SHA256 (rust/crates/async-trait-0.1.77.crate) = c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9
-SIZE (rust/crates/async-trait-0.1.77.crate) = 29986
+SHA256 (rust/crates/async-recursion-1.1.1.crate) = 3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11
+SIZE (rust/crates/async-recursion-1.1.1.crate) = 14874
+SHA256 (rust/crates/async-signal-0.2.6.crate) = afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda
+SIZE (rust/crates/async-signal-0.2.6.crate) = 16696
+SHA256 (rust/crates/async-task-4.7.1.crate) = 8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de
+SIZE (rust/crates/async-task-4.7.1.crate) = 38077
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
 SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
 SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
-SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
-SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
-SHA256 (rust/crates/backtrace-0.3.69.crate) = 2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837
-SIZE (rust/crates/backtrace-0.3.69.crate) = 77299
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
+SHA256 (rust/crates/backtrace-0.3.72.crate) = 17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11
+SIZE (rust/crates/backtrace-0.3.72.crate) = 87877
 SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
 SIZE (rust/crates/base64-0.13.1.crate) = 61002
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
@@ -91,50 +93,54 @@ SHA256 (rust/crates/bit_field-0.10.2.crate) = dc827186963e592360843fb5ba4b973e14
 SIZE (rust/crates/bit_field-0.10.2.crate) = 10568
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitflags-2.4.2.crate) = ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf
-SIZE (rust/crates/bitflags-2.4.2.crate) = 42602
+SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
+SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
 SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a
 SIZE (rust/crates/block-0.1.6.crate) = 4077
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
-SHA256 (rust/crates/block-sys-0.2.1.crate) = ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7
-SIZE (rust/crates/block-sys-0.2.1.crate) = 9320
-SHA256 (rust/crates/block2-0.3.0.crate) = 15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68
-SIZE (rust/crates/block2-0.3.0.crate) = 10924
-SHA256 (rust/crates/blocking-1.5.1.crate) = 6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118
-SIZE (rust/crates/blocking-1.5.1.crate) = 17277
-SHA256 (rust/crates/bumpalo-3.14.0.crate) = 7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec
-SIZE (rust/crates/bumpalo-3.14.0.crate) = 82400
-SHA256 (rust/crates/bytemuck-1.14.0.crate) = 374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6
-SIZE (rust/crates/bytemuck-1.14.0.crate) = 44933
-SHA256 (rust/crates/bytemuck_derive-1.5.0.crate) = 965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1
-SIZE (rust/crates/bytemuck_derive-1.5.0.crate) = 17323
+SHA256 (rust/crates/block2-0.5.1.crate) = 2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f
+SIZE (rust/crates/block2-0.5.1.crate) = 24191
+SHA256 (rust/crates/blocking-1.6.1.crate) = 703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea
+SIZE (rust/crates/blocking-1.6.1.crate) = 17788
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/by_address-1.2.1.crate) = 64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06
+SIZE (rust/crates/by_address-1.2.1.crate) = 8437
+SHA256 (rust/crates/bytemuck-1.16.0.crate) = 78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5
+SIZE (rust/crates/bytemuck-1.16.0.crate) = 48015
+SHA256 (rust/crates/bytemuck_derive-1.7.0.crate) = 1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b
+SIZE (rust/crates/bytemuck_derive-1.7.0.crate) = 21687
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
-SHA256 (rust/crates/bytes-1.5.0.crate) = a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223
-SIZE (rust/crates/bytes-1.5.0.crate) = 58909
+SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
+SIZE (rust/crates/bytes-1.6.0.crate) = 60605
 SHA256 (rust/crates/calloop-0.12.4.crate) = fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298
 SIZE (rust/crates/calloop-0.12.4.crate) = 69583
 SHA256 (rust/crates/calloop-0.13.0.crate) = b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec
 SIZE (rust/crates/calloop-0.13.0.crate) = 69698
+SHA256 (rust/crates/calloop-0.14.0.crate) = c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10
+SIZE (rust/crates/calloop-0.14.0.crate) = 71405
 SHA256 (rust/crates/calloop-wayland-source-0.2.0.crate) = 0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02
 SIZE (rust/crates/calloop-wayland-source-0.2.0.crate) = 11304
-SHA256 (rust/crates/cc-1.0.83.crate) = f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0
-SIZE (rust/crates/cc-1.0.83.crate) = 68343
+SHA256 (rust/crates/calloop-wayland-source-0.3.0.crate) = 95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20
+SIZE (rust/crates/calloop-wayland-source-0.3.0.crate) = 11300
+SHA256 (rust/crates/cc-1.0.98.crate) = 41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f
+SIZE (rust/crates/cc-1.0.98.crate) = 76780
 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
 SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
 SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
-SHA256 (rust/crates/cfg_aliases-0.2.0.crate) = 77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f
-SIZE (rust/crates/cfg_aliases-0.2.0.crate) = 6339
+SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
+SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
 SHA256 (rust/crates/cgmath-0.18.0.crate) = 1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317
 SIZE (rust/crates/cgmath-0.18.0.crate) = 64802
-SHA256 (rust/crates/chrono-0.4.35.crate) = 8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a
-SIZE (rust/crates/chrono-0.4.35.crate) = 234267
-SHA256 (rust/crates/clipboard-win-5.3.0.crate) = d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee
-SIZE (rust/crates/clipboard-win-5.3.0.crate) = 19597
+SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
+SIZE (rust/crates/chrono-0.4.38.crate) = 220559
+SHA256 (rust/crates/clipboard-win-5.3.1.crate) = 79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad
+SIZE (rust/crates/clipboard-win-5.3.1.crate) = 19921
 SHA256 (rust/crates/cocoa-0.25.0.crate) = f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c
 SIZE (rust/crates/cocoa-0.25.0.crate) = 42163
 SHA256 (rust/crates/cocoa-foundation-0.1.2.crate) = 8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7
@@ -149,10 +155,10 @@ SHA256 (rust/crates/com_macros-0.6.0.crate) = d375883580a668c7481ea6631fc1a8863e
 SIZE (rust/crates/com_macros-0.6.0.crate) = 1075
 SHA256 (rust/crates/com_macros_support-0.6.0.crate) = ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c
 SIZE (rust/crates/com_macros_support-0.6.0.crate) = 17334
-SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
-SIZE (rust/crates/combine-4.6.6.crate) = 132428
-SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
-SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/combine-4.6.7.crate) = ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd
+SIZE (rust/crates/combine-4.6.7.crate) = 134808
+SHA256 (rust/crates/concurrent-queue-2.5.0.crate) = 4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973
+SIZE (rust/crates/concurrent-queue-2.5.0.crate) = 22654
 SHA256 (rust/crates/const-random-0.1.18.crate) = 87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359
 SIZE (rust/crates/const-random-0.1.18.crate) = 6646
 SHA256 (rust/crates/const-random-macro-0.1.16.crate) = f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e
@@ -161,40 +167,40 @@ SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2
 SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
 SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
 SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
-SHA256 (rust/crates/core-graphics-0.23.1.crate) = 970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212
-SIZE (rust/crates/core-graphics-0.23.1.crate) = 30714
+SHA256 (rust/crates/core-graphics-0.23.2.crate) = c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081
+SIZE (rust/crates/core-graphics-0.23.2.crate) = 30763
 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf
 SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063
 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
 SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
-SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
-SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
-SHA256 (rust/crates/crossbeam-channel-0.5.11.crate) = 176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b
-SIZE (rust/crates/crossbeam-channel-0.5.11.crate) = 90434
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
+SHA256 (rust/crates/crossbeam-channel-0.5.13.crate) = 33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2
+SIZE (rust/crates/crossbeam-channel-0.5.13.crate) = 91174
 SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
 SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
 SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
 SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
-SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
-SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
+SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
 SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
 SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
-SHA256 (rust/crates/css-color-0.2.5.crate) = d101c65424c856131a3cb818da2ddde03500dc3656972269cdf79f018ef77eb4
-SIZE (rust/crates/css-color-0.2.5.crate) = 158691
+SHA256 (rust/crates/css-color-0.2.8.crate) = 42aaeae719fd78ce501d77c6cdf01f7e96f26bcd5617a4903a1c2b97e388543a
+SIZE (rust/crates/css-color-0.2.8.crate) = 159533
 SHA256 (rust/crates/csscolorparser-0.6.2.crate) = eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf
 SIZE (rust/crates/csscolorparser-0.6.2.crate) = 16859
-SHA256 (rust/crates/ctor-0.2.6.crate) = 30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e
-SIZE (rust/crates/ctor-0.2.6.crate) = 11034
+SHA256 (rust/crates/ctor-lite-0.1.0.crate) = 1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b
+SIZE (rust/crates/ctor-lite-0.1.0.crate) = 10506
 SHA256 (rust/crates/cursor-icon-1.1.0.crate) = 96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991
 SIZE (rust/crates/cursor-icon-1.1.0.crate) = 11453
-SHA256 (rust/crates/darling-0.20.3.crate) = 0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e
-SIZE (rust/crates/darling-0.20.3.crate) = 26066
-SHA256 (rust/crates/darling_core-0.20.3.crate) = 177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621
-SIZE (rust/crates/darling_core-0.20.3.crate) = 60281
-SHA256 (rust/crates/darling_macro-0.20.3.crate) = 836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5
-SIZE (rust/crates/darling_macro-0.20.3.crate) = 1859
+SHA256 (rust/crates/darling-0.20.9.crate) = 83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1
+SIZE (rust/crates/darling-0.20.9.crate) = 31777
+SHA256 (rust/crates/darling_core-0.20.9.crate) = 622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120
+SIZE (rust/crates/darling_core-0.20.9.crate) = 65014
+SHA256 (rust/crates/darling_macro-0.20.9.crate) = 733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178
+SIZE (rust/crates/darling_macro-0.20.9.crate) = 1875
 SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
 SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
 SHA256 (rust/crates/data-url-0.2.0.crate) = 8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5
@@ -221,16 +227,24 @@ SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d
 SIZE (rust/crates/dlib-0.5.2.crate) = 5806
 SHA256 (rust/crates/dlv-list-0.5.2.crate) = 442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f
 SIZE (rust/crates/dlv-list-0.5.2.crate) = 22373
-SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
-SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670
+SHA256 (rust/crates/downcast-rs-1.2.1.crate) = 75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2
+SIZE (rust/crates/downcast-rs-1.2.1.crate) = 11821
+SHA256 (rust/crates/dpi-0.1.1.crate) = f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53
+SIZE (rust/crates/dpi-0.1.1.crate) = 11131
 SHA256 (rust/crates/drm-0.11.1.crate) = a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde
 SIZE (rust/crates/drm-0.11.1.crate) = 49655
+SHA256 (rust/crates/drm-0.12.0.crate) = 98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1
+SIZE (rust/crates/drm-0.12.0.crate) = 49549
 SHA256 (rust/crates/drm-ffi-0.7.1.crate) = 41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6
 SIZE (rust/crates/drm-ffi-0.7.1.crate) = 9581
+SHA256 (rust/crates/drm-ffi-0.8.0.crate) = 97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53
+SIZE (rust/crates/drm-ffi-0.8.0.crate) = 9703
 SHA256 (rust/crates/drm-fourcc-2.2.0.crate) = 0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4
 SIZE (rust/crates/drm-fourcc-2.2.0.crate) = 12192
 SHA256 (rust/crates/drm-sys-0.6.1.crate) = 2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176
 SIZE (rust/crates/drm-sys-0.6.1.crate) = 10363
+SHA256 (rust/crates/drm-sys-0.7.0.crate) = fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986
+SIZE (rust/crates/drm-sys-0.7.0.crate) = 10439
 SHA256 (rust/crates/ecolor-0.23.0.crate) = cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af
 SIZE (rust/crates/ecolor-0.23.0.crate) = 8106
 SHA256 (rust/crates/edid-rs-0.1.0.crate) = 2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c
@@ -243,12 +257,12 @@ SHA256 (rust/crates/egui_glow-0.23.0.crate) = ce6726c08798822280038bbad2e32f4fc3
 SIZE (rust/crates/egui_glow-0.23.0.crate) = 27348
 SHA256 (rust/crates/egui_plot-0.23.0.crate) = c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b
 SIZE (rust/crates/egui_plot-0.23.0.crate) = 38292
-SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07
-SIZE (rust/crates/either-1.9.0.crate) = 16660
+SHA256 (rust/crates/either-1.12.0.crate) = 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b
+SIZE (rust/crates/either-1.12.0.crate) = 18974
 SHA256 (rust/crates/emath-0.23.0.crate) = 1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0
 SIZE (rust/crates/emath-0.23.0.crate) = 19591
-SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1
-SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071
+SHA256 (rust/crates/encoding_rs-0.8.34.crate) = b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59
+SIZE (rust/crates/encoding_rs-0.8.34.crate) = 1378166
 SHA256 (rust/crates/enum-map-2.7.3.crate) = 6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9
 SIZE (rust/crates/enum-map-2.7.3.crate) = 21792
 SHA256 (rust/crates/enum-map-derive-0.17.0.crate) = f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb
@@ -263,64 +277,64 @@ SHA256 (rust/crates/epaint-0.23.0.crate) = 58067b840d009143934d91d8dcb8ded054d83
 SIZE (rust/crates/epaint-0.23.0.crate) = 853244
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
-SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
+SIZE (rust/crates/errno-0.3.9.crate) = 10690
 SHA256 (rust/crates/error-code-3.2.0.crate) = a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b
 SIZE (rust/crates/error-code-3.2.0.crate) = 7569
 SHA256 (rust/crates/etagere-0.2.10.crate) = 306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e
 SIZE (rust/crates/etagere-0.2.10.crate) = 18109
-SHA256 (rust/crates/euclid-0.22.9.crate) = 87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787
-SIZE (rust/crates/euclid-0.22.9.crate) = 76671
+SHA256 (rust/crates/euclid-0.22.10.crate) = e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20
+SIZE (rust/crates/euclid-0.22.10.crate) = 78701
 SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
 SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
 SHA256 (rust/crates/event-listener-3.1.0.crate) = d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2
 SIZE (rust/crates/event-listener-3.1.0.crate) = 38793
 SHA256 (rust/crates/event-listener-4.0.3.crate) = 67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e
 SIZE (rust/crates/event-listener-4.0.3.crate) = 39784
-SHA256 (rust/crates/event-listener-5.1.0.crate) = b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27
-SIZE (rust/crates/event-listener-5.1.0.crate) = 40193
+SHA256 (rust/crates/event-listener-5.3.1.crate) = 6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba
+SIZE (rust/crates/event-listener-5.3.1.crate) = 42576
 SHA256 (rust/crates/event-listener-strategy-0.4.0.crate) = 958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3
 SIZE (rust/crates/event-listener-strategy-0.4.0.crate) = 10225
-SHA256 (rust/crates/event-listener-strategy-0.5.0.crate) = feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291
-SIZE (rust/crates/event-listener-strategy-0.5.0.crate) = 10616
-SHA256 (rust/crates/exr-1.6.4.crate) = 279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56
-SIZE (rust/crates/exr-1.6.4.crate) = 242605
+SHA256 (rust/crates/event-listener-strategy-0.5.2.crate) = 0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1
+SIZE (rust/crates/event-listener-strategy-0.5.2.crate) = 10697
+SHA256 (rust/crates/exr-1.72.0.crate) = 887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4
+SIZE (rust/crates/exr-1.72.0.crate) = 243996
 SHA256 (rust/crates/fast-srgb8-1.0.0.crate) = dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1
 SIZE (rust/crates/fast-srgb8-1.0.0.crate) = 17214
 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
 SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
-SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
-SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a
+SIZE (rust/crates/fastrand-2.1.0.crate) = 14907
 SHA256 (rust/crates/fdeflate-0.3.4.crate) = 4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645
 SIZE (rust/crates/fdeflate-0.3.4.crate) = 25001
 SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
 SIZE (rust/crates/filetime-0.2.23.crate) = 14942
 SHA256 (rust/crates/find-crate-0.6.3.crate) = 59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2
 SIZE (rust/crates/find-crate-0.6.3.crate) = 12092
-SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
-SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
+SIZE (rust/crates/flate2-1.0.30.crate) = 75511
 SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
 SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
 SHA256 (rust/crates/float_next_after-1.0.0.crate) = 8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8
 SIZE (rust/crates/float_next_after-1.0.0.crate) = 6965
-SHA256 (rust/crates/fluent-0.16.0.crate) = 61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7
-SIZE (rust/crates/fluent-0.16.0.crate) = 8321
-SHA256 (rust/crates/fluent-bundle-0.15.2.crate) = e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd
-SIZE (rust/crates/fluent-bundle-0.15.2.crate) = 32239
+SHA256 (rust/crates/fluent-0.16.1.crate) = bb74634707bebd0ce645a981148e8fb8c7bccd4c33c652aeffd28bf2f96d555a
+SIZE (rust/crates/fluent-0.16.1.crate) = 8323
+SHA256 (rust/crates/fluent-bundle-0.15.3.crate) = 7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493
+SIZE (rust/crates/fluent-bundle-0.15.3.crate) = 34507
 SHA256 (rust/crates/fluent-langneg-0.13.0.crate) = 2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94
 SIZE (rust/crates/fluent-langneg-0.13.0.crate) = 11723
-SHA256 (rust/crates/fluent-syntax-0.11.0.crate) = c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78
-SIZE (rust/crates/fluent-syntax-0.11.0.crate) = 28524
-SHA256 (rust/crates/flume-0.10.14.crate) = 1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577
-SIZE (rust/crates/flume-0.10.14.crate) = 65389
+SHA256 (rust/crates/fluent-syntax-0.11.1.crate) = 2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d
+SIZE (rust/crates/fluent-syntax-0.11.1.crate) = 32297
+SHA256 (rust/crates/flume-0.11.0.crate) = 55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181
+SIZE (rust/crates/flume-0.11.0.crate) = 67502
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
-SHA256 (rust/crates/font-types-0.4.3.crate) = 5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b
-SIZE (rust/crates/font-types-0.4.3.crate) = 21669
-SHA256 (rust/crates/fontconfig-parser-0.5.3.crate) = 674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4
-SIZE (rust/crates/fontconfig-parser-0.5.3.crate) = 38070
-SHA256 (rust/crates/fontdb-0.16.0.crate) = 98b88c54a38407f7352dd2c4238830115a6377741098ffd1f997c813d0e088a6
-SIZE (rust/crates/fontdb-0.16.0.crate) = 107295
+SHA256 (rust/crates/font-types-0.5.5.crate) = 34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29
+SIZE (rust/crates/font-types-0.5.5.crate) = 22496
+SHA256 (rust/crates/fontconfig-parser-0.5.6.crate) = 6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d
+SIZE (rust/crates/fontconfig-parser-0.5.6.crate) = 39300
+SHA256 (rust/crates/fontdb-0.16.2.crate) = b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3
+SIZE (rust/crates/fontdb-0.16.2.crate) = 107447
 SHA256 (rust/crates/foreign-types-0.5.0.crate) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965
 SIZE (rust/crates/foreign-types-0.5.0.crate) = 7824
 SHA256 (rust/crates/foreign-types-macros-0.2.3.crate) = 1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742
@@ -347,8 +361,8 @@ SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b22
 SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
 SHA256 (rust/crates/futures-lite-1.13.0.crate) = 49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce
 SIZE (rust/crates/futures-lite-1.13.0.crate) = 37058
-SHA256 (rust/crates/futures-lite-2.2.0.crate) = 445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba
-SIZE (rust/crates/futures-lite-2.2.0.crate) = 38029
+SHA256 (rust/crates/futures-lite-2.3.0.crate) = 52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5
+SIZE (rust/crates/futures-lite-2.3.0.crate) = 39181
 SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
 SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
 SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
@@ -357,22 +371,24 @@ SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf3
 SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
 SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
 SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
-SHA256 (rust/crates/gbm-0.14.2.crate) = 313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844
-SIZE (rust/crates/gbm-0.14.2.crate) = 12124
+SHA256 (rust/crates/gbm-0.15.0.crate) = 45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a
+SIZE (rust/crates/gbm-0.15.0.crate) = 12320
 SHA256 (rust/crates/gbm-sys-0.3.0.crate) = 6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58
 SIZE (rust/crates/gbm-sys-0.3.0.crate) = 7603
-SHA256 (rust/crates/generator-0.7.5.crate) = 5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e
-SIZE (rust/crates/generator-0.7.5.crate) = 29947
+SHA256 (rust/crates/generator-0.8.1.crate) = 186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb
+SIZE (rust/crates/generator-0.8.1.crate) = 33739
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
 SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
 SIZE (rust/crates/gethostname-0.4.3.crate) = 9336
-SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
-SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
 SHA256 (rust/crates/gif-0.12.0.crate) = 80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045
 SIZE (rust/crates/gif-0.12.0.crate) = 634734
-SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
-SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/gif-0.13.1.crate) = 3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2
+SIZE (rust/crates/gif-0.13.1.crate) = 36408
+SHA256 (rust/crates/gimli-0.29.0.crate) = 40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd
+SIZE (rust/crates/gimli-0.29.0.crate) = 275756
 SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d
 SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330
 SHA256 (rust/crates/glam-0.24.2.crate) = b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945
@@ -397,16 +413,16 @@ SHA256 (rust/crates/grid-0.11.0.crate) = 1df00eed8d1f0db937f6be10e46e8072b0671ac
 SIZE (rust/crates/grid-0.11.0.crate) = 14044
 SHA256 (rust/crates/guillotiere-0.6.2.crate) = b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782
 SIZE (rust/crates/guillotiere-0.6.2.crate) = 18116
-SHA256 (rust/crates/half-2.3.1.crate) = bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872
-SIZE (rust/crates/half-2.3.1.crate) = 50257
-SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
-SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
+SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
 SHA256 (rust/crates/hassle-rs-0.11.0.crate) = af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890
 SIZE (rust/crates/hassle-rs-0.11.0.crate) = 27178
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
-SHA256 (rust/crates/hermit-abi-0.3.4.crate) = 5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f
-SIZE (rust/crates/hermit-abi-0.3.4.crate) = 14445
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
 SIZE (rust/crates/hex-0.4.3.crate) = 13299
 SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df
@@ -427,20 +443,18 @@ SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c0872
 SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
 SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
 SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
-SHA256 (rust/crates/icrate-0.0.4.crate) = 99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319
-SIZE (rust/crates/icrate-0.0.4.crate) = 1040120
 SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
 SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
 SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
 SIZE (rust/crates/idna-0.5.0.crate) = 271940
-SHA256 (rust/crates/image-0.24.8.crate) = 034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23
-SIZE (rust/crates/image-0.24.8.crate) = 9271035
+SHA256 (rust/crates/image-0.24.9.crate) = 5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d
+SIZE (rust/crates/image-0.24.9.crate) = 9261055
 SHA256 (rust/crates/imagesize-0.10.1.crate) = df19da1e92fbfec043ca97d622955381b1f3ee72a180ec999912df31b1ccd951
 SIZE (rust/crates/imagesize-0.10.1.crate) = 11439
 SHA256 (rust/crates/imagesize-0.12.0.crate) = 029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284
 SIZE (rust/crates/imagesize-0.12.0.crate) = 15747
-SHA256 (rust/crates/indexmap-2.1.0.crate) = d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f
-SIZE (rust/crates/indexmap-2.1.0.crate) = 68224
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
 SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
 SIZE (rust/crates/inotify-0.9.6.crate) = 22971
 SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
@@ -449,28 +463,28 @@ SHA256 (rust/crates/input-0.9.0.crate) = 7911ce3db9c10c5ab4a35c49af778a5f9a827bd
 SIZE (rust/crates/input-0.9.0.crate) = 40668
 SHA256 (rust/crates/input-sys-1.18.0.crate) = bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0
 SIZE (rust/crates/input-sys-1.18.0.crate) = 365567
-SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
-SIZE (rust/crates/instant-0.1.12.crate) = 6128
-SHA256 (rust/crates/intl-memoizer-0.5.1.crate) = c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f
-SIZE (rust/crates/intl-memoizer-0.5.1.crate) = 8292
+SHA256 (rust/crates/instant-0.1.13.crate) = e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222
+SIZE (rust/crates/instant-0.1.13.crate) = 6305
+SHA256 (rust/crates/intl-memoizer-0.5.2.crate) = fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda
+SIZE (rust/crates/intl-memoizer-0.5.2.crate) = 11708
 SHA256 (rust/crates/intl_pluralrules-7.0.2.crate) = 078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972
 SIZE (rust/crates/intl_pluralrules-7.0.2.crate) = 9201
 SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
 SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
 SHA256 (rust/crates/io-lifetimes-2.0.3.crate) = 5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c
 SIZE (rust/crates/io-lifetimes-2.0.3.crate) = 29216
-SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
-SIZE (rust/crates/itoa-1.0.10.crate) = 10534
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
 SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97
 SIZE (rust/crates/jni-0.21.1.crate) = 105028
 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
 SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
-SHA256 (rust/crates/jobserver-0.1.27.crate) = 8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d
-SIZE (rust/crates/jobserver-0.1.27.crate) = 24774
+SHA256 (rust/crates/jobserver-0.1.31.crate) = d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e
+SIZE (rust/crates/jobserver-0.1.31.crate) = 27306
 SHA256 (rust/crates/jpeg-decoder-0.3.1.crate) = f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0
 SIZE (rust/crates/jpeg-decoder-0.3.1.crate) = 744364
-SHA256 (rust/crates/js-sys-0.3.67.crate) = 9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1
-SIZE (rust/crates/js-sys-0.3.67.crate) = 80764
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
 SHA256 (rust/crates/kamadak-exif-0.5.5.crate) = ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077
 SIZE (rust/crates/kamadak-exif-0.5.5.crate) = 54457
 SHA256 (rust/crates/keyframe-1.1.1.crate) = 60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9
@@ -493,18 +507,18 @@ SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832a
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
 SHA256 (rust/crates/lebe-0.5.2.crate) = 03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8
 SIZE (rust/crates/lebe-0.5.2.crate) = 8422
-SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
-SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
 SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
 SIZE (rust/crates/libloading-0.7.4.crate) = 27580
-SHA256 (rust/crates/libloading-0.8.1.crate) = c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161
-SIZE (rust/crates/libloading-0.8.1.crate) = 27893
+SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
+SIZE (rust/crates/libloading-0.8.3.crate) = 28480
 SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
 SIZE (rust/crates/libm-0.2.8.crate) = 113450
-SHA256 (rust/crates/libredox-0.0.1.crate) = 85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8
-SIZE (rust/crates/libredox-0.0.1.crate) = 4212
 SHA256 (rust/crates/libredox-0.0.2.crate) = 3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607
 SIZE (rust/crates/libredox-0.0.2.crate) = 4538
+SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
+SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/libseat-0.2.1.crate) = 54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e
 SIZE (rust/crates/libseat-0.2.1.crate) = 6620
 SHA256 (rust/crates/libseat-sys-0.1.7.crate) = 3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34
@@ -515,48 +529,48 @@ SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519
 SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776
-SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
-SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
+SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
 SHA256 (rust/crates/linux-raw-sys-0.6.4.crate) = f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4
 SIZE (rust/crates/linux-raw-sys-0.6.4.crate) = 1505350
 SHA256 (rust/crates/locale_config-0.3.0.crate) = 08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934
 SIZE (rust/crates/locale_config-0.3.0.crate) = 20808
-SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
-SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
-SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
-SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/lock_api-0.4.12.crate) = 07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17
+SIZE (rust/crates/lock_api-0.4.12.crate) = 27591
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
 SHA256 (rust/crates/log-panics-2.1.0.crate) = 68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f
 SIZE (rust/crates/log-panics-2.1.0.crate) = 9464
-SHA256 (rust/crates/loom-0.7.1.crate) = 7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175
-SIZE (rust/crates/loom-0.7.1.crate) = 73744
-SHA256 (rust/crates/lru-0.12.1.crate) = 2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7
-SIZE (rust/crates/lru-0.12.1.crate) = 14583
+SHA256 (rust/crates/loom-0.7.2.crate) = 419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca
+SIZE (rust/crates/loom-0.7.2.crate) = 73989
+SHA256 (rust/crates/lru-0.12.3.crate) = d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc
+SIZE (rust/crates/lru-0.12.3.crate) = 15009
 SHA256 (rust/crates/lyon-1.0.1.crate) = 91e7f9cda98b5430809e63ca5197b06c7d191bf7e26dfc467d5a3f0290e2a74f
 SIZE (rust/crates/lyon-1.0.1.crate) = 3837
 SHA256 (rust/crates/lyon_algorithms-1.0.4.crate) = a3bca95f9a4955b3e4a821fbbcd5edfbd9be2a9a50bb5758173e5358bfb4c623
 SIZE (rust/crates/lyon_algorithms-1.0.4.crate) = 31806
 SHA256 (rust/crates/lyon_geom-1.0.5.crate) = edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9
 SIZE (rust/crates/lyon_geom-1.0.5.crate) = 52658
-SHA256 (rust/crates/lyon_path-1.0.4.crate) = ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45
-SIZE (rust/crates/lyon_path-1.0.4.crate) = 35616
-SHA256 (rust/crates/lyon_tessellation-1.0.13.crate) = 8c7c67b5bc8123b352b2e7e742b47d1f236a13fe77619433be9568fbd888e9c0
-SIZE (rust/crates/lyon_tessellation-1.0.13.crate) = 183135
+SHA256 (rust/crates/lyon_path-1.0.5.crate) = 9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7
+SIZE (rust/crates/lyon_path-1.0.5.crate) = 35704
+SHA256 (rust/crates/lyon_tessellation-1.0.15.crate) = 579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c
+SIZE (rust/crates/lyon_tessellation-1.0.15.crate) = 183620
 SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
 SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
-SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149
-SIZE (rust/crates/memchr-2.7.1.crate) = 96307
+SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
+SIZE (rust/crates/memchr-2.7.2.crate) = 96220
 SHA256 (rust/crates/memmap2-0.8.0.crate) = 43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed
 SIZE (rust/crates/memmap2-0.8.0.crate) = 30990
-SHA256 (rust/crates/memmap2-0.9.3.crate) = 45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92
-SIZE (rust/crates/memmap2-0.9.3.crate) = 33125
+SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
+SIZE (rust/crates/memmap2-0.9.4.crate) = 32752
 SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
 SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
 SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
 SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
-SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
-SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
+SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
 SHA256 (rust/crates/metal-0.27.0.crate) = c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25
 SIZE (rust/crates/metal-0.27.0.crate) = 3028990
 SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
@@ -565,22 +579,20 @@ SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4
 SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7
-SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
+SHA256 (rust/crates/miniz_oxide-0.7.3.crate) = 87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae
+SIZE (rust/crates/miniz_oxide-0.7.3.crate) = 55774
 SHA256 (rust/crates/mint-0.5.9.crate) = e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff
 SIZE (rust/crates/mint-0.5.9.crate) = 8399
-SHA256 (rust/crates/mio-0.8.10.crate) = 8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09
-SIZE (rust/crates/mio-0.8.10.crate) = 102345
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
 SHA256 (rust/crates/mutate_once-0.1.1.crate) = 16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b
 SIZE (rust/crates/mutate_once-0.1.1.crate) = 4276
-SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
-SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
-SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7
-SIZE (rust/crates/ndk-0.8.0.crate) = 79770
+SHA256 (rust/crates/ndk-0.9.0.crate) = c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4
+SIZE (rust/crates/ndk-0.9.0.crate) = 84865
 SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b
 SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205
-SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691
-SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233
+SHA256 (rust/crates/ndk-sys-0.6.0+11769913.crate) = ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873
+SIZE (rust/crates/ndk-sys-0.6.0+11769913.crate) = 329984
 SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
 SIZE (rust/crates/nix-0.26.4.crate) = 279099
 SHA256 (rust/crates/nix-0.27.1.crate) = 2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053
@@ -593,44 +605,74 @@ SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e
 SIZE (rust/crates/notify-6.1.1.crate) = 40117
 SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
-SHA256 (rust/crates/num-0.4.1.crate) = b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af
-SIZE (rust/crates/num-0.4.1.crate) = 9522
-SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
-SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
-SHA256 (rust/crates/num-complex-0.4.4.crate) = 1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214
-SIZE (rust/crates/num-complex-0.4.4.crate) = 29564
-SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
-SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
-SHA256 (rust/crates/num-iter-0.1.43.crate) = 7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252
-SIZE (rust/crates/num-iter-0.1.43.crate) = 10655
-SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0
-SIZE (rust/crates/num-rational-0.4.1.crate) = 27889
-SHA256 (rust/crates/num-traits-0.2.17.crate) = 39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c
-SIZE (rust/crates/num-traits-0.2.17.crate) = 50190
+SHA256 (rust/crates/num-0.4.3.crate) = 35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23
+SIZE (rust/crates/num-0.4.3.crate) = 9575
+SHA256 (rust/crates/num-bigint-0.4.5.crate) = c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7
+SIZE (rust/crates/num-bigint-0.4.5.crate) = 102281
+SHA256 (rust/crates/num-complex-0.4.6.crate) = 73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495
+SIZE (rust/crates/num-complex-0.4.6.crate) = 30352
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-iter-0.1.45.crate) = 1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf
+SIZE (rust/crates/num-iter-0.1.45.crate) = 10320
+SHA256 (rust/crates/num-rational-0.4.2.crate) = f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824
+SIZE (rust/crates/num-rational-0.4.2.crate) = 28159
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
 SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
 SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
 SHA256 (rust/crates/num_enum-0.7.2.crate) = 02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845
 SIZE (rust/crates/num_enum-0.7.2.crate) = 18571
 SHA256 (rust/crates/num_enum_derive-0.7.2.crate) = 681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b
 SIZE (rust/crates/num_enum_derive-0.7.2.crate) = 17090
-SHA256 (rust/crates/num_threads-0.1.6.crate) = 2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44
-SIZE (rust/crates/num_threads-0.1.6.crate) = 7334
+SHA256 (rust/crates/num_threads-0.1.7.crate) = 5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9
+SIZE (rust/crates/num_threads-0.1.7.crate) = 7455
 SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1
 SIZE (rust/crates/objc-0.2.7.crate) = 22036
 SHA256 (rust/crates/objc-foundation-0.1.1.crate) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9
 SIZE (rust/crates/objc-foundation-0.1.1.crate) = 9063
-SHA256 (rust/crates/objc-sys-0.3.2.crate) = c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459
-SIZE (rust/crates/objc-sys-0.3.2.crate) = 19647
-SHA256 (rust/crates/objc2-0.4.1.crate) = 559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d
-SIZE (rust/crates/objc2-0.4.1.crate) = 162783
-SHA256 (rust/crates/objc2-encode-3.0.0.crate) = d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666
-SIZE (rust/crates/objc2-encode-3.0.0.crate) = 17934
+SHA256 (rust/crates/objc-sys-0.3.5.crate) = cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310
+SIZE (rust/crates/objc-sys-0.3.5.crate) = 20560
+SHA256 (rust/crates/objc2-0.5.2.crate) = 46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804
+SIZE (rust/crates/objc2-0.5.2.crate) = 199204
+SHA256 (rust/crates/objc2-app-kit-0.2.2.crate) = e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff
+SIZE (rust/crates/objc2-app-kit-0.2.2.crate) = 337435
+SHA256 (rust/crates/objc2-cloud-kit-0.2.2.crate) = 74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009
+SIZE (rust/crates/objc2-cloud-kit-0.2.2.crate) = 27094
+SHA256 (rust/crates/objc2-contacts-0.2.2.crate) = a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889
+SIZE (rust/crates/objc2-contacts-0.2.2.crate) = 17094
+SHA256 (rust/crates/objc2-core-data-0.2.2.crate) = 617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef
+SIZE (rust/crates/objc2-core-data-0.2.2.crate) = 30575
+SHA256 (rust/crates/objc2-core-image-0.2.2.crate) = 55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80
+SIZE (rust/crates/objc2-core-image-0.2.2.crate) = 20050
+SHA256 (rust/crates/objc2-core-location-0.2.2.crate) = 000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781
+SIZE (rust/crates/objc2-core-location-0.2.2.crate) = 13100
+SHA256 (rust/crates/objc2-encode-4.0.3.crate) = 7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8
+SIZE (rust/crates/objc2-encode-4.0.3.crate) = 19478
+SHA256 (rust/crates/objc2-foundation-0.2.2.crate) = 0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8
+SIZE (rust/crates/objc2-foundation-0.2.2.crate) = 249330
+SHA256 (rust/crates/objc2-link-presentation-0.2.2.crate) = a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398
+SIZE (rust/crates/objc2-link-presentation-0.2.2.crate) = 4440
+SHA256 (rust/crates/objc2-metal-0.2.2.crate) = dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6
+SIZE (rust/crates/objc2-metal-0.2.2.crate) = 75276
+SHA256 (rust/crates/objc2-quartz-core-0.2.2.crate) = e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a
+SIZE (rust/crates/objc2-quartz-core-0.2.2.crate) = 21306
+SHA256 (rust/crates/objc2-symbols-0.2.2.crate) = 0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc
+SIZE (rust/crates/objc2-symbols-0.2.2.crate) = 3626
+SHA256 (rust/crates/objc2-ui-kit-0.2.2.crate) = b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f
+SIZE (rust/crates/objc2-ui-kit-0.2.2.crate) = 303111
+SHA256 (rust/crates/objc2-uniform-type-identifiers-0.2.2.crate) = 44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe
+SIZE (rust/crates/objc2-uniform-type-identifiers-0.2.2.crate) = 6017
+SHA256 (rust/crates/objc2-user-notifications-0.2.2.crate) = 76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3
+SIZE (rust/crates/objc2-user-notifications-0.2.2.crate) = 9600
 SHA256 (rust/crates/objc_exception-0.1.2.crate) = ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4
 SIZE (rust/crates/objc_exception-0.1.2.crate) = 2251
 SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b
 SIZE (rust/crates/objc_id-0.1.1.crate) = 3258
-SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
-SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object-0.35.0.crate) = b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e
+SIZE (rust/crates/object-0.35.0.crate) = 317792
 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
 SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
 SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d
@@ -639,8 +681,8 @@ SHA256 (rust/crates/orbclient-0.3.47.crate) = 52f0d54bde9774d3a51dcf281a5def240c
 SIZE (rust/crates/orbclient-0.3.47.crate) = 1324509
 SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
 SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
-SHA256 (rust/crates/ordered-multimap-0.7.1.crate) = a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f
-SIZE (rust/crates/ordered-multimap-0.7.1.crate) = 23144
+SHA256 (rust/crates/ordered-multimap-0.7.3.crate) = 49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79
+SIZE (rust/crates/ordered-multimap-0.7.3.crate) = 23265
 SHA256 (rust/crates/ordered-stream-0.2.0.crate) = 9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50
 SIZE (rust/crates/ordered-stream-0.2.0.crate) = 19077
 SHA256 (rust/crates/ouroboros-0.17.2.crate) = e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954
@@ -649,24 +691,24 @@ SHA256 (rust/crates/ouroboros_macro-0.17.2.crate) = ec4c6225c69b4ca778c0aea09732
 SIZE (rust/crates/ouroboros_macro-0.17.2.crate) = 21532
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
-SHA256 (rust/crates/owned_ttf_parser-0.20.0.crate) = d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7
-SIZE (rust/crates/owned_ttf_parser-0.20.0.crate) = 150890
-SHA256 (rust/crates/palette-0.7.3.crate) = b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc
-SIZE (rust/crates/palette-0.7.3.crate) = 208590
-SHA256 (rust/crates/palette_derive-0.7.3.crate) = b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a
-SIZE (rust/crates/palette_derive-0.7.3.crate) = 14344
+SHA256 (rust/crates/owned_ttf_parser-0.21.0.crate) = 6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5
+SIZE (rust/crates/owned_ttf_parser-0.21.0.crate) = 150905
+SHA256 (rust/crates/palette-0.7.6.crate) = 4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6
+SIZE (rust/crates/palette-0.7.6.crate) = 230913
+SHA256 (rust/crates/palette_derive-0.7.6.crate) = f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30
+SIZE (rust/crates/palette_derive-0.7.6.crate) = 17073
 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
 SIZE (rust/crates/parking-2.2.0.crate) = 9730
 SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
 SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
-SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
-SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot-0.12.3.crate) = f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27
+SIZE (rust/crates/parking_lot-0.12.3.crate) = 41860
 SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc
 SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567
-SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
-SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
-SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
-SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/parking_lot_core-0.9.10.crate) = 1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8
+SIZE (rust/crates/parking_lot_core-0.9.10.crate) = 32406
+SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
+SIZE (rust/crates/paste-1.0.15.crate) = 18374
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
 SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
@@ -679,28 +721,28 @@ SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162
 SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
 SHA256 (rust/crates/pico-args-0.5.0.crate) = 5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315
 SIZE (rust/crates/pico-args-0.5.0.crate) = 11545
-SHA256 (rust/crates/pin-project-1.1.3.crate) = fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422
-SIZE (rust/crates/pin-project-1.1.3.crate) = 57740
-SHA256 (rust/crates/pin-project-internal-1.1.3.crate) = 4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405
-SIZE (rust/crates/pin-project-internal-1.1.3.crate) = 27824
-SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
-SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3
+SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
+SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
+SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
-SHA256 (rust/crates/piper-0.2.1.crate) = 668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4
-SIZE (rust/crates/piper-0.2.1.crate) = 15878
+SHA256 (rust/crates/piper-0.2.2.crate) = 464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf
+SIZE (rust/crates/piper-0.2.2.crate) = 15897
 SHA256 (rust/crates/pixman-0.1.0.crate) = d24a24da0bec14f4e43a495c1837a3c358b87532e7fe66bd75c348b89f0451b6
 SIZE (rust/crates/pixman-0.1.0.crate) = 23899
 SHA256 (rust/crates/pixman-sys-0.1.0.crate) = a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada
 SIZE (rust/crates/pixman-sys-0.1.0.crate) = 6044
-SHA256 (rust/crates/pkg-config-0.3.29.crate) = 2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb
-SIZE (rust/crates/pkg-config-0.3.29.crate) = 20563
-SHA256 (rust/crates/png-0.17.11.crate) = 1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a
-SIZE (rust/crates/png-0.17.11.crate) = 98834
+SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
+SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/png-0.17.13.crate) = 06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1
+SIZE (rust/crates/png-0.17.13.crate) = 103176
 SHA256 (rust/crates/polling-2.8.0.crate) = 4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce
 SIZE (rust/crates/polling-2.8.0.crate) = 43554
-SHA256 (rust/crates/polling-3.3.2.crate) = 545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41
-SIZE (rust/crates/polling-3.3.2.crate) = 54814
+SHA256 (rust/crates/polling-3.7.0.crate) = 645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3
+SIZE (rust/crates/polling-3.7.0.crate) = 58381
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
@@ -709,24 +751,22 @@ SHA256 (rust/crates/presser-0.3.1.crate) = e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b
 SIZE (rust/crates/presser-0.3.1.crate) = 20946
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
-SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
-SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
 SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
 SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.76.crate) = 95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c
-SIZE (rust/crates/proc-macro2-1.0.76.crate) = 45660
+SHA256 (rust/crates/proc-macro2-1.0.84.crate) = ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6
+SIZE (rust/crates/proc-macro2-1.0.84.crate) = 48922
 SHA256 (rust/crates/profiling-1.0.15.crate) = 43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58
 SIZE (rust/crates/profiling-1.0.15.crate) = 14255
 SHA256 (rust/crates/profiling-procmacros-1.0.15.crate) = 8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd
 SIZE (rust/crates/profiling-procmacros-1.0.15.crate) = 5956
 SHA256 (rust/crates/qoi-0.4.1.crate) = 7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001
 SIZE (rust/crates/qoi-0.4.1.crate) = 71135
-SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956
-SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923
-SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
-SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
+SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
@@ -735,40 +775,38 @@ SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9ba
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
 SHA256 (rust/crates/range-alloc-0.1.3.crate) = 9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab
 SIZE (rust/crates/range-alloc-0.1.3.crate) = 7664
-SHA256 (rust/crates/rangemap-1.4.0.crate) = 977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991
-SIZE (rust/crates/rangemap-1.4.0.crate) = 45931
-SHA256 (rust/crates/raw-window-handle-0.6.0.crate) = 42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544
-SIZE (rust/crates/raw-window-handle-0.6.0.crate) = 17224
-SHA256 (rust/crates/rayon-1.8.1.crate) = fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051
-SIZE (rust/crates/rayon-1.8.1.crate) = 170448
+SHA256 (rust/crates/rangemap-1.5.1.crate) = f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684
+SIZE (rust/crates/rangemap-1.5.1.crate) = 57091
+SHA256 (rust/crates/raw-window-handle-0.6.2.crate) = 20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539
+SIZE (rust/crates/raw-window-handle-0.6.2.crate) = 20234
+SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
+SIZE (rust/crates/rayon-1.10.0.crate) = 180155
 SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
 SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
 SHA256 (rust/crates/rctree-0.5.0.crate) = 3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f
 SIZE (rust/crates/rctree-0.5.0.crate) = 8298
-SHA256 (rust/crates/read-fonts-0.16.0.crate) = 81c524658d3b77930a391f559756d91dbe829ab6cf4687083f615d395df99722
-SIZE (rust/crates/read-fonts-0.16.0.crate) = 236418
+SHA256 (rust/crates/read-fonts-0.19.3.crate) = e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d
+SIZE (rust/crates/read-fonts-0.19.3.crate) = 243143
 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
 SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
-SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
-SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
 SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
 SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/redox_users-0.4.4.crate) = a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4
-SIZE (rust/crates/redox_users-0.4.4.crate) = 15438
-SHA256 (rust/crates/regex-1.10.2.crate) = 380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343
-SIZE (rust/crates/regex-1.10.2.crate) = 252839
+SHA256 (rust/crates/redox_syscall-0.5.1.crate) = 469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e
+SIZE (rust/crates/redox_syscall-0.5.1.crate) = 22536
+SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
+SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
+SIZE (rust/crates/regex-1.10.4.crate) = 253191
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
-SHA256 (rust/crates/regex-automata-0.4.3.crate) = 5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f
-SIZE (rust/crates/regex-automata-0.4.3.crate) = 617011
+SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
+SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
-SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
-SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
-SHA256 (rust/crates/renderdoc-0.11.0.crate) = 272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12
-SIZE (rust/crates/renderdoc-0.11.0.crate) = 41192
-SHA256 (rust/crates/renderdoc-sys-1.0.0.crate) = 216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b
-SIZE (rust/crates/renderdoc-sys-1.0.0.crate) = 10336
+SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
+SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/renderdoc-sys-1.1.0.crate) = 19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832
+SIZE (rust/crates/renderdoc-sys-1.1.0.crate) = 10366
 SHA256 (rust/crates/resvg-0.28.0.crate) = c115863f2d3621999cf187e318bc92b16402dfeff6a48c74df700d77381394c1
 SIZE (rust/crates/resvg-0.28.0.crate) = 94137
 SHA256 (rust/crates/resvg-0.37.0.crate) = cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4
@@ -779,32 +817,32 @@ SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c610
 SIZE (rust/crates/ron-0.8.1.crate) = 63251
 SHA256 (rust/crates/roxmltree-0.15.1.crate) = 6b9de9831a129b122e7e61f242db509fa9d0838008bf0b29bb0624669edfe48a
 SIZE (rust/crates/roxmltree-0.15.1.crate) = 39078
-SHA256 (rust/crates/roxmltree-0.18.1.crate) = 862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302
-SIZE (rust/crates/roxmltree-0.18.1.crate) = 43040
 SHA256 (rust/crates/roxmltree-0.19.0.crate) = 3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f
 SIZE (rust/crates/roxmltree-0.19.0.crate) = 53547
-SHA256 (rust/crates/rust-embed-8.2.0.crate) = a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f
-SIZE (rust/crates/rust-embed-8.2.0.crate) = 902163
-SHA256 (rust/crates/rust-embed-impl-8.2.0.crate) = 6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16
-SIZE (rust/crates/rust-embed-impl-8.2.0.crate) = 5374
-SHA256 (rust/crates/rust-embed-utils-8.2.0.crate) = 8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665
-SIZE (rust/crates/rust-embed-utils-8.2.0.crate) = 3397
+SHA256 (rust/crates/rust-embed-8.4.0.crate) = 19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a
+SIZE (rust/crates/rust-embed-8.4.0.crate) = 903547
+SHA256 (rust/crates/rust-embed-impl-8.4.0.crate) = cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4
+SIZE (rust/crates/rust-embed-impl-8.4.0.crate) = 5927
+SHA256 (rust/crates/rust-embed-utils-8.4.0.crate) = 38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32
+SIZE (rust/crates/rust-embed-utils-8.4.0.crate) = 3446
 SHA256 (rust/crates/rust-ini-0.20.0.crate) = 3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a
 SIZE (rust/crates/rust-ini-0.20.0.crate) = 18419
-SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
-SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustc-demangle-0.1.24.crate) = 719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f
+SIZE (rust/crates/rustc-demangle-0.1.24.crate) = 29047
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustix-0.37.27.crate) = fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2
 SIZE (rust/crates/rustix-0.37.27.crate) = 324534
-SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
-SIZE (rust/crates/rustix-0.38.32.crate) = 376999
-SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4
-SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
+SHA256 (rust/crates/rustix-0.38.34.crate) = 70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f
+SIZE (rust/crates/rustix-0.38.34.crate) = 365160
+SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
+SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
 SHA256 (rust/crates/rustybuzz-0.12.1.crate) = f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c
 SIZE (rust/crates/rustybuzz-0.12.1.crate) = 242589
-SHA256 (rust/crates/ryu-1.0.16.crate) = f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c
-SIZE (rust/crates/ryu-1.0.16.crate) = 47351
+SHA256 (rust/crates/rustybuzz-0.14.1.crate) = cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c
+SIZE (rust/crates/rustybuzz-0.14.1.crate) = 254743
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/sanitize-filename-0.5.0.crate) = 2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603
@@ -817,44 +855,48 @@ SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7
 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
 SHA256 (rust/crates/self_cell-0.10.3.crate) = e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d
 SIZE (rust/crates/self_cell-0.10.3.crate) = 7308
-SHA256 (rust/crates/self_cell-1.0.3.crate) = 58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba
-SIZE (rust/crates/self_cell-1.0.3.crate) = 15147
+SHA256 (rust/crates/self_cell-1.0.4.crate) = d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a
+SIZE (rust/crates/self_cell-1.0.4.crate) = 15220
 SHA256 (rust/crates/sendfd-0.4.3.crate) = 604b71b8fc267e13bb3023a2c901126c8f349393666a6d98ac1ae5729b701798
 SIZE (rust/crates/sendfd-0.4.3.crate) = 11120
-SHA256 (rust/crates/serde-1.0.195.crate) = 63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02
-SIZE (rust/crates/serde-1.0.195.crate) = 76856
-SHA256 (rust/crates/serde_derive-1.0.195.crate) = 46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c
-SIZE (rust/crates/serde_derive-1.0.195.crate) = 55687
-SHA256 (rust/crates/serde_json-1.0.111.crate) = 176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4
-SIZE (rust/crates/serde_json-1.0.111.crate) = 146447
-SHA256 (rust/crates/serde_repr-0.1.18.crate) = 0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb
-SIZE (rust/crates/serde_repr-0.1.18.crate) = 9974
-SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
-SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/serde-1.0.203.crate) = 7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094
+SIZE (rust/crates/serde-1.0.203.crate) = 77935
+SHA256 (rust/crates/serde_derive-1.0.203.crate) = 500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba
+SIZE (rust/crates/serde_derive-1.0.203.crate) = 55867
+SHA256 (rust/crates/serde_json-1.0.117.crate) = 455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3
+SIZE (rust/crates/serde_json-1.0.117.crate) = 146921
+SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9
+SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
+SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
+SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
 SIZE (rust/crates/sha2-0.10.8.crate) = 26357
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
-SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
-SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
 SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
 SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
 SHA256 (rust/crates/simplecss-0.2.1.crate) = a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d
 SIZE (rust/crates/simplecss-0.2.1.crate) = 19418
 SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
 SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
+SHA256 (rust/crates/skrifa-0.19.3.crate) = 0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9
+SIZE (rust/crates/skrifa-0.19.3.crate) = 160387
 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
 SIZE (rust/crates/slab-0.4.9.crate) = 17108
 SHA256 (rust/crates/slotmap-1.0.7.crate) = dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a
 SIZE (rust/crates/slotmap-1.0.7.crate) = 61390
-SHA256 (rust/crates/smallvec-1.13.1.crate) = e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7
-SIZE (rust/crates/smallvec-1.13.1.crate) = 34952
-SHA256 (rust/crates/smithay-client-toolkit-0.18.0.crate) = 60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f
-SIZE (rust/crates/smithay-client-toolkit-0.18.0.crate) = 126729
-SHA256 (rust/crates/smol_str-0.2.1.crate) = e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49
-SIZE (rust/crates/smol_str-0.2.1.crate) = 14689
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/smithay-client-toolkit-0.18.1.crate) = 922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a
+SIZE (rust/crates/smithay-client-toolkit-0.18.1.crate) = 129920
+SHA256 (rust/crates/smithay-client-toolkit-0.19.1.crate) = 837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32
+SIZE (rust/crates/smithay-client-toolkit-0.19.1.crate) = 131384
+SHA256 (rust/crates/smol_str-0.2.2.crate) = dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead
+SIZE (rust/crates/smol_str-0.2.2.crate) = 15840
 SHA256 (rust/crates/snowflake-1.3.0.crate) = 27207bb65232eda1f588cf46db2fee75c0808d557f6b3cf19a75f5d6d7c94df1
 SIZE (rust/crates/snowflake-1.3.0.crate) = 8073
 SHA256 (rust/crates/socket2-0.4.10.crate) = 9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d
@@ -869,68 +911,70 @@ SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc
 SIZE (rust/crates/strict-num-0.1.1.crate) = 5104
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
 SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
 SIZE (rust/crates/subtle-2.5.0.crate) = 13909
-SHA256 (rust/crates/svg_fmt-0.4.1.crate) = 8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2
-SIZE (rust/crates/svg_fmt-0.4.1.crate) = 4052
+SHA256 (rust/crates/svg_fmt-0.4.3.crate) = 20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca
+SIZE (rust/crates/svg_fmt-0.4.3.crate) = 4206
 SHA256 (rust/crates/svgtypes-0.8.2.crate) = 22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564
 SIZE (rust/crates/svgtypes-0.8.2.crate) = 32694
 SHA256 (rust/crates/svgtypes-0.13.0.crate) = 6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70
 SIZE (rust/crates/svgtypes-0.13.0.crate) = 38095
-SHA256 (rust/crates/swash-0.1.13.crate) = 9af636fb90d39858650cae1088a37e2862dab4e874a0bb49d6dfb5b2dacf0e24
-SIZE (rust/crates/swash-0.1.13.crate) = 279873
+SHA256 (rust/crates/swash-0.1.17.crate) = 4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6
+SIZE (rust/crates/swash-0.1.17.crate) = 235646
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.48.crate) = 0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f
-SIZE (rust/crates/syn-2.0.48.crate) = 250566
+SHA256 (rust/crates/syn-2.0.66.crate) = c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5
+SIZE (rust/crates/syn-2.0.66.crate) = 264855
 SHA256 (rust/crates/sys-locale-0.3.1.crate) = e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0
 SIZE (rust/crates/sys-locale-0.3.1.crate) = 15681
-SHA256 (rust/crates/tempfile-3.9.0.crate) = 01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa
-SIZE (rust/crates/tempfile-3.9.0.crate) = 32182
+SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
+SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
 SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
 SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
-SHA256 (rust/crates/thiserror-1.0.56.crate) = d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad
-SIZE (rust/crates/thiserror-1.0.56.crate) = 20592
-SHA256 (rust/crates/thiserror-impl-1.0.56.crate) = fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471
-SIZE (rust/crates/thiserror-impl-1.0.56.crate) = 15367
-SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152
-SIZE (rust/crates/thread_local-1.1.7.crate) = 13585
+SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
+SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
+SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
+SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
+SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
+SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
 SHA256 (rust/crates/tiff-0.9.1.crate) = ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e
 SIZE (rust/crates/tiff-0.9.1.crate) = 1423953
-SHA256 (rust/crates/time-0.3.31.crate) = f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e
-SIZE (rust/crates/time-0.3.31.crate) = 121762
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
-SHA256 (rust/crates/time-macros-0.2.16.crate) = 26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f
-SIZE (rust/crates/time-macros-0.2.16.crate) = 24356
+SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
+SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
 SHA256 (rust/crates/tiny-keccak-2.0.2.crate) = 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237
 SIZE (rust/crates/tiny-keccak-2.0.2.crate) = 20129
 SHA256 (rust/crates/tiny-skia-0.8.4.crate) = df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67
 SIZE (rust/crates/tiny-skia-0.8.4.crate) = 193684
-SHA256 (rust/crates/tiny-skia-0.11.3.crate) = b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d
-SIZE (rust/crates/tiny-skia-0.11.3.crate) = 200744
+SHA256 (rust/crates/tiny-skia-0.11.4.crate) = 83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab
+SIZE (rust/crates/tiny-skia-0.11.4.crate) = 201082
 SHA256 (rust/crates/tiny-skia-path-0.8.4.crate) = adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c
 SIZE (rust/crates/tiny-skia-path-0.8.4.crate) = 45814
-SHA256 (rust/crates/tiny-skia-path-0.11.3.crate) = 5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541
-SIZE (rust/crates/tiny-skia-path-0.11.3.crate) = 47752
-SHA256 (rust/crates/tiny-xlib-0.2.2.crate) = d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d
-SIZE (rust/crates/tiny-xlib-0.2.2.crate) = 15775
-SHA256 (rust/crates/tinystr-0.7.5.crate) = 83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece
-SIZE (rust/crates/tinystr-0.7.5.crate) = 16366
+SHA256 (rust/crates/tiny-skia-path-0.11.4.crate) = 9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93
+SIZE (rust/crates/tiny-skia-path-0.11.4.crate) = 47764
+SHA256 (rust/crates/tiny-xlib-0.2.3.crate) = 1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c
+SIZE (rust/crates/tiny-xlib-0.2.3.crate) = 17498
+SHA256 (rust/crates/tinystr-0.7.6.crate) = 9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f
+SIZE (rust/crates/tinystr-0.7.6.crate) = 16971
 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
 SIZE (rust/crates/toml-0.5.11.crate) = 54910
-SHA256 (rust/crates/toml-0.8.8.crate) = a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35
-SIZE (rust/crates/toml-0.8.8.crate) = 50451
-SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
-SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml-0.8.13.crate) = a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba
+SIZE (rust/crates/toml-0.8.13.crate) = 50517
+SHA256 (rust/crates/toml_datetime-0.6.6.crate) = 4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf
+SIZE (rust/crates/toml_datetime-0.6.6.crate) = 11698
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
-SHA256 (rust/crates/toml_edit-0.21.0.crate) = d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03
-SIZE (rust/crates/toml_edit-0.21.0.crate) = 101265
+SHA256 (rust/crates/toml_edit-0.22.13.crate) = c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c
+SIZE (rust/crates/toml_edit-0.22.13.crate) = 103518
 SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
 SIZE (rust/crates/tracing-0.1.40.crate) = 79459
 SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
@@ -949,42 +993,48 @@ SHA256 (rust/crates/tracy-client-sys-0.22.2.crate) = 9d104d610dfa9dd154535102cc9
 SIZE (rust/crates/tracy-client-sys-0.22.2.crate) = 308267
 SHA256 (rust/crates/ttf-parser-0.20.0.crate) = 17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4
 SIZE (rust/crates/ttf-parser-0.20.0.crate) = 161769
-SHA256 (rust/crates/type-map-0.4.0.crate) = b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46
-SIZE (rust/crates/type-map-0.4.0.crate) = 3177
+SHA256 (rust/crates/ttf-parser-0.21.1.crate) = 2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8
+SIZE (rust/crates/ttf-parser-0.21.1.crate) = 194876
+SHA256 (rust/crates/type-map-0.5.0.crate) = deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f
+SIZE (rust/crates/type-map-0.5.0.crate) = 3464
 SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
 SIZE (rust/crates/typenum-1.17.0.crate) = 42849
 SHA256 (rust/crates/udev-0.8.0.crate) = 50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1
 SIZE (rust/crates/udev-0.8.0.crate) = 20532
 SHA256 (rust/crates/uds_windows-1.1.0.crate) = 89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9
 SIZE (rust/crates/uds_windows-1.1.0.crate) = 17040
-SHA256 (rust/crates/unic-langid-0.9.4.crate) = 238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516
-SIZE (rust/crates/unic-langid-0.9.4.crate) = 8850
-SHA256 (rust/crates/unic-langid-impl-0.9.4.crate) = 4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6
-SIZE (rust/crates/unic-langid-impl-0.9.4.crate) = 89401
+SHA256 (rust/crates/unic-langid-0.9.5.crate) = 23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44
+SIZE (rust/crates/unic-langid-0.9.5.crate) = 8898
+SHA256 (rust/crates/unic-langid-impl-0.9.5.crate) = 0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5
+SIZE (rust/crates/unic-langid-impl-0.9.5.crate) = 89659
 SHA256 (rust/crates/unicase-2.7.0.crate) = f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89
 SIZE (rust/crates/unicase-2.7.0.crate) = 23783
 SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
 SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
 SHA256 (rust/crates/unicode-bidi-mirroring-0.1.0.crate) = 56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694
 SIZE (rust/crates/unicode-bidi-mirroring-0.1.0.crate) = 8241
+SHA256 (rust/crates/unicode-bidi-mirroring-0.2.0.crate) = 23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86
+SIZE (rust/crates/unicode-bidi-mirroring-0.2.0.crate) = 8166
 SHA256 (rust/crates/unicode-ccc-0.1.2.crate) = cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1
 SIZE (rust/crates/unicode-ccc-0.1.2.crate) = 8848
+SHA256 (rust/crates/unicode-ccc-0.2.0.crate) = 1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656
+SIZE (rust/crates/unicode-ccc-0.2.0.crate) = 8872
 SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
 SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
 SHA256 (rust/crates/unicode-linebreak-0.1.5.crate) = 3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f
 SIZE (rust/crates/unicode-linebreak-0.1.5.crate) = 15324
-SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
-SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
+SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
 SHA256 (rust/crates/unicode-properties-0.1.1.crate) = e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291
 SIZE (rust/crates/unicode-properties-0.1.1.crate) = 41088
-SHA256 (rust/crates/unicode-script-0.5.5.crate) = 7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc
-SIZE (rust/crates/unicode-script-0.5.5.crate) = 43874
-SHA256 (rust/crates/unicode-segmentation-1.10.1.crate) = 1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36
-SIZE (rust/crates/unicode-segmentation-1.10.1.crate) = 98416
+SHA256 (rust/crates/unicode-script-0.5.6.crate) = ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd
+SIZE (rust/crates/unicode-script-0.5.6.crate) = 43993
+SHA256 (rust/crates/unicode-segmentation-1.11.0.crate) = d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202
+SIZE (rust/crates/unicode-segmentation-1.11.0.crate) = 102740
 SHA256 (rust/crates/unicode-vo-0.1.0.crate) = b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94
 SIZE (rust/crates/unicode-vo-0.1.0.crate) = 8084
-SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
-SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode-width-0.1.12.crate) = 68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6
+SIZE (rust/crates/unicode-width-0.1.12.crate) = 24062
 SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
 SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
 SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
@@ -999,78 +1049,88 @@ SHA256 (rust/crates/usvg-text-layout-0.37.0.crate) = d383a3965de199d7f96d4e11a44
 SIZE (rust/crates/usvg-text-layout-0.37.0.crate) = 21543
 SHA256 (rust/crates/usvg-tree-0.37.0.crate) = 8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3
 SIZE (rust/crates/usvg-tree-0.37.0.crate) = 20519
-SHA256 (rust/crates/uuid-1.7.0.crate) = f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a
-SIZE (rust/crates/uuid-1.7.0.crate) = 42627
+SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
+SIZE (rust/crates/uuid-1.8.0.crate) = 44043
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
 SIZE (rust/crates/valuable-0.1.0.crate) = 27718
 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
-SHA256 (rust/crates/waker-fn-1.1.1.crate) = f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690
-SIZE (rust/crates/waker-fn-1.1.1.crate) = 6323
-SHA256 (rust/crates/walkdir-2.4.0.crate) = d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee
-SIZE (rust/crates/walkdir-2.4.0.crate) = 23550
+SHA256 (rust/crates/waker-fn-1.2.0.crate) = 317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7
+SIZE (rust/crates/waker-fn-1.2.0.crate) = 6685
+SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
+SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
-SHA256 (rust/crates/wasm-bindgen-0.2.90.crate) = b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406
-SIZE (rust/crates/wasm-bindgen-0.2.90.crate) = 182529
-SHA256 (rust/crates/wasm-bindgen-backend-0.2.90.crate) = fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd
-SIZE (rust/crates/wasm-bindgen-backend-0.2.90.crate) = 28348
-SHA256 (rust/crates/wasm-bindgen-futures-0.4.40.crate) = bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461
-SIZE (rust/crates/wasm-bindgen-futures-0.4.40.crate) = 15375
-SHA256 (rust/crates/wasm-bindgen-macro-0.2.90.crate) = 3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999
-SIZE (rust/crates/wasm-bindgen-macro-0.2.90.crate) = 13904
-SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.90.crate) = bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7
-SIZE (rust/crates/wasm-bindgen-macro-support-0.2.90.crate) = 20008
-SHA256 (rust/crates/wasm-bindgen-shared-0.2.90.crate) = 4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b
-SIZE (rust/crates/wasm-bindgen-shared-0.2.90.crate) = 7264
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0
+SIZE (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 15380
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
 SHA256 (rust/crates/wasm-timer-0.2.5.crate) = be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f
 SIZE (rust/crates/wasm-timer-0.2.5.crate) = 21668
-SHA256 (rust/crates/wayland-backend-0.3.2.crate) = 19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4
-SIZE (rust/crates/wayland-backend-0.3.2.crate) = 69238
-SHA256 (rust/crates/wayland-client-0.31.1.crate) = 1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3
-SIZE (rust/crates/wayland-client-0.31.1.crate) = 62635
+SHA256 (rust/crates/wayland-backend-0.3.4.crate) = 34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07
+SIZE (rust/crates/wayland-backend-0.3.4.crate) = 70797
+SHA256 (rust/crates/wayland-client-0.31.3.crate) = 1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133
+SIZE (rust/crates/wayland-client-0.31.3.crate) = 63081
 SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
 SIZE (rust/crates/wayland-csd-frame-0.3.0.crate) = 5696
-SHA256 (rust/crates/wayland-cursor-0.31.0.crate) = a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b
-SIZE (rust/crates/wayland-cursor-0.31.0.crate) = 6938
-SHA256 (rust/crates/wayland-egl-0.32.0.crate) = 355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2
-SIZE (rust/crates/wayland-egl-0.32.0.crate) = 4026
+SHA256 (rust/crates/wayland-cursor-0.31.3.crate) = a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9
+SIZE (rust/crates/wayland-cursor-0.31.3.crate) = 7520
+SHA256 (rust/crates/wayland-egl-0.32.1.crate) = 18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8
+SIZE (rust/crates/wayland-egl-0.32.1.crate) = 4025
 SHA256 (rust/crates/wayland-protocols-0.31.2.crate) = 8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4
 SIZE (rust/crates/wayland-protocols-0.31.2.crate) = 147062
-SHA256 (rust/crates/wayland-protocols-misc-0.2.0.crate) = bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e
-SIZE (rust/crates/wayland-protocols-misc-0.2.0.crate) = 13627
+SHA256 (rust/crates/wayland-protocols-0.32.1.crate) = 83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c
+SIZE (rust/crates/wayland-protocols-0.32.1.crate) = 165198
+SHA256 (rust/crates/wayland-protocols-misc-0.3.1.crate) = e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331
+SIZE (rust/crates/wayland-protocols-misc-0.3.1.crate) = 13825
 SHA256 (rust/crates/wayland-protocols-plasma-0.2.0.crate) = 23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479
 SIZE (rust/crates/wayland-protocols-plasma-0.2.0.crate) = 59992
 SHA256 (rust/crates/wayland-protocols-wlr-0.2.0.crate) = ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6
 SIZE (rust/crates/wayland-protocols-wlr-0.2.0.crate) = 25804
-SHA256 (rust/crates/wayland-scanner-0.31.0.crate) = fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c
-SIZE (rust/crates/wayland-scanner-0.31.0.crate) = 35245
-SHA256 (rust/crates/wayland-server-0.31.0.crate) = 3f3f0c52a445936ca1184c98f1a69cf4ad9c9130788884531ef04428468cb1ce
-SIZE (rust/crates/wayland-server-0.31.0.crate) = 52048
-SHA256 (rust/crates/wayland-sys-0.31.1.crate) = 15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af
-SIZE (rust/crates/wayland-sys-0.31.1.crate) = 8577
-SHA256 (rust/crates/web-sys-0.3.67.crate) = 58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed
-SIZE (rust/crates/web-sys-0.3.67.crate) = 725967
+SHA256 (rust/crates/wayland-protocols-wlr-0.3.1.crate) = a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24
+SIZE (rust/crates/wayland-protocols-wlr-0.3.1.crate) = 26003
+SHA256 (rust/crates/wayland-scanner-0.31.2.crate) = 67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565
+SIZE (rust/crates/wayland-scanner-0.31.2.crate) = 35644
+SHA256 (rust/crates/wayland-server-0.31.2.crate) = 63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559
+SIZE (rust/crates/wayland-server-0.31.2.crate) = 52069
+SHA256 (rust/crates/wayland-sys-0.31.2.crate) = 105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12
+SIZE (rust/crates/wayland-sys-0.31.2.crate) = 8571
+SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
+SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
 SHA256 (rust/crates/web-time-0.2.4.crate) = aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0
 SIZE (rust/crates/web-time-0.2.4.crate) = 15743
-SHA256 (rust/crates/weezl-0.1.7.crate) = 9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb
-SIZE (rust/crates/weezl-0.1.7.crate) = 42166
-SHA256 (rust/crates/widestring-1.0.2.crate) = 653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8
-SIZE (rust/crates/widestring-1.0.2.crate) = 79706
+SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
+SIZE (rust/crates/web-time-1.1.0.crate) = 18026
+SHA256 (rust/crates/weezl-0.1.8.crate) = 53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082
+SIZE (rust/crates/weezl-0.1.8.crate) = 42175
+SHA256 (rust/crates/widestring-1.1.0.crate) = 7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311
+SIZE (rust/crates/widestring-1.1.0.crate) = 85046
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
-SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
+SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
+SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
-SIZE (rust/crates/windows-0.48.0.crate) = 11864177
-SHA256 (rust/crates/windows-0.51.1.crate) = ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9
-SIZE (rust/crates/windows-0.51.1.crate) = 12250614
-SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64
-SIZE (rust/crates/windows-core-0.51.1.crate) = 42364
+SHA256 (rust/crates/windows-0.52.0.crate) = e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be
+SIZE (rust/crates/windows-0.52.0.crate) = 11843715
+SHA256 (rust/crates/windows-0.54.0.crate) = 9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49
+SIZE (rust/crates/windows-0.54.0.crate) = 11096265
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65
+SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
+SHA256 (rust/crates/windows-result-0.1.1.crate) = 749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b
+SIZE (rust/crates/windows-result-0.1.1.crate) = 10460
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -1081,62 +1141,64 @@ SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb36932
 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
 SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
 SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows-targets-0.52.0.crate) = 8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd
-SIZE (rust/crates/windows-targets-0.52.0.crate) = 6229
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = 430182
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
 SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
 SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
 SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.0.crate) = bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef
-SIZE (rust/crates/windows_aarch64_msvc-0.52.0.crate) = 821663
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
 SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
 SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
 SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
 SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_gnu-0.52.0.crate) = a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313
-SIZE (rust/crates/windows_i686_gnu-0.52.0.crate) = 870285
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
 SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
 SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
 SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
 SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_i686_msvc-0.52.0.crate) = ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a
-SIZE (rust/crates/windows_i686_msvc-0.52.0.crate) = 888693
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
 SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
 SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
 SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
 SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd
-SIZE (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 826213
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
 SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 430165
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
 SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
 SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
 SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.0.crate) = dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04
-SIZE (rust/crates/windows_x86_64_msvc-0.52.0.crate) = 821600
-SHA256 (rust/crates/winit-0.29.10.crate) = 4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf
-SIZE (rust/crates/winit-0.29.10.crate) = 574116
-SHA256 (rust/crates/winnow-0.5.34.crate) = b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16
-SIZE (rust/crates/winnow-0.5.34.crate) = 154055
-SHA256 (rust/crates/wio-0.2.2.crate) = 5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5
-SIZE (rust/crates/wio-0.2.2.crate) = 11214
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
+SHA256 (rust/crates/winit-0.30.3.crate) = 49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004
+SIZE (rust/crates/winit-0.30.3.crate) = 599585
+SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
+SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/winnow-0.6.9.crate) = 86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6
+SIZE (rust/crates/winnow-0.6.9.crate) = 160195
 SHA256 (rust/crates/x11-dl-2.21.0.crate) = 38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f
 SIZE (rust/crates/x11-dl-2.21.0.crate) = 66823
-SHA256 (rust/crates/x11rb-0.13.0.crate) = f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a
-SIZE (rust/crates/x11rb-0.13.0.crate) = 222396
-SHA256 (rust/crates/x11rb-protocol-0.13.0.crate) = e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34
-SIZE (rust/crates/x11rb-protocol-0.13.0.crate) = 507838
+SHA256 (rust/crates/x11rb-0.13.1.crate) = 5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12
+SIZE (rust/crates/x11rb-0.13.1.crate) = 223916
+SHA256 (rust/crates/x11rb-protocol-0.13.1.crate) = ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d
+SIZE (rust/crates/x11rb-protocol-0.13.1.crate) = 508522
 SHA256 (rust/crates/xcursor-0.3.5.crate) = 6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911
 SIZE (rust/crates/xcursor-0.3.5.crate) = 6256
 SHA256 (rust/crates/xdg-2.5.2.crate) = 213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546
@@ -1147,67 +1209,67 @@ SHA256 (rust/crates/xdg-user-0.2.1.crate) = a1d5cd803f28ce5a488c8b129858222998c0
 SIZE (rust/crates/xdg-user-0.2.1.crate) = 9538
 SHA256 (rust/crates/xkbcommon-0.7.0.crate) = 13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e
 SIZE (rust/crates/xkbcommon-0.7.0.crate) = 58896
-SHA256 (rust/crates/xkbcommon-dl-0.4.1.crate) = 6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699
-SIZE (rust/crates/xkbcommon-dl-0.4.1.crate) = 5832
+SHA256 (rust/crates/xkbcommon-dl-0.4.2.crate) = d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5
+SIZE (rust/crates/xkbcommon-dl-0.4.2.crate) = 5879
 SHA256 (rust/crates/xkeysym-0.2.0.crate) = 054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621
 SIZE (rust/crates/xkeysym-0.2.0.crate) = 101431
-SHA256 (rust/crates/xml-rs-0.8.19.crate) = 0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a
-SIZE (rust/crates/xml-rs-0.8.19.crate) = 54051
+SHA256 (rust/crates/xml-rs-0.8.20.crate) = 791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193
+SIZE (rust/crates/xml-rs-0.8.20.crate) = 54443
 SHA256 (rust/crates/xmlparser-0.13.6.crate) = 66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4
 SIZE (rust/crates/xmlparser-0.13.6.crate) = 26718
 SHA256 (rust/crates/xmlwriter-0.1.0.crate) = ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9
 SIZE (rust/crates/xmlwriter-0.1.0.crate) = 6261
-SHA256 (rust/crates/xxhash-rust-0.8.8.crate) = 53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61
-SIZE (rust/crates/xxhash-rust-0.8.8.crate) = 18515
+SHA256 (rust/crates/xxhash-rust-0.8.10.crate) = 927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03
+SIZE (rust/crates/xxhash-rust-0.8.10.crate) = 20066
 SHA256 (rust/crates/yazi-0.1.6.crate) = c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1
 SIZE (rust/crates/yazi-0.1.6.crate) = 28835
-SHA256 (rust/crates/zbus-3.15.0.crate) = c45d06ae3b0f9ba1fb2671268b975557d8f5a84bb5ec6e43964f87e763d8bca8
-SIZE (rust/crates/zbus-3.15.0.crate) = 151374
-SHA256 (rust/crates/zbus_macros-3.15.0.crate) = b4a1ba45ed0ad344b85a2bb5a1fe9830aed23d67812ea39a586e7d0136439c7d
-SIZE (rust/crates/zbus_macros-3.15.0.crate) = 25887
-SHA256 (rust/crates/zbus_names-2.6.0.crate) = fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9
-SIZE (rust/crates/zbus_names-2.6.0.crate) = 9638
+SHA256 (rust/crates/zbus-3.15.2.crate) = 675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6
+SIZE (rust/crates/zbus-3.15.2.crate) = 151554
+SHA256 (rust/crates/zbus_macros-3.15.2.crate) = 7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5
+SIZE (rust/crates/zbus_macros-3.15.2.crate) = 25883
+SHA256 (rust/crates/zbus_names-2.6.1.crate) = 437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d
+SIZE (rust/crates/zbus_names-2.6.1.crate) = 9640
 SHA256 (rust/crates/zeno-0.2.3.crate) = dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697
 SIZE (rust/crates/zeno-0.2.3.crate) = 40164
-SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
-SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
-SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
-SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (rust/crates/zerocopy-0.7.34.crate) = ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087
+SIZE (rust/crates/zerocopy-0.7.34.crate) = 151177
+SHA256 (rust/crates/zerocopy-derive-0.7.34.crate) = 15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b
+SIZE (rust/crates/zerocopy-derive-0.7.34.crate) = 37907
 SHA256 (rust/crates/zune-inflate-0.2.54.crate) = 73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02
 SIZE (rust/crates/zune-inflate-0.2.54.crate) = 37973
-SHA256 (rust/crates/zvariant-3.15.0.crate) = 44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c
-SIZE (rust/crates/zvariant-3.15.0.crate) = 72221
-SHA256 (rust/crates/zvariant_derive-3.15.0.crate) = 934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd
-SIZE (rust/crates/zvariant_derive-3.15.0.crate) = 10943
+SHA256 (rust/crates/zvariant-3.15.2.crate) = 4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db
+SIZE (rust/crates/zvariant-3.15.2.crate) = 75401
+SHA256 (rust/crates/zvariant_derive-3.15.2.crate) = 37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9
+SIZE (rust/crates/zvariant_derive-3.15.2.crate) = 10936
 SHA256 (rust/crates/zvariant_utils-1.0.1.crate) = 7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200
 SIZE (rust/crates/zvariant_utils-1.0.1.crate) = 6223
-SHA256 (pop-os-window_clipboard-pop-mime-types_GH0.tar.gz) = 20107d88579804f3f5f3f0707c38ca39cd91f24d29698fa8053f957371d4476c
-SIZE (pop-os-window_clipboard-pop-mime-types_GH0.tar.gz) = 19406
+SHA256 (pop-os-cosmic-text-a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f_GH0.tar.gz) = 10f9f126eb6912d99b6a45990f3cec5ffb3a57f548bfbd364942b2f4ae4bd324
+SIZE (pop-os-cosmic-text-a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f_GH0.tar.gz) = 180362
 SHA256 (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) = e1a8e5cd37d8bb34badfd3c3e03a6948893a2ae6f789143162253f1f8e11fd4a
 SIZE (DioxusLabs-taffy-7781c70241f7f572130c13106f2a869a9cf80885_GH0.tar.gz) = 389939
 SHA256 (gfx-rs-wgpu-20fda698341efbdc870b8027d6d49f5bf3f36109_GH0.tar.gz) = 0715b053dd2f42a32c92a41996c9f029a294c48943cb18d5bae4dfa50d4be51c
 SIZE (gfx-rs-wgpu-20fda698341efbdc870b8027d6d49f5bf3f36109_GH0.tar.gz) = 11456338
-SHA256 (pop-os-libcosmic-cc439b2ceaf41226ab86416ae0ad3651c9a6e10a_GH0.tar.gz) = a6cd89e1702a370e954124ee837c2aa25dbabadc2d31c96cbcdac0c810af069f
-SIZE (pop-os-libcosmic-cc439b2ceaf41226ab86416ae0ad3651c9a6e10a_GH0.tar.gz) = 1071949
+SHA256 (pop-os-cosmic-protocols-f16efccaffdbe60b81d1a500be6e81851dc1dad4_GH0.tar.gz) = cdbbbcd201f6c0ae5915546bfddbbf52382f4729ae7c70f490ff01c21b3a5672
+SIZE (pop-os-cosmic-protocols-f16efccaffdbe60b81d1a500be6e81851dc1dad4_GH0.tar.gz) = 44709
 SHA256 (pop-os-glyphon-v0.5.0_GH0.tar.gz) = df1108e99572aea9433415081b4692f1561b9abe63766ccc70cb7fe709570a33
 SIZE (pop-os-glyphon-v0.5.0_GH0.tar.gz) = 183087
+SHA256 (pop-os-libcosmic-61760f8e4e33744a451e8e8fe09d581793c9c677_GH0.tar.gz) = d8788135ab89394434c6baea8b3b26ce9e86a6a4fe541d75b777e403bc725d6f
+SIZE (pop-os-libcosmic-61760f8e4e33744a451e8e8fe09d581793c9c677_GH0.tar.gz) = 1095838
+SHA256 (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 5e871e450991b94b8c09bc08994d6173e9bbb0f80b19ea7e3a126527d765bc90
+SIZE (pop-os-smithay-clipboard-pop-dnd-5_GH0.tar.gz) = 22877
+SHA256 (pop-os-window_clipboard-pop-dnd-8_GH0.tar.gz) = e44be0ca5c716ef753e3344cd06d167e7e84fa366058a71fce01c645e1d6f616
+SIZE (pop-os-window_clipboard-pop-dnd-8_GH0.tar.gz) = 24267
 SHA256 (jackpot51-rust-atomicwrites-043ab4859d53ffd3d55334685303d8df39c9f768_GH0.tar.gz) = 95ce4266b50ce6470ba74a5a9ce718bbfba45bf5ab43786db05be1682f6f0db1
 SIZE (jackpot51-rust-atomicwrites-043ab4859d53ffd3d55334685303d8df39c9f768_GH0.tar.gz) = 6787
 SHA256 (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) = 8393b1b94f1f2d00c916b677e898332579420d8cf3781a68d1866c1b9bc8685d
 SIZE (Drakulix-id-tree-632a57d6d49160e18d7300fa7edae52281ec5482_GH0.tar.gz) = 29608
+SHA256 (smithay-smithay-69b379d00af9e1bcc98dac2d452bfd86eafdaf34_GH0.tar.gz) = 7e2436fe852d6e932088bd35f0eb7f3f8222f68709350bf5783c83a0153eb040
+SIZE (smithay-smithay-69b379d00af9e1bcc98dac2d452bfd86eafdaf34_GH0.tar.gz) = 751940
 SHA256 (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 980f30eb5afc07acdec43f181a9e745cb7a887a6dff7e06dc9199748b2487569
 SIZE (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 165853
 SHA256 (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = c7f24118a1410bf55dc39bb541ffec1330d2d0504ec57a1c420d4ee8c00c708e
 SIZE (Smithay-smithay-egui-cdc652e0d4823b16a5bd9badd288e38512789dc5_GH0.tar.gz) = 11092
-SHA256 (pop-os-smithay-clipboard-pop-mime-types_GH0.tar.gz) = c7fa4555cb8d198f1c67f235caffca336fa4242af18740fd948817b4cc671ec6
-SIZE (pop-os-smithay-clipboard-pop-mime-types_GH0.tar.gz) = 15566
-SHA256 (smithay-smithay-eea0d9c171f30eb50247632fcddbb84f1dd147f0_GH0.tar.gz) = e026633da926d4363459c8e3cbe76f5ecfb2afae5194ec0ce89bc6b24aefa53c
-SIZE (smithay-smithay-eea0d9c171f30eb50247632fcddbb84f1dd147f0_GH0.tar.gz) = 740069
-SHA256 (pop-os-cosmic-text-ff5501d9a36e51c50d908413caf7632d8f7533b7_GH0.tar.gz) = 606b54e1e361e2b364cf8198b6f0ce9fdde2f1b80f3824e741ef4770f44a79c5
-SIZE (pop-os-cosmic-text-ff5501d9a36e51c50d908413caf7632d8f7533b7_GH0.tar.gz) = 176154
-SHA256 (pop-os-cosmic-protocols-1cc4a1393d0f8be4d444666e260fdb811b400f49_GH0.tar.gz) = 6ce8fe4cef1d5d6d276850f8df6fe58544c47d8375ea50064c43bd495779102e
-SIZE (pop-os-cosmic-protocols-1cc4a1393d0f8be4d444666e260fdb811b400f49_GH0.tar.gz) = 42798
-SHA256 (pop-os-cosmic-comp-s20240503-19ba568_GH0.tar.gz) = bbcb0169d1f98662bcabc07227288a82e55216a598a85fb521ab27757327e3b7
-SIZE (pop-os-cosmic-comp-s20240503-19ba568_GH0.tar.gz) = 353574
-SHA256 (pop-os-iced-0.4.2-1941-g1d9bb7fd_GH0.tar.gz) = 737785d7072f96147300e16c4f98130d0560ba79c06c9ea6fce0d3d4eec7bee6
-SIZE (pop-os-iced-0.4.2-1941-g1d9bb7fd_GH0.tar.gz) = 4664993
+SHA256 (pop-os-cosmic-comp-s20240626-9cd553e_GH0.tar.gz) = d78dfa10cafb146da77adbc1cec3ffa9f5d726c1cad0e200eaeab9846d4d9069
+SIZE (pop-os-cosmic-comp-s20240626-9cd553e_GH0.tar.gz) = 372459
+SHA256 (pop-os-iced-0.4.2-1997-gd0ba4985_GH0.tar.gz) = e94835aa94fd06e2529897cbfcf630450572cf3445210df514fcc35d81d3eecd
+SIZE (pop-os-iced-0.4.2-1997-gd0ba4985_GH0.tar.gz) = 4679516
diff --git a/x11-wm/fvwm3/Makefile b/x11-wm/fvwm3/Makefile
index d7ea27b0fcae..297ea91abe5b 100644
--- a/x11-wm/fvwm3/Makefile
+++ b/x11-wm/fvwm3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	fvwm3
 DISTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://github.com/fvwmorg/fvwm3/releases/download/${DISTVERSION}/ \
 		http://fvwm.sourceforge.net/generated/icon_download/:icons
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index 52812e045c4b..7344c496c8b8 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	labwc
-DISTVERSION=	0.7.1
+DISTVERSION=	0.7.2
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -43,11 +43,15 @@ MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 
 NLS_USES=		gettext
 NLS_MESON_ENABLED=	nls
-NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/${PORTNAME}.mo \
+NLS_PLIST_FILES=	share/locale/ar/LC_MESSAGES/${PORTNAME}.mo \
+			share/locale/cs/LC_MESSAGES/${PORTNAME}.mo \
+			share/locale/de/LC_MESSAGES/${PORTNAME}.mo \
+			share/locale/el/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/et/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/eu/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/fi/LC_MESSAGES/${PORTNAME}.mo \
+			share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/gl/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/hu/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/id/LC_MESSAGES/${PORTNAME}.mo \
diff --git a/x11-wm/labwc/distinfo b/x11-wm/labwc/distinfo
index 132de7d23ee7..befd6c2ad25b 100644
--- a/x11-wm/labwc/distinfo
+++ b/x11-wm/labwc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709328618
-SHA256 (labwc-labwc-0.7.1_GH0.tar.gz) = 1810ec55e287708e7a3cd44c726aa887db02480704db82b3d0bd550a6c4bfb76
-SIZE (labwc-labwc-0.7.1_GH0.tar.gz) = 341908
+TIMESTAMP = 1715371881
+SHA256 (labwc-labwc-0.7.2_GH0.tar.gz) = b00119451a91a75cc063cfa753f956623acdde4b93bbf78b2b6d5fe7f94c597e
+SIZE (labwc-labwc-0.7.2_GH0.tar.gz) = 384888
diff --git a/x11-wm/niri/Makefile b/x11-wm/niri/Makefile
index c51ceb590e23..c831b671464c 100644
--- a/x11-wm/niri/Makefile
+++ b/x11-wm/niri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	niri
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.5
+DISTVERSION=	0.1.7
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11-wm/niri/Makefile.crates b/x11-wm/niri/Makefile.crates
index 3ba04c847fc5..deda21efa203 100644
--- a/x11-wm/niri/Makefile.crates
+++ b/x11-wm/niri/Makefile.crates
@@ -1,35 +1,37 @@
 CARGO_CRATES=	adler-1.0.2 \
 		ahash-0.8.11 \
 		aho-corasick-1.1.3 \
-		allocator-api2-0.2.16 \
-		android-activity-0.5.2 \
+		allocator-api2-0.2.18 \
+		android-activity-0.6.0 \
 		android-properties-0.2.2 \
 		annotate-snippets-0.9.2 \
-		anstream-0.6.13 \
-		anstyle-1.0.6 \
-		anstyle-parse-0.2.3 \
-		anstyle-query-1.0.2 \
-		anstyle-wincon-3.0.2 \
-		anyhow-1.0.81 \
+		anstream-0.6.14 \
+		anstyle-1.0.7 \
+		anstyle-parse-0.2.4 \
+		anstyle-query-1.1.0 \
+		anstyle-wincon-3.0.3 \
+		anyhow-1.0.86 \
 		appendlist-1.4.0 \
 		approx-0.4.0 \
+		approx-0.5.1 \
 		arrayvec-0.7.4 \
 		as-raw-xcb-connection-1.0.1 \
 		async-broadcast-0.5.1 \
-		async-channel-2.2.0 \
-		async-executor-1.8.0 \
+		async-channel-2.3.1 \
+		async-executor-1.12.0 \
 		async-fs-1.6.0 \
 		async-io-1.13.0 \
-		async-io-2.3.2 \
+		async-io-2.3.3 \
 		async-lock-2.8.0 \
-		async-lock-3.3.0 \
+		async-lock-3.4.0 \
 		async-process-1.8.1 \
-		async-recursion-1.1.0 \
-		async-signal-0.2.5 \
-		async-task-4.7.0 \
-		async-trait-0.1.79 \
+		async-recursion-1.1.1 \
+		async-signal-0.2.8 \
+		async-task-4.7.1 \
+		async-trait-0.1.80 \
+		atomic-0.6.0 \
 		atomic-waker-1.1.2 \
-		autocfg-1.2.0 \
+		autocfg-1.3.0 \
 		base64-0.21.7 \
 		bindgen-0.69.4 \
 		bit-set-0.5.3 \
@@ -38,49 +40,50 @@ CARGO_CRATES=	adler-1.0.2 \
 		bitflags-2.5.0 \
 		block-0.1.6 \
 		block-buffer-0.10.4 \
-		block-sys-0.2.1 \
-		block2-0.3.0 \
-		blocking-1.5.1 \
-		bumpalo-3.15.4 \
-		bytemuck-1.15.0 \
-		bytemuck_derive-1.6.0 \
+		block2-0.5.1 \
+		blocking-1.6.1 \
+		bumpalo-3.16.0 \
+		bytemuck-1.16.1 \
+		bytemuck_derive-1.7.0 \
 		byteorder-1.5.0 \
 		bytes-1.6.0 \
-		cairo-rs-0.19.2 \
+		cairo-rs-0.19.4 \
 		cairo-sys-rs-0.19.2 \
 		calloop-0.12.4 \
-		calloop-0.13.0 \
+		calloop-0.14.0 \
 		calloop-wayland-source-0.2.0 \
-		cc-1.0.90 \
+		cc-1.0.99 \
 		cesu8-1.1.0 \
 		cexpr-0.6.0 \
-		cfg-expr-0.15.7 \
+		cfg-expr-0.15.8 \
 		cfg-if-1.0.0 \
-		cfg_aliases-0.1.1 \
+		cfg_aliases-0.2.1 \
 		cgmath-0.18.0 \
 		chumsky-0.9.3 \
-		clang-sys-1.7.0 \
+		clang-sys-1.8.1 \
 		clap-4.4.18 \
 		clap_builder-4.4.18 \
 		clap_derive-4.4.7 \
 		clap_lex-0.6.0 \
-		colorchoice-1.0.0 \
-		combine-4.6.6 \
-		concurrent-queue-2.4.0 \
+		colorchoice-1.0.1 \
+		colored-2.1.0 \
+		combine-4.6.7 \
+		concurrent-queue-2.5.0 \
 		convert_case-0.6.0 \
 		cookie-factory-0.3.3 \
 		core-foundation-0.9.4 \
 		core-foundation-sys-0.8.6 \
-		core-graphics-0.23.1 \
+		core-graphics-0.23.2 \
 		core-graphics-types-0.1.3 \
 		cpufeatures-0.2.12 \
-		crc32fast-1.4.0 \
-		crossbeam-utils-0.8.19 \
+		crc32fast-1.4.2 \
+		crossbeam-utils-0.8.20 \
 		crypto-common-0.1.6 \
 		csscolorparser-0.6.2 \
 		cursor-icon-1.1.0 \
 		deranged-0.3.11 \
 		derivative-2.2.0 \
+		diff-0.1.13 \
 		digest-0.10.7 \
 		directories-5.0.1 \
 		dirs-next-2.0.0 \
@@ -88,28 +91,27 @@ CARGO_CRATES=	adler-1.0.2 \
 		dirs-sys-next-0.1.2 \
 		dispatch-0.2.0 \
 		dlib-0.5.2 \
-		downcast-rs-1.2.0 \
-		drm-0.11.1 \
-		drm-ffi-0.7.1 \
+		downcast-rs-1.2.1 \
+		dpi-0.1.1 \
+		drm-0.12.0 \
+		drm-ffi-0.8.0 \
 		drm-fourcc-2.2.0 \
-		drm-sys-0.6.1 \
+		drm-sys-0.7.0 \
 		edid-rs-0.1.0 \
-		either-1.10.0 \
-		enumflags2-0.7.9 \
-		enumflags2_derive-0.7.9 \
+		either-1.12.0 \
+		enumflags2-0.7.10 \
+		enumflags2_derive-0.7.10 \
 		equivalent-1.0.1 \
-		errno-0.3.8 \
+		errno-0.3.9 \
 		event-listener-2.5.3 \
 		event-listener-3.1.0 \
-		event-listener-4.0.3 \
-		event-listener-5.2.0 \
-		event-listener-strategy-0.4.0 \
-		event-listener-strategy-0.5.0 \
+		event-listener-5.3.1 \
+		event-listener-strategy-0.5.2 \
 		fastrand-1.9.0 \
-		fastrand-2.0.2 \
+		fastrand-2.1.0 \
 		fdeflate-0.3.4 \
 		field-offset-0.3.6 \
-		flate2-1.0.28 \
+		flate2-1.0.30 \
 		fnv-1.0.7 \
 		foreign-types-0.5.0 \
 		foreign-types-macros-0.2.3 \
@@ -126,53 +128,55 @@ CARGO_CRATES=	adler-1.0.2 \
 		futures-sink-0.3.30 \
 		futures-task-0.3.30 \
 		futures-util-0.3.30 \
-		gbm-0.14.2 \
+		gbm-0.15.0 \
 		gbm-sys-0.3.0 \
-		gdk-pixbuf-0.19.2 \
-		gdk-pixbuf-sys-0.19.0 \
-		gdk4-0.8.1 \
-		gdk4-sys-0.8.1 \
-		generator-0.7.5 \
+		gdk-pixbuf-0.19.8 \
+		gdk-pixbuf-sys-0.19.8 \
+		gdk4-0.8.2 \
+		gdk4-sys-0.8.2 \
+		generator-0.8.1 \
 		generic-array-0.14.7 \
 		gethostname-0.4.3 \
-		getrandom-0.2.12 \
-		gio-0.19.3 \
-		gio-sys-0.19.0 \
+		getrandom-0.2.15 \
+		gio-0.19.8 \
+		gio-sys-0.19.8 \
 		git-version-0.3.9 \
 		git-version-macro-0.3.9 \
 		gl_generator-0.14.0 \
-		glam-0.27.0 \
-		glib-0.19.3 \
-		glib-macros-0.19.3 \
-		glib-sys-0.19.0 \
+		glam-0.28.0 \
+		glib-0.19.8 \
+		glib-macros-0.19.8 \
+		glib-sys-0.19.8 \
 		glob-0.3.1 \
-		gobject-sys-0.19.0 \
-		graphene-rs-0.19.2 \
-		graphene-sys-0.19.0 \
-		gsk4-0.8.1 \
-		gsk4-sys-0.8.1 \
-		gtk4-0.8.1 \
-		gtk4-macros-0.8.1 \
-		gtk4-sys-0.8.1 \
-		hashbrown-0.14.3 \
+		gobject-sys-0.19.8 \
+		graphene-rs-0.19.8 \
+		graphene-sys-0.19.8 \
+		gsk4-0.8.2 \
+		gsk4-sys-0.8.2 \
+		gtk4-0.8.2 \
+		gtk4-macros-0.8.2 \
+		gtk4-sys-0.8.2 \
+		hashbrown-0.14.5 \
 		heck-0.4.1 \
 		heck-0.5.0 \
 		hermit-abi-0.3.9 \
+		hermit-abi-0.4.0 \
 		hex-0.4.3 \
-		icrate-0.0.4 \
 		idna-0.5.0 \
 		indexmap-2.2.6 \
 		input-0.9.0 \
 		input-sys-1.18.0 \
-		instant-0.1.12 \
+		instant-0.1.13 \
 		io-lifetimes-1.0.11 \
 		io-lifetimes-2.0.3 \
+		is_terminal_polyfill-1.70.0 \
 		itertools-0.12.1 \
 		itoa-1.0.11 \
 		jni-0.21.1 \
 		jni-sys-0.3.0 \
-		jobserver-0.1.28 \
+		jobserver-0.1.31 \
 		js-sys-0.3.69 \
+		k9-0.12.0 \
 		keyframe-1.1.1 \
 		khronos_api-3.1.0 \
 		knuffel-3.2.0 \
@@ -181,25 +185,25 @@ CARGO_CRATES=	adler-1.0.2 \
 		lazycell-1.3.0 \
 		libadwaita-0.6.0 \
 		libadwaita-sys-0.6.0 \
-		libc-0.2.153 \
+		libc-0.2.155 \
 		libloading-0.8.3 \
 		libm-0.2.8 \
-		libredox-0.0.1 \
 		libredox-0.0.2 \
+		libredox-0.1.3 \
 		libseat-0.2.1 \
 		libseat-sys-0.1.7 \
 		libspa-0.8.0 \
 		libspa-sys-0.8.0 \
 		libudev-sys-0.1.4 \
 		linux-raw-sys-0.3.8 \
-		linux-raw-sys-0.4.13 \
+		linux-raw-sys-0.4.14 \
 		linux-raw-sys-0.6.4 \
 		log-0.4.21 \
-		loom-0.7.1 \
+		loom-0.7.2 \
 		mac-notification-sys-0.6.1 \
 		malloc_buf-0.0.6 \
 		matchers-0.1.0 \
-		memchr-2.7.2 \
+		memchr-2.7.4 \
 		memmap2-0.8.0 \
 		memmap2-0.9.4 \
 		memoffset-0.7.1 \
@@ -207,44 +211,61 @@ CARGO_CRATES=	adler-1.0.2 \
 		miette-5.10.0 \
 		miette-derive-5.10.0 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.7.2 \
-		ndk-0.8.0 \
+		miniz_oxide-0.7.4 \
+		ndk-0.9.0 \
 		ndk-context-0.1.1 \
-		ndk-sys-0.5.0+25.2.9519653 \
+		ndk-sys-0.6.0+11769913 \
 		nix-0.26.4 \
 		nix-0.27.1 \
 		nom-7.1.3 \
 		notify-rust-4.10.0 \
 		nu-ansi-term-0.46.0 \
 		num-conv-0.1.0 \
-		num-traits-0.2.18 \
+		num-traits-0.2.19 \
 		num_enum-0.7.2 \
 		num_enum_derive-0.7.2 \
 		objc-0.2.7 \
 		objc-foundation-0.1.1 \
-		objc-sys-0.3.2 \
-		objc2-0.4.1 \
-		objc2-encode-3.0.0 \
+		objc-sys-0.3.5 \
+		objc2-0.5.2 \
+		objc2-app-kit-0.2.2 \
+		objc2-cloud-kit-0.2.2 \
+		objc2-contacts-0.2.2 \
+		objc2-core-data-0.2.2 \
+		objc2-core-image-0.2.2 \
+		objc2-core-location-0.2.2 \
+		objc2-encode-4.0.3 \
+		objc2-foundation-0.2.2 \
+		objc2-link-presentation-0.2.2 \
+		objc2-metal-0.2.2 \
+		objc2-quartz-core-0.2.2 \
+		objc2-symbols-0.2.2 \
+		objc2-ui-kit-0.2.2 \
+		objc2-uniform-type-identifiers-0.2.2 \
+		objc2-user-notifications-0.2.2 \
 		objc_id-0.1.1 \
 		once_cell-1.19.0 \
 		option-ext-0.2.0 \
 		orbclient-0.3.47 \
+		ordered-float-4.2.0 \
 		ordered-stream-0.2.0 \
 		overload-0.1.1 \
-		pango-0.19.3 \
-		pango-sys-0.19.0 \
-		pangocairo-0.19.2 \
-		pangocairo-sys-0.19.0 \
+		pango-0.19.8 \
+		pango-sys-0.19.8 \
+		pangocairo-0.19.8 \
+		pangocairo-sys-0.19.8 \
 		parking-2.2.0 \
-		paste-1.0.14 \
+		paste-1.0.15 \
 		percent-encoding-2.3.1 \
 		phf-0.11.2 \
 		phf_generator-0.11.2 \
 		phf_macros-0.11.2 \
 		phf_shared-0.11.2 \
-		pin-project-lite-0.2.13 \
+		pin-project-1.1.5 \
+		pin-project-internal-1.1.5 \
+		pin-project-lite-0.2.14 \
 		pin-utils-0.1.0 \
-		piper-0.2.1 \
+		piper-0.2.3 \
 		pipewire-0.8.0 \
 		pipewire-sys-0.8.0 \
 		pixman-0.1.0 \
@@ -252,15 +273,16 @@ CARGO_CRATES=	adler-1.0.2 \
 		pkg-config-0.3.30 \
 		png-0.17.13 \
 		polling-2.8.0 \
-		polling-3.6.0 \
+		polling-3.7.2 \
 		portable-atomic-1.6.0 \
 		powerfmt-0.2.0 \
 		ppv-lite86-0.2.17 \
+		pretty_assertions-1.4.0 \
 		proc-macro-crate-1.3.1 \
 		proc-macro-crate-3.1.0 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.79 \
+		proc-macro2-1.0.86 \
 		profiling-1.0.15 \
 		profiling-procmacros-1.0.15 \
 		proptest-1.4.0 \
@@ -268,68 +290,68 @@ CARGO_CRATES=	adler-1.0.2 \
 		quick-error-1.2.3 \
 		quick-xml-0.30.0 \
 		quick-xml-0.31.0 \
-		quote-1.0.35 \
+		quote-1.0.36 \
 		rand-0.8.5 \
 		rand_chacha-0.3.1 \
 		rand_core-0.6.4 \
 		rand_xorshift-0.3.0 \
-		raw-window-handle-0.6.0 \
-		redox_syscall-0.3.5 \
+		raw-window-handle-0.6.2 \
 		redox_syscall-0.4.1 \
-		redox_users-0.4.4 \
-		regex-1.10.4 \
+		redox_users-0.4.5 \
+		regex-1.10.5 \
 		regex-automata-0.1.10 \
-		regex-automata-0.4.6 \
+		regex-automata-0.4.7 \
 		regex-syntax-0.6.29 \
-		regex-syntax-0.8.3 \
+		regex-syntax-0.8.4 \
 		rustc-hash-1.1.0 \
 		rustc_version-0.4.0 \
 		rustix-0.37.27 \
-		rustix-0.38.32 \
-		rustversion-1.0.14 \
+		rustix-0.38.34 \
+		rustversion-1.0.17 \
 		rusty-fork-0.3.0 \
-		ryu-1.0.17 \
+		ryu-1.0.18 \
 		same-file-1.0.6 \
 		scan_fmt-0.2.6 \
 		scoped-tls-1.0.1 \
 		sd-notify-0.4.1 \
-		semver-1.0.22 \
-		serde-1.0.197 \
-		serde_derive-1.0.197 \
-		serde_json-1.0.115 \
-		serde_repr-0.1.18 \
-		serde_spanned-0.6.5 \
+		semver-1.0.23 \
+		serde-1.0.203 \
+		serde_derive-1.0.203 \
+		serde_json-1.0.117 \
+		serde_repr-0.1.19 \
+		serde_spanned-0.6.6 \
 		sha1-0.10.6 \
 		sharded-slab-0.1.7 \
 		shlex-1.3.0 \
-		signal-hook-registry-1.4.1 \
+		signal-hook-registry-1.4.2 \
 		simd-adler32-0.3.7 \
 		siphasher-0.3.11 \
 		slab-0.4.9 \
 		smallvec-1.13.2 \
 		smithay-client-toolkit-0.18.1 \
-		smol_str-0.2.1 \
+		smol_str-0.2.2 \
 		socket2-0.4.10 \
 		static_assertions-1.1.0 \
 		strsim-0.10.0 \
 		syn-1.0.109 \
-		syn-2.0.55 \
+		syn-2.0.67 \
 		system-deps-6.2.2 \
 		target-lexicon-0.12.14 \
 		tauri-winrt-notification-0.1.3 \
 		tempfile-3.10.1 \
-		thiserror-1.0.58 \
-		thiserror-impl-1.0.58 \
+		terminal_size-0.2.6 \
+		thiserror-1.0.61 \
+		thiserror-impl-1.0.61 \
 		thread_local-1.1.8 \
-		time-0.3.34 \
+		time-0.3.36 \
 		time-core-0.1.2 \
 		tinyvec-1.6.0 \
 		tinyvec_macros-0.1.1 \
-		toml-0.8.12 \
-		toml_datetime-0.6.5 \
+		toml-0.8.14 \
+		toml_datetime-0.6.6 \
 		toml_edit-0.19.15 \
 		toml_edit-0.21.1 \
-		toml_edit-0.22.9 \
+		toml_edit-0.22.14 \
 		tracing-0.1.40 \
 		tracing-attributes-0.1.27 \
 		tracing-core-0.1.32 \
@@ -345,14 +367,14 @@ CARGO_CRATES=	adler-1.0.2 \
 		unicode-ident-1.0.12 \
 		unicode-normalization-0.1.23 \
 		unicode-segmentation-1.11.0 \
-		unicode-width-0.1.11 \
-		url-2.5.0 \
-		utf8parse-0.2.1 \
+		unicode-width-0.1.13 \
+		url-2.5.2 \
+		utf8parse-0.2.2 \
 		valuable-0.1.0 \
 		version-compare-0.2.0 \
 		version_check-0.9.4 \
 		wait-timeout-0.2.0 \
-		waker-fn-1.1.1 \
+		waker-fn-1.2.0 \
 		walkdir-2.5.0 \
 		wasi-0.11.0+wasi-snapshot-preview1 \
 		wasm-bindgen-0.2.92 \
@@ -361,75 +383,81 @@ CARGO_CRATES=	adler-1.0.2 \
 		wasm-bindgen-macro-0.2.92 \
 		wasm-bindgen-macro-support-0.2.92 \
 		wasm-bindgen-shared-0.2.92 \
-		wayland-backend-0.3.3 \
-		wayland-client-0.31.2 \
+		wayland-backend-0.3.4 \
+		wayland-client-0.31.3 \
 		wayland-csd-frame-0.3.0 \
-		wayland-cursor-0.31.1 \
-		wayland-egl-0.32.0 \
+		wayland-cursor-0.31.3 \
+		wayland-egl-0.32.1 \
 		wayland-protocols-0.31.2 \
-		wayland-protocols-misc-0.2.0 \
+		wayland-protocols-0.32.1 \
+		wayland-protocols-misc-0.3.1 \
 		wayland-protocols-plasma-0.2.0 \
 		wayland-protocols-wlr-0.2.0 \
-		wayland-scanner-0.31.1 \
-		wayland-server-0.31.1 \
-		wayland-sys-0.31.1 \
+		wayland-protocols-wlr-0.3.1 \
+		wayland-scanner-0.31.2 \
+		wayland-server-0.31.2 \
+		wayland-sys-0.31.2 \
 		web-sys-0.3.69 \
-		web-time-0.2.4 \
+		web-time-1.1.0 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.6 \
+		winapi-util-0.1.8 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-0.48.0 \
 		windows-0.51.1 \
+		windows-0.54.0 \
 		windows-core-0.51.1 \
+		windows-core-0.54.0 \
+		windows-result-0.1.2 \
 		windows-sys-0.45.0 \
 		windows-sys-0.48.0 \
 		windows-sys-0.52.0 \
 		windows-targets-0.42.2 \
 		windows-targets-0.48.5 \
-		windows-targets-0.52.4 \
+		windows-targets-0.52.5 \
 		windows_aarch64_gnullvm-0.42.2 \
 		windows_aarch64_gnullvm-0.48.5 \
-		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_gnullvm-0.52.5 \
 		windows_aarch64_msvc-0.42.2 \
 		windows_aarch64_msvc-0.48.5 \
-		windows_aarch64_msvc-0.52.4 \
+		windows_aarch64_msvc-0.52.5 \
 		windows_i686_gnu-0.42.2 \
 		windows_i686_gnu-0.48.5 \
-		windows_i686_gnu-0.52.4 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
 		windows_i686_msvc-0.42.2 \
 		windows_i686_msvc-0.48.5 \
-		windows_i686_msvc-0.52.4 \
+		windows_i686_msvc-0.52.5 \
 		windows_x86_64_gnu-0.42.2 \
 		windows_x86_64_gnu-0.48.5 \
-		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnu-0.52.5 \
 		windows_x86_64_gnullvm-0.42.2 \
 		windows_x86_64_gnullvm-0.48.5 \
-		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_gnullvm-0.52.5 \
 		windows_x86_64_msvc-0.42.2 \
 		windows_x86_64_msvc-0.48.5 \
-		windows_x86_64_msvc-0.52.4 \
-		winit-0.29.15 \
+		windows_x86_64_msvc-0.52.5 \
+		winit-0.30.3 \
 		winnow-0.5.40 \
-		winnow-0.6.5 \
+		winnow-0.6.13 \
 		x11-dl-2.21.0 \
-		x11rb-0.13.0 \
-		x11rb-protocol-0.13.0 \
+		x11rb-0.13.1 \
+		x11rb-protocol-0.13.1 \
 		xcursor-0.3.5 \
-		xdg-home-1.1.0 \
+		xdg-home-1.2.0 \
 		xkbcommon-0.7.0 \
 		xkbcommon-dl-0.4.2 \
-		xkeysym-0.2.0 \
-		xml-rs-0.8.19 \
-		xshell-0.2.5 \
-		xshell-macros-0.2.5 \
+		xkeysym-0.2.1 \
+		xml-rs-0.8.20 \
+		xshell-0.2.6 \
+		xshell-macros-0.2.6 \
+		yansi-0.5.1 \
 		yansi-term-0.1.2 \
 		zbus-3.15.2 \
 		zbus_macros-3.15.2 \
 		zbus_names-2.6.1 \
-		zerocopy-0.7.32 \
-		zerocopy-derive-0.7.32 \
+		zerocopy-0.7.34 \
+		zerocopy-derive-0.7.34 \
 		zvariant-3.15.2 \
 		zvariant_derive-3.15.2 \
 		zvariant_utils-1.0.1 \
-		smithay,smithay-drm-extras@git+https://github.com/Smithay/smithay.git\#c5e9a697e41f50dc56b918d9ef1e3d2e52c84ac0
+		smithay,smithay-drm-extras@git+https://github.com/Smithay/smithay.git\#234586dbea6bc084cb72a32f164997e47ea36b2b
diff --git a/x11-wm/niri/distinfo b/x11-wm/niri/distinfo
index b86eba5e0ab5..3ab36782355d 100644
--- a/x11-wm/niri/distinfo
+++ b/x11-wm/niri/distinfo
@@ -1,68 +1,72 @@
-TIMESTAMP = 1713620717
+TIMESTAMP = 1716030039
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
 SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
 SIZE (rust/crates/ahash-0.8.11.crate) = 43607
 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
 SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
-SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
-SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
-SHA256 (rust/crates/android-activity-0.5.2.crate) = ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289
-SIZE (rust/crates/android-activity-0.5.2.crate) = 258406
+SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
+SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
+SHA256 (rust/crates/android-activity-0.6.0.crate) = ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046
+SIZE (rust/crates/android-activity-0.6.0.crate) = 258597
 SHA256 (rust/crates/android-properties-0.2.2.crate) = fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04
 SIZE (rust/crates/android-properties-0.2.2.crate) = 4563
 SHA256 (rust/crates/annotate-snippets-0.9.2.crate) = ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e
 SIZE (rust/crates/annotate-snippets-0.9.2.crate) = 32065
-SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
-SIZE (rust/crates/anstream-0.6.13.crate) = 30928
-SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
-SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
-SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
-SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
-SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
-SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
-SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
-SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
-SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
-SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
+SHA256 (rust/crates/anstream-0.6.14.crate) = 418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b
+SIZE (rust/crates/anstream-0.6.14.crate) = 29160
+SHA256 (rust/crates/anstyle-1.0.7.crate) = 038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b
+SIZE (rust/crates/anstyle-1.0.7.crate) = 15709
+SHA256 (rust/crates/anstyle-parse-0.2.4.crate) = c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4
+SIZE (rust/crates/anstyle-parse-0.2.4.crate) = 23069
+SHA256 (rust/crates/anstyle-query-1.1.0.crate) = ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391
+SIZE (rust/crates/anstyle-query-1.1.0.crate) = 9832
+SHA256 (rust/crates/anstyle-wincon-3.0.3.crate) = 61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19
+SIZE (rust/crates/anstyle-wincon-3.0.3.crate) = 12179
+SHA256 (rust/crates/anyhow-1.0.86.crate) = b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da
+SIZE (rust/crates/anyhow-1.0.86.crate) = 46741
 SHA256 (rust/crates/appendlist-1.4.0.crate) = e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2
 SIZE (rust/crates/appendlist-1.4.0.crate) = 7252
 SHA256 (rust/crates/approx-0.4.0.crate) = 3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278
 SIZE (rust/crates/approx-0.4.0.crate) = 14280
+SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6
+SIZE (rust/crates/approx-0.5.1.crate) = 15100
 SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
 SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
 SHA256 (rust/crates/as-raw-xcb-connection-1.0.1.crate) = 175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b
 SIZE (rust/crates/as-raw-xcb-connection-1.0.1.crate) = 6460
 SHA256 (rust/crates/async-broadcast-0.5.1.crate) = 7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b
 SIZE (rust/crates/async-broadcast-0.5.1.crate) = 20134
-SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
-SIZE (rust/crates/async-channel-2.2.0.crate) = 14307
-SHA256 (rust/crates/async-executor-1.8.0.crate) = 17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c
-SIZE (rust/crates/async-executor-1.8.0.crate) = 21870
+SHA256 (rust/crates/async-channel-2.3.1.crate) = 89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a
+SIZE (rust/crates/async-channel-2.3.1.crate) = 14576
+SHA256 (rust/crates/async-executor-1.12.0.crate) = c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0
+SIZE (rust/crates/async-executor-1.12.0.crate) = 28529
 SHA256 (rust/crates/async-fs-1.6.0.crate) = 279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06
 SIZE (rust/crates/async-fs-1.6.0.crate) = 16506
 SHA256 (rust/crates/async-io-1.13.0.crate) = 0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af
 SIZE (rust/crates/async-io-1.13.0.crate) = 37191
-SHA256 (rust/crates/async-io-2.3.2.crate) = dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884
-SIZE (rust/crates/async-io-2.3.2.crate) = 49298
+SHA256 (rust/crates/async-io-2.3.3.crate) = 0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964
+SIZE (rust/crates/async-io-2.3.3.crate) = 49746
 SHA256 (rust/crates/async-lock-2.8.0.crate) = 287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b
 SIZE (rust/crates/async-lock-2.8.0.crate) = 29944
-SHA256 (rust/crates/async-lock-3.3.0.crate) = d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b
-SIZE (rust/crates/async-lock-3.3.0.crate) = 33286
+SHA256 (rust/crates/async-lock-3.4.0.crate) = ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18
+SIZE (rust/crates/async-lock-3.4.0.crate) = 34446
 SHA256 (rust/crates/async-process-1.8.1.crate) = ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88
 SIZE (rust/crates/async-process-1.8.1.crate) = 22758
-SHA256 (rust/crates/async-recursion-1.1.0.crate) = 30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5
-SIZE (rust/crates/async-recursion-1.1.0.crate) = 14982
-SHA256 (rust/crates/async-signal-0.2.5.crate) = 9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5
-SIZE (rust/crates/async-signal-0.2.5.crate) = 16743
-SHA256 (rust/crates/async-task-4.7.0.crate) = fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799
-SIZE (rust/crates/async-task-4.7.0.crate) = 38906
-SHA256 (rust/crates/async-trait-0.1.79.crate) = a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681
-SIZE (rust/crates/async-trait-0.1.79.crate) = 29558
+SHA256 (rust/crates/async-recursion-1.1.1.crate) = 3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11
+SIZE (rust/crates/async-recursion-1.1.1.crate) = 14874
+SHA256 (rust/crates/async-signal-0.2.8.crate) = 794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d
+SIZE (rust/crates/async-signal-0.2.8.crate) = 17497
+SHA256 (rust/crates/async-task-4.7.1.crate) = 8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de
+SIZE (rust/crates/async-task-4.7.1.crate) = 38077
+SHA256 (rust/crates/async-trait-0.1.80.crate) = c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca
+SIZE (rust/crates/async-trait-0.1.80.crate) = 28775
+SHA256 (rust/crates/atomic-0.6.0.crate) = 8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994
+SIZE (rust/crates/atomic-0.6.0.crate) = 12919
 SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
 SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
-SHA256 (rust/crates/autocfg-1.2.0.crate) = f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80
-SIZE (rust/crates/autocfg-1.2.0.crate) = 14808
+SHA256 (rust/crates/autocfg-1.3.0.crate) = 0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0
+SIZE (rust/crates/autocfg-1.3.0.crate) = 16524
 SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
 SIZE (rust/crates/base64-0.21.7.crate) = 82576
 SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
@@ -79,50 +83,48 @@ SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c
 SIZE (rust/crates/block-0.1.6.crate) = 4077
 SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
 SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
-SHA256 (rust/crates/block-sys-0.2.1.crate) = ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7
-SIZE (rust/crates/block-sys-0.2.1.crate) = 9320
-SHA256 (rust/crates/block2-0.3.0.crate) = 15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68
-SIZE (rust/crates/block2-0.3.0.crate) = 10924
-SHA256 (rust/crates/blocking-1.5.1.crate) = 6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118
-SIZE (rust/crates/blocking-1.5.1.crate) = 17277
-SHA256 (rust/crates/bumpalo-3.15.4.crate) = 7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa
-SIZE (rust/crates/bumpalo-3.15.4.crate) = 85028
-SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
-SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
-SHA256 (rust/crates/bytemuck_derive-1.6.0.crate) = 4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60
-SIZE (rust/crates/bytemuck_derive-1.6.0.crate) = 21194
+SHA256 (rust/crates/block2-0.5.1.crate) = 2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f
+SIZE (rust/crates/block2-0.5.1.crate) = 24191
+SHA256 (rust/crates/blocking-1.6.1.crate) = 703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea
+SIZE (rust/crates/blocking-1.6.1.crate) = 17788
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytemuck-1.16.1.crate) = b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e
+SIZE (rust/crates/bytemuck-1.16.1.crate) = 48321
+SHA256 (rust/crates/bytemuck_derive-1.7.0.crate) = 1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b
+SIZE (rust/crates/bytemuck_derive-1.7.0.crate) = 21687
 SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
 SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
 SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
 SIZE (rust/crates/bytes-1.6.0.crate) = 60605
-SHA256 (rust/crates/cairo-rs-0.19.2.crate) = 2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c
-SIZE (rust/crates/cairo-rs-0.19.2.crate) = 52323
+SHA256 (rust/crates/cairo-rs-0.19.4.crate) = b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562
+SIZE (rust/crates/cairo-rs-0.19.4.crate) = 52285
 SHA256 (rust/crates/cairo-sys-rs-0.19.2.crate) = fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64
 SIZE (rust/crates/cairo-sys-rs-0.19.2.crate) = 11874
 SHA256 (rust/crates/calloop-0.12.4.crate) = fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298
 SIZE (rust/crates/calloop-0.12.4.crate) = 69583
-SHA256 (rust/crates/calloop-0.13.0.crate) = b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec
-SIZE (rust/crates/calloop-0.13.0.crate) = 69698
+SHA256 (rust/crates/calloop-0.14.0.crate) = c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10
+SIZE (rust/crates/calloop-0.14.0.crate) = 71405
 SHA256 (rust/crates/calloop-wayland-source-0.2.0.crate) = 0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02
 SIZE (rust/crates/calloop-wayland-source-0.2.0.crate) = 11304
-SHA256 (rust/crates/cc-1.0.90.crate) = 8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5
-SIZE (rust/crates/cc-1.0.90.crate) = 73954
+SHA256 (rust/crates/cc-1.0.99.crate) = 96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695
+SIZE (rust/crates/cc-1.0.99.crate) = 76961
 SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
 SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
-SHA256 (rust/crates/cfg-expr-0.15.7.crate) = fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d
-SIZE (rust/crates/cfg-expr-0.15.7.crate) = 42003
+SHA256 (rust/crates/cfg-expr-0.15.8.crate) = d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02
+SIZE (rust/crates/cfg-expr-0.15.8.crate) = 42108
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
-SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/cfg_aliases-0.2.1.crate) = 613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724
+SIZE (rust/crates/cfg_aliases-0.2.1.crate) = 6355
 SHA256 (rust/crates/cgmath-0.18.0.crate) = 1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317
 SIZE (rust/crates/cgmath-0.18.0.crate) = 64802
 SHA256 (rust/crates/chumsky-0.9.3.crate) = 8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9
 SIZE (rust/crates/chumsky-0.9.3.crate) = 75112
-SHA256 (rust/crates/clang-sys-1.7.0.crate) = 67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1
-SIZE (rust/crates/clang-sys-1.7.0.crate) = 42088
+SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4
+SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009
 SHA256 (rust/crates/clap-4.4.18.crate) = 1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c
 SIZE (rust/crates/clap-4.4.18.crate) = 55269
 SHA256 (rust/crates/clap_builder-4.4.18.crate) = 4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7
@@ -131,12 +133,14 @@ SHA256 (rust/crates/clap_derive-4.4.7.crate) = cf9804afaaf59a91e75b022a30fb7229a
 SIZE (rust/crates/clap_derive-4.4.7.crate) = 29046
 SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
 SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
-SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
-SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
-SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
-SIZE (rust/crates/combine-4.6.6.crate) = 132428
-SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
-SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/colorchoice-1.0.1.crate) = 0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422
+SIZE (rust/crates/colorchoice-1.0.1.crate) = 7895
+SHA256 (rust/crates/colored-2.1.0.crate) = cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8
+SIZE (rust/crates/colored-2.1.0.crate) = 23348
+SHA256 (rust/crates/combine-4.6.7.crate) = ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd
+SIZE (rust/crates/combine-4.6.7.crate) = 134808
+SHA256 (rust/crates/concurrent-queue-2.5.0.crate) = 4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973
+SIZE (rust/crates/concurrent-queue-2.5.0.crate) = 22654
 SHA256 (rust/crates/convert_case-0.6.0.crate) = ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca
 SIZE (rust/crates/convert_case-0.6.0.crate) = 18675
 SHA256 (rust/crates/cookie-factory-0.3.3.crate) = 9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2
@@ -145,16 +149,16 @@ SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2
 SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
 SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
 SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
-SHA256 (rust/crates/core-graphics-0.23.1.crate) = 970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212
-SIZE (rust/crates/core-graphics-0.23.1.crate) = 30714
+SHA256 (rust/crates/core-graphics-0.23.2.crate) = c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081
+SIZE (rust/crates/core-graphics-0.23.2.crate) = 30763
 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf
 SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063
 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
 SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
-SHA256 (rust/crates/crc32fast-1.4.0.crate) = b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa
-SIZE (rust/crates/crc32fast-1.4.0.crate) = 38665
-SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
-SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crc32fast-1.4.2.crate) = a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3
+SIZE (rust/crates/crc32fast-1.4.2.crate) = 38491
+SHA256 (rust/crates/crossbeam-utils-0.8.20.crate) = 22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80
+SIZE (rust/crates/crossbeam-utils-0.8.20.crate) = 42487
 SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
 SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
 SHA256 (rust/crates/csscolorparser-0.6.2.crate) = eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf
@@ -165,6 +169,8 @@ SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585
 SIZE (rust/crates/deranged-0.3.11.crate) = 18043
 SHA256 (rust/crates/derivative-2.2.0.crate) = fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b
 SIZE (rust/crates/derivative-2.2.0.crate) = 48076
+SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
+SIZE (rust/crates/diff-0.1.13.crate) = 46216
 SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
 SIZE (rust/crates/digest-0.10.7.crate) = 19557
 SHA256 (rust/crates/directories-5.0.1.crate) = 9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35
@@ -179,50 +185,48 @@ SHA256 (rust/crates/dispatch-0.2.0.crate) = bd0c93bb4b0c6d9b77f4435b0ae98c24d17f
 SIZE (rust/crates/dispatch-0.2.0.crate) = 10229
 SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412
 SIZE (rust/crates/dlib-0.5.2.crate) = 5806
-SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
-SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670
-SHA256 (rust/crates/drm-0.11.1.crate) = a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde
-SIZE (rust/crates/drm-0.11.1.crate) = 49655
-SHA256 (rust/crates/drm-ffi-0.7.1.crate) = 41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6
-SIZE (rust/crates/drm-ffi-0.7.1.crate) = 9581
+SHA256 (rust/crates/downcast-rs-1.2.1.crate) = 75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2
+SIZE (rust/crates/downcast-rs-1.2.1.crate) = 11821
+SHA256 (rust/crates/dpi-0.1.1.crate) = f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53
+SIZE (rust/crates/dpi-0.1.1.crate) = 11131
+SHA256 (rust/crates/drm-0.12.0.crate) = 98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1
+SIZE (rust/crates/drm-0.12.0.crate) = 49549
+SHA256 (rust/crates/drm-ffi-0.8.0.crate) = 97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53
+SIZE (rust/crates/drm-ffi-0.8.0.crate) = 9703
 SHA256 (rust/crates/drm-fourcc-2.2.0.crate) = 0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4
 SIZE (rust/crates/drm-fourcc-2.2.0.crate) = 12192
-SHA256 (rust/crates/drm-sys-0.6.1.crate) = 2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176
-SIZE (rust/crates/drm-sys-0.6.1.crate) = 10363
+SHA256 (rust/crates/drm-sys-0.7.0.crate) = fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986
+SIZE (rust/crates/drm-sys-0.7.0.crate) = 10439
 SHA256 (rust/crates/edid-rs-0.1.0.crate) = 2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c
 SIZE (rust/crates/edid-rs-0.1.0.crate) = 10023
-SHA256 (rust/crates/either-1.10.0.crate) = 11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a
-SIZE (rust/crates/either-1.10.0.crate) = 18334
-SHA256 (rust/crates/enumflags2-0.7.9.crate) = 3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d
-SIZE (rust/crates/enumflags2-0.7.9.crate) = 16555
-SHA256 (rust/crates/enumflags2_derive-0.7.9.crate) = 5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4
-SIZE (rust/crates/enumflags2_derive-0.7.9.crate) = 7901
+SHA256 (rust/crates/either-1.12.0.crate) = 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b
+SIZE (rust/crates/either-1.12.0.crate) = 18974
+SHA256 (rust/crates/enumflags2-0.7.10.crate) = d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d
+SIZE (rust/crates/enumflags2-0.7.10.crate) = 16622
+SHA256 (rust/crates/enumflags2_derive-0.7.10.crate) = de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8
+SIZE (rust/crates/enumflags2_derive-0.7.10.crate) = 8104
 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
-SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
-SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/errno-0.3.9.crate) = 534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba
+SIZE (rust/crates/errno-0.3.9.crate) = 10690
 SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
 SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
 SHA256 (rust/crates/event-listener-3.1.0.crate) = d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2
 SIZE (rust/crates/event-listener-3.1.0.crate) = 38793
-SHA256 (rust/crates/event-listener-4.0.3.crate) = 67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e
-SIZE (rust/crates/event-listener-4.0.3.crate) = 39784
-SHA256 (rust/crates/event-listener-5.2.0.crate) = 2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91
-SIZE (rust/crates/event-listener-5.2.0.crate) = 40217
-SHA256 (rust/crates/event-listener-strategy-0.4.0.crate) = 958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3
-SIZE (rust/crates/event-listener-strategy-0.4.0.crate) = 10225
-SHA256 (rust/crates/event-listener-strategy-0.5.0.crate) = feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291
-SIZE (rust/crates/event-listener-strategy-0.5.0.crate) = 10616
+SHA256 (rust/crates/event-listener-5.3.1.crate) = 6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba
+SIZE (rust/crates/event-listener-5.3.1.crate) = 42576
+SHA256 (rust/crates/event-listener-strategy-0.5.2.crate) = 0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1
+SIZE (rust/crates/event-listener-strategy-0.5.2.crate) = 10697
 SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
 SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
-SHA256 (rust/crates/fastrand-2.0.2.crate) = 658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984
-SIZE (rust/crates/fastrand-2.0.2.crate) = 14674
+SHA256 (rust/crates/fastrand-2.1.0.crate) = 9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a
+SIZE (rust/crates/fastrand-2.1.0.crate) = 14907
 SHA256 (rust/crates/fdeflate-0.3.4.crate) = 4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645
 SIZE (rust/crates/fdeflate-0.3.4.crate) = 25001
 SHA256 (rust/crates/field-offset-0.3.6.crate) = 38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f
 SIZE (rust/crates/field-offset-0.3.6.crate) = 10032
-SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
-SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/flate2-1.0.30.crate) = 5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae
+SIZE (rust/crates/flate2-1.0.30.crate) = 75511
 SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
 SIZE (rust/crates/fnv-1.0.7.crate) = 11266
 SHA256 (rust/crates/foreign-types-0.5.0.crate) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965
@@ -255,74 +259,74 @@ SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf3
 SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
 SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
 SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
-SHA256 (rust/crates/gbm-0.14.2.crate) = 313702b30cdeb83ddc72bc14dcee67803cd0ae2d12282ea06e368c25a900c844
-SIZE (rust/crates/gbm-0.14.2.crate) = 12124
+SHA256 (rust/crates/gbm-0.15.0.crate) = 45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a
+SIZE (rust/crates/gbm-0.15.0.crate) = 12320
 SHA256 (rust/crates/gbm-sys-0.3.0.crate) = 6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58
 SIZE (rust/crates/gbm-sys-0.3.0.crate) = 7603
-SHA256 (rust/crates/gdk-pixbuf-0.19.2.crate) = f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92
-SIZE (rust/crates/gdk-pixbuf-0.19.2.crate) = 17734
-SHA256 (rust/crates/gdk-pixbuf-sys-0.19.0.crate) = 3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96
-SIZE (rust/crates/gdk-pixbuf-sys-0.19.0.crate) = 9745
-SHA256 (rust/crates/gdk4-0.8.1.crate) = 9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b
-SIZE (rust/crates/gdk4-0.8.1.crate) = 89125
-SHA256 (rust/crates/gdk4-sys-0.8.1.crate) = d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626
-SIZE (rust/crates/gdk4-sys-0.8.1.crate) = 65737
-SHA256 (rust/crates/generator-0.7.5.crate) = 5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e
-SIZE (rust/crates/generator-0.7.5.crate) = 29947
+SHA256 (rust/crates/gdk-pixbuf-0.19.8.crate) = 624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699
+SIZE (rust/crates/gdk-pixbuf-0.19.8.crate) = 17721
+SHA256 (rust/crates/gdk-pixbuf-sys-0.19.8.crate) = 4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379
+SIZE (rust/crates/gdk-pixbuf-sys-0.19.8.crate) = 9780
+SHA256 (rust/crates/gdk4-0.8.2.crate) = db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07
+SIZE (rust/crates/gdk4-0.8.2.crate) = 90346
+SHA256 (rust/crates/gdk4-sys-0.8.2.crate) = c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd
+SIZE (rust/crates/gdk4-sys-0.8.2.crate) = 65864
+SHA256 (rust/crates/generator-0.8.1.crate) = 186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb
+SIZE (rust/crates/generator-0.8.1.crate) = 33739
 SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
 SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
 SHA256 (rust/crates/gethostname-0.4.3.crate) = 0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818
 SIZE (rust/crates/gethostname-0.4.3.crate) = 9336
-SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
-SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
-SHA256 (rust/crates/gio-0.19.3.crate) = c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f
-SIZE (rust/crates/gio-0.19.3.crate) = 201442
-SHA256 (rust/crates/gio-sys-0.19.0.crate) = bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4
-SIZE (rust/crates/gio-sys-0.19.0.crate) = 81621
+SHA256 (rust/crates/getrandom-0.2.15.crate) = c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7
+SIZE (rust/crates/getrandom-0.2.15.crate) = 37163
+SHA256 (rust/crates/gio-0.19.8.crate) = 4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe
+SIZE (rust/crates/gio-0.19.8.crate) = 201627
+SHA256 (rust/crates/gio-sys-0.19.8.crate) = 2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef
+SIZE (rust/crates/gio-sys-0.19.8.crate) = 81673
 SHA256 (rust/crates/git-version-0.3.9.crate) = 1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19
 SIZE (rust/crates/git-version-0.3.9.crate) = 3087
 SHA256 (rust/crates/git-version-macro-0.3.9.crate) = 53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0
 SIZE (rust/crates/git-version-macro-0.3.9.crate) = 5622
 SHA256 (rust/crates/gl_generator-0.14.0.crate) = 1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d
 SIZE (rust/crates/gl_generator-0.14.0.crate) = 22330
-SHA256 (rust/crates/glam-0.27.0.crate) = 9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9
-SIZE (rust/crates/glam-0.27.0.crate) = 401827
-SHA256 (rust/crates/glib-0.19.3.crate) = 01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf
-SIZE (rust/crates/glib-0.19.3.crate) = 274906
-SHA256 (rust/crates/glib-macros-0.19.3.crate) = 9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d
-SIZE (rust/crates/glib-macros-0.19.3.crate) = 62904
-SHA256 (rust/crates/glib-sys-0.19.0.crate) = 630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4
-SIZE (rust/crates/glib-sys-0.19.0.crate) = 63769
+SHA256 (rust/crates/glam-0.28.0.crate) = 779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94
+SIZE (rust/crates/glam-0.28.0.crate) = 438523
+SHA256 (rust/crates/glib-0.19.8.crate) = b664491bc77ab55daa6714a592cdbe1a55e28abec09cb50e87689b90de456ff4
+SIZE (rust/crates/glib-0.19.8.crate) = 276732
+SHA256 (rust/crates/glib-macros-0.19.8.crate) = 1d405205a405182f95e637710850a8e82f25ba01fdd6baebc82dabeaf0883376
+SIZE (rust/crates/glib-macros-0.19.8.crate) = 63493
+SHA256 (rust/crates/glib-sys-0.19.8.crate) = 5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5
+SIZE (rust/crates/glib-sys-0.19.8.crate) = 63431
 SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
 SIZE (rust/crates/glob-0.3.1.crate) = 18880
-SHA256 (rust/crates/gobject-sys-0.19.0.crate) = c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979
-SIZE (rust/crates/gobject-sys-0.19.0.crate) = 19026
-SHA256 (rust/crates/graphene-rs-0.19.2.crate) = 99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91
-SIZE (rust/crates/graphene-rs-0.19.2.crate) = 17322
-SHA256 (rust/crates/graphene-sys-0.19.0.crate) = 236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0
-SIZE (rust/crates/graphene-sys-0.19.0.crate) = 11615
-SHA256 (rust/crates/gsk4-0.8.1.crate) = c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e
-SIZE (rust/crates/gsk4-0.8.1.crate) = 32346
-SHA256 (rust/crates/gsk4-sys-0.8.1.crate) = bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738
-SIZE (rust/crates/gsk4-sys-0.8.1.crate) = 15283
-SHA256 (rust/crates/gtk4-0.8.1.crate) = aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83
-SIZE (rust/crates/gtk4-0.8.1.crate) = 465401
-SHA256 (rust/crates/gtk4-macros-0.8.1.crate) = 40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567
-SIZE (rust/crates/gtk4-macros-0.8.1.crate) = 16752
-SHA256 (rust/crates/gtk4-sys-0.8.1.crate) = 0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18
-SIZE (rust/crates/gtk4-sys-0.8.1.crate) = 109403
-SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
-SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/gobject-sys-0.19.8.crate) = 2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e
+SIZE (rust/crates/gobject-sys-0.19.8.crate) = 19068
+SHA256 (rust/crates/graphene-rs-0.19.8.crate) = f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf
+SIZE (rust/crates/graphene-rs-0.19.8.crate) = 17316
+SHA256 (rust/crates/graphene-sys-0.19.8.crate) = 2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05
+SIZE (rust/crates/graphene-sys-0.19.8.crate) = 11653
+SHA256 (rust/crates/gsk4-0.8.2.crate) = 7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be
+SIZE (rust/crates/gsk4-0.8.2.crate) = 32331
+SHA256 (rust/crates/gsk4-sys-0.8.2.crate) = 23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc
+SIZE (rust/crates/gsk4-sys-0.8.2.crate) = 15321
+SHA256 (rust/crates/gtk4-0.8.2.crate) = b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab
+SIZE (rust/crates/gtk4-0.8.2.crate) = 466329
+SHA256 (rust/crates/gtk4-macros-0.8.2.crate) = ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408
+SIZE (rust/crates/gtk4-macros-0.8.2.crate) = 16529
+SHA256 (rust/crates/gtk4-sys-0.8.2.crate) = 8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5
+SIZE (rust/crates/gtk4-sys-0.8.2.crate) = 109719
+SHA256 (rust/crates/hashbrown-0.14.5.crate) = e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1
+SIZE (rust/crates/hashbrown-0.14.5.crate) = 141498
 SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
 SIZE (rust/crates/heck-0.4.1.crate) = 11567
 SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
 SIZE (rust/crates/heck-0.5.0.crate) = 11517
 SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
 SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hermit-abi-0.4.0.crate) = fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc
+SIZE (rust/crates/hermit-abi-0.4.0.crate) = 16310
 SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
 SIZE (rust/crates/hex-0.4.3.crate) = 13299
-SHA256 (rust/crates/icrate-0.0.4.crate) = 99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319
-SIZE (rust/crates/icrate-0.0.4.crate) = 1040120
 SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
 SIZE (rust/crates/idna-0.5.0.crate) = 271940
 SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
@@ -331,12 +335,14 @@ SHA256 (rust/crates/input-0.9.0.crate) = 7911ce3db9c10c5ab4a35c49af778a5f9a827bd
 SIZE (rust/crates/input-0.9.0.crate) = 40668
 SHA256 (rust/crates/input-sys-1.18.0.crate) = bd4f5b4d1c00331c5245163aacfe5f20be75b564c7112d45893d4ae038119eb0
 SIZE (rust/crates/input-sys-1.18.0.crate) = 365567
-SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
-SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/instant-0.1.13.crate) = e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222
+SIZE (rust/crates/instant-0.1.13.crate) = 6305
 SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
 SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
 SHA256 (rust/crates/io-lifetimes-2.0.3.crate) = 5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c
 SIZE (rust/crates/io-lifetimes-2.0.3.crate) = 29216
+SHA256 (rust/crates/is_terminal_polyfill-1.70.0.crate) = f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800
+SIZE (rust/crates/is_terminal_polyfill-1.70.0.crate) = 7451
 SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
 SIZE (rust/crates/itertools-0.12.1.crate) = 137761
 SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
@@ -345,10 +351,12 @@ SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17
 SIZE (rust/crates/jni-0.21.1.crate) = 105028
 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
 SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
-SHA256 (rust/crates/jobserver-0.1.28.crate) = ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6
-SIZE (rust/crates/jobserver-0.1.28.crate) = 25543
+SHA256 (rust/crates/jobserver-0.1.31.crate) = d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e
+SIZE (rust/crates/jobserver-0.1.31.crate) = 27306
 SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
 SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
+SHA256 (rust/crates/k9-0.12.0.crate) = 088bcebb5b68b1b14b64d7f05b0f802719250b97fdc0338ec42529ea777ed614
+SIZE (rust/crates/k9-0.12.0.crate) = 19914
 SHA256 (rust/crates/keyframe-1.1.1.crate) = 60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9
 SIZE (rust/crates/keyframe-1.1.1.crate) = 33573
 SHA256 (rust/crates/khronos_api-3.1.0.crate) = e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc
@@ -365,16 +373,16 @@ SHA256 (rust/crates/libadwaita-0.6.0.crate) = 91b4990248b9e1ec5e72094a2ccaea70ec
 SIZE (rust/crates/libadwaita-0.6.0.crate) = 108068
 SHA256 (rust/crates/libadwaita-sys-0.6.0.crate) = 23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8
 SIZE (rust/crates/libadwaita-sys-0.6.0.crate) = 26809
-SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
-SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libc-0.2.155.crate) = 97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c
+SIZE (rust/crates/libc-0.2.155.crate) = 743539
 SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
 SIZE (rust/crates/libloading-0.8.3.crate) = 28480
 SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
 SIZE (rust/crates/libm-0.2.8.crate) = 113450
-SHA256 (rust/crates/libredox-0.0.1.crate) = 85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8
-SIZE (rust/crates/libredox-0.0.1.crate) = 4212
 SHA256 (rust/crates/libredox-0.0.2.crate) = 3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607
 SIZE (rust/crates/libredox-0.0.2.crate) = 4538
+SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
+SIZE (rust/crates/libredox-0.1.3.crate) = 6068
 SHA256 (rust/crates/libseat-0.2.1.crate) = 54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e
 SIZE (rust/crates/libseat-0.2.1.crate) = 6620
 SHA256 (rust/crates/libseat-sys-0.1.7.crate) = 3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34
@@ -387,22 +395,22 @@ SHA256 (rust/crates/libudev-sys-0.1.4.crate) = 3c8469b4a23b962c1396b9b451dda50ef
 SIZE (rust/crates/libudev-sys-0.1.4.crate) = 6177
 SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519
 SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776
-SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
-SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89
+SIZE (rust/crates/linux-raw-sys-0.4.14.crate) = 1826665
 SHA256 (rust/crates/linux-raw-sys-0.6.4.crate) = f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4
 SIZE (rust/crates/linux-raw-sys-0.6.4.crate) = 1505350
 SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
 SIZE (rust/crates/log-0.4.21.crate) = 43442
-SHA256 (rust/crates/loom-0.7.1.crate) = 7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175
-SIZE (rust/crates/loom-0.7.1.crate) = 73744
+SHA256 (rust/crates/loom-0.7.2.crate) = 419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca
+SIZE (rust/crates/loom-0.7.2.crate) = 73989
 SHA256 (rust/crates/mac-notification-sys-0.6.1.crate) = 51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64
 SIZE (rust/crates/mac-notification-sys-0.6.1.crate) = 12242
 SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
 SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
 SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
 SIZE (rust/crates/matchers-0.1.0.crate) = 6948
-SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
-SIZE (rust/crates/memchr-2.7.2.crate) = 96220
+SHA256 (rust/crates/memchr-2.7.4.crate) = 78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3
+SIZE (rust/crates/memchr-2.7.4.crate) = 96670
 SHA256 (rust/crates/memmap2-0.8.0.crate) = 43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed
 SIZE (rust/crates/memmap2-0.8.0.crate) = 30990
 SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
@@ -417,14 +425,14 @@ SHA256 (rust/crates/miette-derive-5.10.0.crate) = 49e7bc1560b95a3c4a25d03de42fe7
 SIZE (rust/crates/miette-derive-5.10.0.crate) = 16062
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
-SIZE (rust/crates/miniz_oxide-0.7.2.crate) = 55731
-SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7
-SIZE (rust/crates/ndk-0.8.0.crate) = 79770
+SHA256 (rust/crates/miniz_oxide-0.7.4.crate) = b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08
+SIZE (rust/crates/miniz_oxide-0.7.4.crate) = 56119
+SHA256 (rust/crates/ndk-0.9.0.crate) = c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4
+SIZE (rust/crates/ndk-0.9.0.crate) = 84865
 SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b
 SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205
-SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691
-SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233
+SHA256 (rust/crates/ndk-sys-0.6.0+11769913.crate) = ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873
+SIZE (rust/crates/ndk-sys-0.6.0+11769913.crate) = 329984
 SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
 SIZE (rust/crates/nix-0.26.4.crate) = 279099
 SHA256 (rust/crates/nix-0.27.1.crate) = 2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053
@@ -437,8 +445,8 @@ SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb4545924260
 SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
-SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
-SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num-traits-0.2.19.crate) = 071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841
+SIZE (rust/crates/num-traits-0.2.19.crate) = 51631
 SHA256 (rust/crates/num_enum-0.7.2.crate) = 02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845
 SIZE (rust/crates/num_enum-0.7.2.crate) = 18571
 SHA256 (rust/crates/num_enum_derive-0.7.2.crate) = 681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b
@@ -447,12 +455,40 @@ SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef
 SIZE (rust/crates/objc-0.2.7.crate) = 22036
 SHA256 (rust/crates/objc-foundation-0.1.1.crate) = 1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9
 SIZE (rust/crates/objc-foundation-0.1.1.crate) = 9063
-SHA256 (rust/crates/objc-sys-0.3.2.crate) = c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459
-SIZE (rust/crates/objc-sys-0.3.2.crate) = 19647
-SHA256 (rust/crates/objc2-0.4.1.crate) = 559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d
-SIZE (rust/crates/objc2-0.4.1.crate) = 162783
-SHA256 (rust/crates/objc2-encode-3.0.0.crate) = d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666
-SIZE (rust/crates/objc2-encode-3.0.0.crate) = 17934
+SHA256 (rust/crates/objc-sys-0.3.5.crate) = cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310
+SIZE (rust/crates/objc-sys-0.3.5.crate) = 20560
+SHA256 (rust/crates/objc2-0.5.2.crate) = 46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804
+SIZE (rust/crates/objc2-0.5.2.crate) = 199204
+SHA256 (rust/crates/objc2-app-kit-0.2.2.crate) = e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff
+SIZE (rust/crates/objc2-app-kit-0.2.2.crate) = 337435
+SHA256 (rust/crates/objc2-cloud-kit-0.2.2.crate) = 74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009
+SIZE (rust/crates/objc2-cloud-kit-0.2.2.crate) = 27094
+SHA256 (rust/crates/objc2-contacts-0.2.2.crate) = a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889
+SIZE (rust/crates/objc2-contacts-0.2.2.crate) = 17094
+SHA256 (rust/crates/objc2-core-data-0.2.2.crate) = 617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef
+SIZE (rust/crates/objc2-core-data-0.2.2.crate) = 30575
+SHA256 (rust/crates/objc2-core-image-0.2.2.crate) = 55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80
+SIZE (rust/crates/objc2-core-image-0.2.2.crate) = 20050
+SHA256 (rust/crates/objc2-core-location-0.2.2.crate) = 000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781
+SIZE (rust/crates/objc2-core-location-0.2.2.crate) = 13100
+SHA256 (rust/crates/objc2-encode-4.0.3.crate) = 7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8
+SIZE (rust/crates/objc2-encode-4.0.3.crate) = 19478
+SHA256 (rust/crates/objc2-foundation-0.2.2.crate) = 0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8
+SIZE (rust/crates/objc2-foundation-0.2.2.crate) = 249330
+SHA256 (rust/crates/objc2-link-presentation-0.2.2.crate) = a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398
+SIZE (rust/crates/objc2-link-presentation-0.2.2.crate) = 4440
+SHA256 (rust/crates/objc2-metal-0.2.2.crate) = dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6
+SIZE (rust/crates/objc2-metal-0.2.2.crate) = 75276
+SHA256 (rust/crates/objc2-quartz-core-0.2.2.crate) = e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a
+SIZE (rust/crates/objc2-quartz-core-0.2.2.crate) = 21306
+SHA256 (rust/crates/objc2-symbols-0.2.2.crate) = 0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc
+SIZE (rust/crates/objc2-symbols-0.2.2.crate) = 3626
+SHA256 (rust/crates/objc2-ui-kit-0.2.2.crate) = b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f
+SIZE (rust/crates/objc2-ui-kit-0.2.2.crate) = 303111
+SHA256 (rust/crates/objc2-uniform-type-identifiers-0.2.2.crate) = 44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe
+SIZE (rust/crates/objc2-uniform-type-identifiers-0.2.2.crate) = 6017
+SHA256 (rust/crates/objc2-user-notifications-0.2.2.crate) = 76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3
+SIZE (rust/crates/objc2-user-notifications-0.2.2.crate) = 9600
 SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b
 SIZE (rust/crates/objc_id-0.1.1.crate) = 3258
 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
@@ -461,22 +497,24 @@ SHA256 (rust/crates/option-ext-0.2.0.crate) = 04744f49eae99ab78e0d5c0b603ab218f5
 SIZE (rust/crates/option-ext-0.2.0.crate) = 7345
 SHA256 (rust/crates/orbclient-0.3.47.crate) = 52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166
 SIZE (rust/crates/orbclient-0.3.47.crate) = 1324509
+SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
+SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
 SHA256 (rust/crates/ordered-stream-0.2.0.crate) = 9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50
 SIZE (rust/crates/ordered-stream-0.2.0.crate) = 19077
 SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
 SIZE (rust/crates/overload-0.1.1.crate) = 24439
-SHA256 (rust/crates/pango-0.19.3.crate) = b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1
-SIZE (rust/crates/pango-0.19.3.crate) = 44890
-SHA256 (rust/crates/pango-sys-0.19.0.crate) = f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea
-SIZE (rust/crates/pango-sys-0.19.0.crate) = 24787
-SHA256 (rust/crates/pangocairo-0.19.2.crate) = 6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687
-SIZE (rust/crates/pangocairo-0.19.2.crate) = 5564
-SHA256 (rust/crates/pangocairo-sys-0.19.0.crate) = 01bd0597ae45983f9e8b7f73afc42238426cd3fbb44a9cf14fd881a4ae08f1e4
-SIZE (rust/crates/pangocairo-sys-0.19.0.crate) = 3277
+SHA256 (rust/crates/pango-0.19.8.crate) = 3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd
+SIZE (rust/crates/pango-0.19.8.crate) = 45388
+SHA256 (rust/crates/pango-sys-0.19.8.crate) = ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0
+SIZE (rust/crates/pango-sys-0.19.8.crate) = 24861
+SHA256 (rust/crates/pangocairo-0.19.8.crate) = e4c8b43c02ec1c4e16daf7fc50fbce6b8ead5705c18ae56274f703233cce1cd9
+SIZE (rust/crates/pangocairo-0.19.8.crate) = 5563
+SHA256 (rust/crates/pangocairo-sys-0.19.8.crate) = 591904498438879785f5b7a2fdf7c38e9ec08c514b93c614b5c3b48cd11dd8d7
+SIZE (rust/crates/pangocairo-sys-0.19.8.crate) = 3313
 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
 SIZE (rust/crates/parking-2.2.0.crate) = 9730
-SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
-SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/paste-1.0.15.crate) = 57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a
+SIZE (rust/crates/paste-1.0.15.crate) = 18374
 SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
 SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
 SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
@@ -487,12 +525,16 @@ SHA256 (rust/crates/phf_macros-0.11.2.crate) = 3444646e286606587e49f3bcf1679b8ce
 SIZE (rust/crates/phf_macros-0.11.2.crate) = 4748
 SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
 SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
-SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
-SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3
+SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
+SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
+SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
-SHA256 (rust/crates/piper-0.2.1.crate) = 668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4
-SIZE (rust/crates/piper-0.2.1.crate) = 15878
+SHA256 (rust/crates/piper-0.2.3.crate) = ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391
+SIZE (rust/crates/piper-0.2.3.crate) = 15924
 SHA256 (rust/crates/pipewire-0.8.0.crate) = 08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda
 SIZE (rust/crates/pipewire-0.8.0.crate) = 52103
 SHA256 (rust/crates/pipewire-sys-0.8.0.crate) = 849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112
@@ -507,14 +549,16 @@ SHA256 (rust/crates/png-0.17.13.crate) = 06e4b0d3d1312775e782c86c91a111aa1f910cb
 SIZE (rust/crates/png-0.17.13.crate) = 103176
 SHA256 (rust/crates/polling-2.8.0.crate) = 4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce
 SIZE (rust/crates/polling-2.8.0.crate) = 43554
-SHA256 (rust/crates/polling-3.6.0.crate) = e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6
-SIZE (rust/crates/polling-3.6.0.crate) = 58128
+SHA256 (rust/crates/polling-3.7.2.crate) = a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b
+SIZE (rust/crates/polling-3.7.2.crate) = 57988
 SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
 SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
 SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
 SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
 SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
 SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/pretty_assertions-1.4.0.crate) = af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66
+SIZE (rust/crates/pretty_assertions-1.4.0.crate) = 78846
 SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
 SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
 SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
@@ -523,8 +567,8 @@ SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08c
 SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e
-SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200
+SHA256 (rust/crates/proc-macro2-1.0.86.crate) = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
+SIZE (rust/crates/proc-macro2-1.0.86.crate) = 48958
 SHA256 (rust/crates/profiling-1.0.15.crate) = 43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58
 SIZE (rust/crates/profiling-1.0.15.crate) = 14255
 SHA256 (rust/crates/profiling-procmacros-1.0.15.crate) = 8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd
@@ -539,8 +583,8 @@ SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7
 SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923
 SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
 SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
-SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
-SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
 SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
 SIZE (rust/crates/rand-0.8.5.crate) = 87113
 SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
@@ -549,38 +593,36 @@ SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9ba
 SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
 SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f
 SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
-SHA256 (rust/crates/raw-window-handle-0.6.0.crate) = 42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544
-SIZE (rust/crates/raw-window-handle-0.6.0.crate) = 17224
-SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29
-SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404
+SHA256 (rust/crates/raw-window-handle-0.6.2.crate) = 20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539
+SIZE (rust/crates/raw-window-handle-0.6.2.crate) = 20234
 SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
 SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
-SHA256 (rust/crates/redox_users-0.4.4.crate) = a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4
-SIZE (rust/crates/redox_users-0.4.4.crate) = 15438
-SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
-SIZE (rust/crates/regex-1.10.4.crate) = 253191
+SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
+SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/regex-1.10.5.crate) = b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f
+SIZE (rust/crates/regex-1.10.5.crate) = 253805
 SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
 SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
-SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
-SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-automata-0.4.7.crate) = 38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df
+SIZE (rust/crates/regex-automata-0.4.7.crate) = 617582
 SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
 SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
-SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
-SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/regex-syntax-0.8.4.crate) = 7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b
+SIZE (rust/crates/regex-syntax-0.8.4.crate) = 347577
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
 SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
 SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
 SHA256 (rust/crates/rustix-0.37.27.crate) = fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2
 SIZE (rust/crates/rustix-0.37.27.crate) = 324534
-SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
-SIZE (rust/crates/rustix-0.38.32.crate) = 376999
-SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4
-SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
+SHA256 (rust/crates/rustix-0.38.34.crate) = 70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f
+SIZE (rust/crates/rustix-0.38.34.crate) = 365160
+SHA256 (rust/crates/rustversion-1.0.17.crate) = 955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6
+SIZE (rust/crates/rustversion-1.0.17.crate) = 17621
 SHA256 (rust/crates/rusty-fork-0.3.0.crate) = cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f
 SIZE (rust/crates/rusty-fork-0.3.0.crate) = 19881
-SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
-SIZE (rust/crates/ryu-1.0.17.crate) = 47537
+SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f
+SIZE (rust/crates/ryu-1.0.18.crate) = 47713
 SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
 SIZE (rust/crates/same-file-1.0.6.crate) = 10183
 SHA256 (rust/crates/scan_fmt-0.2.6.crate) = 0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248
@@ -589,26 +631,26 @@ SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
 SHA256 (rust/crates/sd-notify-0.4.1.crate) = 621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32
 SIZE (rust/crates/sd-notify-0.4.1.crate) = 10085
-SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
-SIZE (rust/crates/semver-1.0.22.crate) = 30446
-SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
-SIZE (rust/crates/serde-1.0.197.crate) = 77087
-SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
-SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
-SHA256 (rust/crates/serde_json-1.0.115.crate) = 12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd
-SIZE (rust/crates/serde_json-1.0.115.crate) = 147100
-SHA256 (rust/crates/serde_repr-0.1.18.crate) = 0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb
-SIZE (rust/crates/serde_repr-0.1.18.crate) = 9974
-SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
-SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b
+SIZE (rust/crates/semver-1.0.23.crate) = 30622
+SHA256 (rust/crates/serde-1.0.203.crate) = 7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094
+SIZE (rust/crates/serde-1.0.203.crate) = 77935
+SHA256 (rust/crates/serde_derive-1.0.203.crate) = 500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba
+SIZE (rust/crates/serde_derive-1.0.203.crate) = 55867
+SHA256 (rust/crates/serde_json-1.0.117.crate) = 455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3
+SIZE (rust/crates/serde_json-1.0.117.crate) = 146921
+SHA256 (rust/crates/serde_repr-0.1.19.crate) = 6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9
+SIZE (rust/crates/serde_repr-0.1.19.crate) = 9997
+SHA256 (rust/crates/serde_spanned-0.6.6.crate) = 79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0
+SIZE (rust/crates/serde_spanned-0.6.6.crate) = 9120
 SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
 SIZE (rust/crates/sha1-0.10.6.crate) = 13517
 SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
 SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
 SIZE (rust/crates/shlex-1.3.0.crate) = 18713
-SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
-SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signal-hook-registry-1.4.2.crate) = a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1
+SIZE (rust/crates/signal-hook-registry-1.4.2.crate) = 18064
 SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
 SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
 SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
@@ -619,8 +661,8 @@ SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47
 SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
 SHA256 (rust/crates/smithay-client-toolkit-0.18.1.crate) = 922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a
 SIZE (rust/crates/smithay-client-toolkit-0.18.1.crate) = 129920
-SHA256 (rust/crates/smol_str-0.2.1.crate) = e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49
-SIZE (rust/crates/smol_str-0.2.1.crate) = 14689
+SHA256 (rust/crates/smol_str-0.2.2.crate) = dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead
+SIZE (rust/crates/smol_str-0.2.2.crate) = 15840
 SHA256 (rust/crates/socket2-0.4.10.crate) = 9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d
 SIZE (rust/crates/socket2-0.4.10.crate) = 45697
 SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
@@ -629,8 +671,8 @@ SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f0
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
 SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
 SIZE (rust/crates/syn-1.0.109.crate) = 237611
-SHA256 (rust/crates/syn-2.0.55.crate) = 002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0
-SIZE (rust/crates/syn-2.0.55.crate) = 254901
+SHA256 (rust/crates/syn-2.0.67.crate) = ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90
+SIZE (rust/crates/syn-2.0.67.crate) = 265024
 SHA256 (rust/crates/system-deps-6.2.2.crate) = a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349
 SIZE (rust/crates/system-deps-6.2.2.crate) = 25546
 SHA256 (rust/crates/target-lexicon-0.12.14.crate) = e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f
@@ -639,30 +681,32 @@ SHA256 (rust/crates/tauri-winrt-notification-0.1.3.crate) = 006851c9ccefa3c38a76
 SIZE (rust/crates/tauri-winrt-notification-0.1.3.crate) = 42440
 SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
 SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
-SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297
-SIZE (rust/crates/thiserror-1.0.58.crate) = 21025
-SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7
-SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645
+SHA256 (rust/crates/terminal_size-0.2.6.crate) = 8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237
+SIZE (rust/crates/terminal_size-0.2.6.crate) = 10585
+SHA256 (rust/crates/thiserror-1.0.61.crate) = c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709
+SIZE (rust/crates/thiserror-1.0.61.crate) = 21264
+SHA256 (rust/crates/thiserror-impl-1.0.61.crate) = 46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533
+SIZE (rust/crates/thiserror-impl-1.0.61.crate) = 15786
 SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
 SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
-SHA256 (rust/crates/time-0.3.34.crate) = c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749
-SIZE (rust/crates/time-0.3.34.crate) = 118430
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
 SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
 SIZE (rust/crates/time-core-0.1.2.crate) = 7191
 SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
 SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
 SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
 SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
-SHA256 (rust/crates/toml-0.8.12.crate) = e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3
-SIZE (rust/crates/toml-0.8.12.crate) = 51145
-SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
-SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml-0.8.14.crate) = 6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335
+SIZE (rust/crates/toml-0.8.14.crate) = 50645
+SHA256 (rust/crates/toml_datetime-0.6.6.crate) = 4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf
+SIZE (rust/crates/toml_datetime-0.6.6.crate) = 11698
 SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
 SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
 SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
 SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
-SHA256 (rust/crates/toml_edit-0.22.9.crate) = 8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4
-SIZE (rust/crates/toml_edit-0.22.9.crate) = 104173
+SHA256 (rust/crates/toml_edit-0.22.14.crate) = f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38
+SIZE (rust/crates/toml_edit-0.22.14.crate) = 103761
 SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
 SIZE (rust/crates/tracing-0.1.40.crate) = 79459
 SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
@@ -693,12 +737,12 @@ SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f
 SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
 SHA256 (rust/crates/unicode-segmentation-1.11.0.crate) = d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202
 SIZE (rust/crates/unicode-segmentation-1.11.0.crate) = 102740
-SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
-SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
-SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
-SIZE (rust/crates/url-2.5.0.crate) = 78605
-SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
-SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/unicode-width-0.1.13.crate) = 0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d
+SIZE (rust/crates/unicode-width-0.1.13.crate) = 457228
+SHA256 (rust/crates/url-2.5.2.crate) = 22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c
+SIZE (rust/crates/url-2.5.2.crate) = 79704
+SHA256 (rust/crates/utf8parse-0.2.2.crate) = 06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821
+SIZE (rust/crates/utf8parse-0.2.2.crate) = 13499
 SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
 SIZE (rust/crates/valuable-0.1.0.crate) = 27718
 SHA256 (rust/crates/version-compare-0.2.0.crate) = 852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b
@@ -707,8 +751,8 @@ SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7
 SIZE (rust/crates/version_check-0.9.4.crate) = 14895
 SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
 SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
-SHA256 (rust/crates/waker-fn-1.1.1.crate) = f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690
-SIZE (rust/crates/waker-fn-1.1.1.crate) = 6323
+SHA256 (rust/crates/waker-fn-1.2.0.crate) = 317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7
+SIZE (rust/crates/waker-fn-1.2.0.crate) = 6685
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
 SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
@@ -725,48 +769,56 @@ SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a
 SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
 SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
 SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
-SHA256 (rust/crates/wayland-backend-0.3.3.crate) = 9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40
-SIZE (rust/crates/wayland-backend-0.3.3.crate) = 70455
-SHA256 (rust/crates/wayland-client-0.31.2.crate) = 82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f
-SIZE (rust/crates/wayland-client-0.31.2.crate) = 62976
+SHA256 (rust/crates/wayland-backend-0.3.4.crate) = 34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07
+SIZE (rust/crates/wayland-backend-0.3.4.crate) = 70797
+SHA256 (rust/crates/wayland-client-0.31.3.crate) = 1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133
+SIZE (rust/crates/wayland-client-0.31.3.crate) = 63081
 SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
 SIZE (rust/crates/wayland-csd-frame-0.3.0.crate) = 5696
-SHA256 (rust/crates/wayland-cursor-0.31.1.crate) = 71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba
-SIZE (rust/crates/wayland-cursor-0.31.1.crate) = 6883
-SHA256 (rust/crates/wayland-egl-0.32.0.crate) = 355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2
-SIZE (rust/crates/wayland-egl-0.32.0.crate) = 4026
+SHA256 (rust/crates/wayland-cursor-0.31.3.crate) = a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9
+SIZE (rust/crates/wayland-cursor-0.31.3.crate) = 7520
+SHA256 (rust/crates/wayland-egl-0.32.1.crate) = 18cede1c33845ccd8fcebf7f107595170abf0ad0a28d47c50b444e06019b16e8
+SIZE (rust/crates/wayland-egl-0.32.1.crate) = 4025
 SHA256 (rust/crates/wayland-protocols-0.31.2.crate) = 8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4
 SIZE (rust/crates/wayland-protocols-0.31.2.crate) = 147062
-SHA256 (rust/crates/wayland-protocols-misc-0.2.0.crate) = bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e
-SIZE (rust/crates/wayland-protocols-misc-0.2.0.crate) = 13627
+SHA256 (rust/crates/wayland-protocols-0.32.1.crate) = 83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c
+SIZE (rust/crates/wayland-protocols-0.32.1.crate) = 165198
+SHA256 (rust/crates/wayland-protocols-misc-0.3.1.crate) = e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331
+SIZE (rust/crates/wayland-protocols-misc-0.3.1.crate) = 13825
 SHA256 (rust/crates/wayland-protocols-plasma-0.2.0.crate) = 23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479
 SIZE (rust/crates/wayland-protocols-plasma-0.2.0.crate) = 59992
 SHA256 (rust/crates/wayland-protocols-wlr-0.2.0.crate) = ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6
 SIZE (rust/crates/wayland-protocols-wlr-0.2.0.crate) = 25804
-SHA256 (rust/crates/wayland-scanner-0.31.1.crate) = 63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283
-SIZE (rust/crates/wayland-scanner-0.31.1.crate) = 35419
-SHA256 (rust/crates/wayland-server-0.31.1.crate) = 00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7
-SIZE (rust/crates/wayland-server-0.31.1.crate) = 51990
-SHA256 (rust/crates/wayland-sys-0.31.1.crate) = 15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af
-SIZE (rust/crates/wayland-sys-0.31.1.crate) = 8577
+SHA256 (rust/crates/wayland-protocols-wlr-0.3.1.crate) = a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24
+SIZE (rust/crates/wayland-protocols-wlr-0.3.1.crate) = 26003
+SHA256 (rust/crates/wayland-scanner-0.31.2.crate) = 67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565
+SIZE (rust/crates/wayland-scanner-0.31.2.crate) = 35644
+SHA256 (rust/crates/wayland-server-0.31.2.crate) = 63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559
+SIZE (rust/crates/wayland-server-0.31.2.crate) = 52069
+SHA256 (rust/crates/wayland-sys-0.31.2.crate) = 105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12
+SIZE (rust/crates/wayland-sys-0.31.2.crate) = 8571
 SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
 SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
-SHA256 (rust/crates/web-time-0.2.4.crate) = aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0
-SIZE (rust/crates/web-time-0.2.4.crate) = 15743
+SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
+SIZE (rust/crates/web-time-1.1.0.crate) = 18026
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
-SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
+SHA256 (rust/crates/winapi-util-0.1.8.crate) = 4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b
+SIZE (rust/crates/winapi-util-0.1.8.crate) = 12416
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
-SIZE (rust/crates/windows-0.48.0.crate) = 11864177
 SHA256 (rust/crates/windows-0.51.1.crate) = ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9
 SIZE (rust/crates/windows-0.51.1.crate) = 12250614
+SHA256 (rust/crates/windows-0.54.0.crate) = 9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49
+SIZE (rust/crates/windows-0.54.0.crate) = 11096265
 SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64
 SIZE (rust/crates/windows-core-0.51.1.crate) = 42364
+SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65
+SIZE (rust/crates/windows-core-0.54.0.crate) = 44015
+SHA256 (rust/crates/windows-result-0.1.2.crate) = 5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8
+SIZE (rust/crates/windows-result-0.1.2.crate) = 10601
 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
@@ -777,78 +829,82 @@ SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb36932
 SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
 SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
 SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
-SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
-SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
 SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
 SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
-SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
 SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
 SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
 SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
 SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
-SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
-SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
 SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
 SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
 SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
 SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
-SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
-SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
 SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
 SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
 SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
 SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
-SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
-SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
 SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
 SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
 SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
 SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
-SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
-SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
 SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
 SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
 SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
-SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
 SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
 SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
 SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
 SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
-SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
-SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
-SHA256 (rust/crates/winit-0.29.15.crate) = 0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca
-SIZE (rust/crates/winit-0.29.15.crate) = 588797
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
+SHA256 (rust/crates/winit-0.30.3.crate) = 49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004
+SIZE (rust/crates/winit-0.30.3.crate) = 599585
 SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
 SIZE (rust/crates/winnow-0.5.40.crate) = 159316
-SHA256 (rust/crates/winnow-0.6.5.crate) = dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8
-SIZE (rust/crates/winnow-0.6.5.crate) = 159316
+SHA256 (rust/crates/winnow-0.6.13.crate) = 59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1
+SIZE (rust/crates/winnow-0.6.13.crate) = 162649
 SHA256 (rust/crates/x11-dl-2.21.0.crate) = 38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f
 SIZE (rust/crates/x11-dl-2.21.0.crate) = 66823
-SHA256 (rust/crates/x11rb-0.13.0.crate) = f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a
-SIZE (rust/crates/x11rb-0.13.0.crate) = 222396
-SHA256 (rust/crates/x11rb-protocol-0.13.0.crate) = e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34
-SIZE (rust/crates/x11rb-protocol-0.13.0.crate) = 507838
+SHA256 (rust/crates/x11rb-0.13.1.crate) = 5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12
+SIZE (rust/crates/x11rb-0.13.1.crate) = 223916
+SHA256 (rust/crates/x11rb-protocol-0.13.1.crate) = ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d
+SIZE (rust/crates/x11rb-protocol-0.13.1.crate) = 508522
 SHA256 (rust/crates/xcursor-0.3.5.crate) = 6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911
 SIZE (rust/crates/xcursor-0.3.5.crate) = 6256
-SHA256 (rust/crates/xdg-home-1.1.0.crate) = 21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e
-SIZE (rust/crates/xdg-home-1.1.0.crate) = 3600
+SHA256 (rust/crates/xdg-home-1.2.0.crate) = ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8
+SIZE (rust/crates/xdg-home-1.2.0.crate) = 3881
 SHA256 (rust/crates/xkbcommon-0.7.0.crate) = 13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e
 SIZE (rust/crates/xkbcommon-0.7.0.crate) = 58896
 SHA256 (rust/crates/xkbcommon-dl-0.4.2.crate) = d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5
 SIZE (rust/crates/xkbcommon-dl-0.4.2.crate) = 5879
-SHA256 (rust/crates/xkeysym-0.2.0.crate) = 054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621
-SIZE (rust/crates/xkeysym-0.2.0.crate) = 101431
-SHA256 (rust/crates/xml-rs-0.8.19.crate) = 0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a
-SIZE (rust/crates/xml-rs-0.8.19.crate) = 54051
-SHA256 (rust/crates/xshell-0.2.5.crate) = ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad
-SIZE (rust/crates/xshell-0.2.5.crate) = 24242
-SHA256 (rust/crates/xshell-macros-0.2.5.crate) = 7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e
-SIZE (rust/crates/xshell-macros-0.2.5.crate) = 2845
+SHA256 (rust/crates/xkeysym-0.2.1.crate) = b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56
+SIZE (rust/crates/xkeysym-0.2.1.crate) = 103129
+SHA256 (rust/crates/xml-rs-0.8.20.crate) = 791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193
+SIZE (rust/crates/xml-rs-0.8.20.crate) = 54443
+SHA256 (rust/crates/xshell-0.2.6.crate) = 6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437
+SIZE (rust/crates/xshell-0.2.6.crate) = 24472
+SHA256 (rust/crates/xshell-macros-0.2.6.crate) = 9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852
+SIZE (rust/crates/xshell-macros-0.2.6.crate) = 2843
+SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec
+SIZE (rust/crates/yansi-0.5.1.crate) = 16525
 SHA256 (rust/crates/yansi-term-0.1.2.crate) = fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1
 SIZE (rust/crates/yansi-term-0.1.2.crate) = 14342
 SHA256 (rust/crates/zbus-3.15.2.crate) = 675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6
@@ -857,17 +913,17 @@ SHA256 (rust/crates/zbus_macros-3.15.2.crate) = 7131497b0f887e8061b430c530240063
 SIZE (rust/crates/zbus_macros-3.15.2.crate) = 25883
 SHA256 (rust/crates/zbus_names-2.6.1.crate) = 437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d
 SIZE (rust/crates/zbus_names-2.6.1.crate) = 9640
-SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
-SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
-SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
-SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (rust/crates/zerocopy-0.7.34.crate) = ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087
+SIZE (rust/crates/zerocopy-0.7.34.crate) = 151177
+SHA256 (rust/crates/zerocopy-derive-0.7.34.crate) = 15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b
+SIZE (rust/crates/zerocopy-derive-0.7.34.crate) = 37907
 SHA256 (rust/crates/zvariant-3.15.2.crate) = 4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db
 SIZE (rust/crates/zvariant-3.15.2.crate) = 75401
 SHA256 (rust/crates/zvariant_derive-3.15.2.crate) = 37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9
 SIZE (rust/crates/zvariant_derive-3.15.2.crate) = 10936
 SHA256 (rust/crates/zvariant_utils-1.0.1.crate) = 7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200
 SIZE (rust/crates/zvariant_utils-1.0.1.crate) = 6223
-SHA256 (Smithay-smithay-c5e9a697e41f50dc56b918d9ef1e3d2e52c84ac0_GH0.tar.gz) = 413526c943bfbaa6377e09319a5e54d6d300ae8077fe55f8f9339d1291b1f6fc
-SIZE (Smithay-smithay-c5e9a697e41f50dc56b918d9ef1e3d2e52c84ac0_GH0.tar.gz) = 739810
-SHA256 (YaLTeR-niri-v0.1.5_GH0.tar.gz) = c5a9aec71145af4e02c09048f157036f6eff65191fbecf4c5b128d8d3c1a6b23
-SIZE (YaLTeR-niri-v0.1.5_GH0.tar.gz) = 293845
+SHA256 (Smithay-smithay-234586dbea6bc084cb72a32f164997e47ea36b2b_GH0.tar.gz) = 223fd0c79a34f31af8e872f48e7bd0d8a60d63e727e1acd33aba469dc25095ec
+SIZE (Smithay-smithay-234586dbea6bc084cb72a32f164997e47ea36b2b_GH0.tar.gz) = 751222
+SHA256 (YaLTeR-niri-v0.1.7_GH0.tar.gz) = 2ce7a450b550164f99d6fd6d2815c04f2160fbf932f9c0d244b7b1e3481c9b21
+SIZE (YaLTeR-niri-v0.1.7_GH0.tar.gz) = 354660
diff --git a/x11/aminal/Makefile b/x11/aminal/Makefile
index 01d7750cfb12..42fcd2608e72 100644
--- a/x11/aminal/Makefile
+++ b/x11/aminal/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aminal
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	20
+PORTREVISION=	22
 CATEGORIES=	x11
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/x11/cliphist/Makefile b/x11/cliphist/Makefile
index 7a5ab8bb3fa1..25de5301465c 100644
--- a/x11/cliphist/Makefile
+++ b/x11/cliphist/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cliphist
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/clipman/Makefile b/x11/clipman/Makefile
index 07acc328ac6c..956a85b4b96d 100644
--- a/x11/clipman/Makefile
+++ b/x11/clipman/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	clipman
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/darktile/Makefile b/x11/darktile/Makefile
index c20b5117ece7..e0b505dbdb6c 100644
--- a/x11/darktile/Makefile
+++ b/x11/darktile/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	darktile
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.11
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/x11/foot/Makefile b/x11/foot/Makefile
index b4dc7186722c..aac0e154dd0c 100644
--- a/x11/foot/Makefile
+++ b/x11/foot/Makefile
@@ -1,8 +1,12 @@
 PORTNAME=	foot
 DISTVERSION=	1.17.2
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 MASTER_SITES=	https://codeberg.org/dnkl/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
+PATCH_SITES=	https://codeberg.org/dnkl/${PORTNAME}/commit/
+PATCHFILES+=	d229fd7fcc5a.patch:-p1 # https://codeberg.org/dnkl/foot/pulls/1726
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Fast, lightweight and minimalistic Wayland terminal emulator
 WWW=		https://codeberg.org/dnkl/foot
diff --git a/x11/foot/distinfo b/x11/foot/distinfo
index 480355dfe160..10f5460fb802 100644
--- a/x11/foot/distinfo
+++ b/x11/foot/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1713346005
 SHA256 (foot-1.17.2.tar.gz) = 6b6c52f3e6d9ad357b9704996ce3039523c87df7b8e00a9250f8858d16495bf6
 SIZE (foot-1.17.2.tar.gz) = 547484
+SHA256 (d229fd7fcc5a.patch) = ec49c2e491ad253723523ad3e98ac41000f258cbd789bdc5c6006992a8075580
+SIZE (d229fd7fcc5a.patch) = 1418
diff --git a/x11/gbsddialog/Makefile b/x11/gbsddialog/Makefile
index c00ee83fea31..d73ae27dd934 100644
--- a/x11/gbsddialog/Makefile
+++ b/x11/gbsddialog/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gbsddialog
-DISTVERSION=	0.9.0
+DISTVERSION=	0.9.1
 CATEGORIES=	x11
 MASTER_SITES=	${WWW}/releases/download/${PORTNAME}_${DISTVERSION:S/./-/g}/
 
diff --git a/x11/gbsddialog/distinfo b/x11/gbsddialog/distinfo
index d41af8eb2f43..2b21dcb6b87d 100644
--- a/x11/gbsddialog/distinfo
+++ b/x11/gbsddialog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709665535
-SHA256 (gbsddialog-0.9.0.tar.gz) = d35ae3bc81b7b603faa6da975d1c73e230af5a228ab8064f48761abac2b43f04
-SIZE (gbsddialog-0.9.0.tar.gz) = 77859
+TIMESTAMP = 1716812514
+SHA256 (gbsddialog-0.9.1.tar.gz) = f0340df37afc5c508ec21a443b26d60574039b0826ca819ddbbf60c2911f351d
+SIZE (gbsddialog-0.9.1.tar.gz) = 77892
diff --git a/x11/hyprcursor/Makefile b/x11/hyprcursor/Makefile
index e9c14918914e..643e163992f7 100644
--- a/x11/hyprcursor/Makefile
+++ b/x11/hyprcursor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hyprcursor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.8
+DISTVERSION=	0.1.9
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -20,7 +20,6 @@ USE_GITHUB=	yes
 USE_GNOME=	cairo librsvg2
 GH_ACCOUNT=	hyprwm
 PLIST_SUB=	VERSION=${DISTVERSION:C/-.*//}
-PLIST_SUB=	VERSION=0.1.7 # XXX 0.1.8 workaround
 
 # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01
 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h)
diff --git a/x11/hyprcursor/distinfo b/x11/hyprcursor/distinfo
index fd80ec4f3eb3..30668dc9563a 100644
--- a/x11/hyprcursor/distinfo
+++ b/x11/hyprcursor/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713612213
-SHA256 (hyprwm-hyprcursor-v0.1.8_GH0.tar.gz) = 853692df9b649b92453baf28cb4cbc38013ab624113a14a8efa507c71a3cb46a
-SIZE (hyprwm-hyprcursor-v0.1.8_GH0.tar.gz) = 25946
+TIMESTAMP = 1716576411
+SHA256 (hyprwm-hyprcursor-v0.1.9_GH0.tar.gz) = 313cd91436af343918e6dec4a666d4bf3666149ac3cac6f36c683b70304eada4
+SIZE (hyprwm-hyprcursor-v0.1.9_GH0.tar.gz) = 26111
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
diff --git a/x11/i3bar-river/Makefile b/x11/i3bar-river/Makefile
index 1de95bdf483b..ea3b24db9d2f 100644
--- a/x11/i3bar-river/Makefile
+++ b/x11/i3bar-river/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	0.1.7
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	Port of i3bar for river (and Hyprland)
+COMMENT=	Port of i3bar for wlroots-based compositors
 WWW=		https://github.com/MaxVerevkin/i3bar-river
 
 LICENSE=	GPLv3
diff --git a/x11/i3bar-river/pkg-descr b/x11/i3bar-river/pkg-descr
index ec36098a3510..e7c7db5aa968 100644
--- a/x11/i3bar-river/pkg-descr
+++ b/x11/i3bar-river/pkg-descr
@@ -1 +1,2 @@
-This is a port of i3bar for river and Hyprland.
+This is a port of i3bar for wlroots-based window managers.
+Tags/workspaces are implemented for river and hyprland.
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index 7bcc1fc22aeb..bf4cba45238a 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	kitty
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.33.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/x11/lavalauncher/Makefile b/x11/lavalauncher/Makefile
index 594832cf0942..c5cdf1e0a675 100644
--- a/x11/lavalauncher/Makefile
+++ b/x11/lavalauncher/Makefile
@@ -12,6 +12,8 @@ WWW=		https://git.sr.ht/~leon_plickat/lavalauncher
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	https://lists.sr.ht/~leon_plickat/lavalauncher/%3CCIPW63LE88JJ.2LYO5E6UAFLPB@m5%3E
+
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
diff --git a/x11/nwg-bar/Makefile b/x11/nwg-bar/Makefile
index 5c4442481d6a..37b1b1a10fc5 100644
--- a/x11/nwg-bar/Makefile
+++ b/x11/nwg-bar/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-bar
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.6
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/nwg-dock-hyprland/Makefile b/x11/nwg-dock-hyprland/Makefile
index 6c79fb9a1891..47be0687d39b 100644
--- a/x11/nwg-dock-hyprland/Makefile
+++ b/x11/nwg-dock-hyprland/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-dock-hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.7
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/nwg-dock/Makefile b/x11/nwg-dock/Makefile
index 288a0fb0955a..966aebf9f617 100644
--- a/x11/nwg-dock/Makefile
+++ b/x11/nwg-dock/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-dock
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.9
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/nwg-drawer/Makefile b/x11/nwg-drawer/Makefile
index 0623755dd19f..6948b3850870 100644
--- a/x11/nwg-drawer/Makefile
+++ b/x11/nwg-drawer/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-drawer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4.7
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/nwg-look/Makefile b/x11/nwg-look/Makefile
index b699861f7c63..6005124f072e 100644
--- a/x11/nwg-look/Makefile
+++ b/x11/nwg-look/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-look
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.7
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/nwg-menu/Makefile b/x11/nwg-menu/Makefile
index e3da2b742768..5432c3f00d23 100644
--- a/x11/nwg-menu/Makefile
+++ b/x11/nwg-menu/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nwg-menu
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.3
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index a60ef7608e30..9c5c494a31bb 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	plasma-workspace
-DISTVERSION=	${KDE_PLASMA_VERSION}
+DISTVERSION=	${KDE_PLASMA_VERSION}.1
 PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
@@ -7,7 +7,10 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma5 Plasma workspace
 WWW=		https://www.kde.org/plasma-desktop
 
-LIB_DEPENDS=	libcln.so:math/cln \
+BUILD_DEPENDS=	kio-extras>=23.08.5:devel/kio-extras \
+		wayland-protocols>=1.31:graphics/wayland-protocols
+LIB_DEPENDS=	libKUserFeedbackCore.so:deskutils/kuserfeedback \
+		libcln.so:math/cln \
 		libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -19,6 +22,7 @@ LIB_DEPENDS=	libcln.so:math/cln \
 		libxcb-util.so:x11/xcb-util
 RUN_DEPENDS=	ck-launch-session:sysutils/consolekit2 \
 		iceauth:x11/iceauth \
+		kio-extras>=23.08.5:devel/kio-extras \
 		xmessage:x11/xmessage \
 		xrdb:x11/xrdb \
 		xset:x11/xset \
@@ -36,13 +40,13 @@ USE_KDE=	activities activities-stats activitymanagerd archive attica \
 		coreaddons crash dbusaddons emoticons filemetadata globalaccel \
 		guiaddons holidays i18n iconthemes idletime init itemmodels \
 		itemviews jobwidgets js jsembed kcmutils kdeclarative kdesu \
-		kio kscreenlocker kwin layer-shell-qt libkscreen \
-		libksysguard newstuff notifications notifyconfig package parts \
-		people phonon plasma-framework plasma-integration prison pty runner \
-		service solid sonnet syntaxhighlighting texteditor textwidgets \
-		unitconversion wallet wayland widgetsaddons windowsystem \
-		xmlgui xmlrpcclient \
-		doctools:build ecm:build \
+		kio kquickcharts kscreenlocker kwin layer-shell-qt libkexiv2 \
+		libkscreen libksysguard newstuff notifications notifyconfig \
+		package parts people phonon plasma-framework plasma-integration \
+		prison pty runner service solid sonnet syntaxhighlighting \
+		texteditor textwidgets unitconversion wallet wayland \
+		widgetsaddons windowsystem xmlgui xmlrpcclient \
+		doctools:build ecm:build plasma-wayland-protocols:build \
 		breeze-icons:run breeze:run kded:run kquickcharts:run \
 		milou:run oxygen-icons5:run
 USE_QT=		concurrent core dbus declarative graphicaleffects gui network \
@@ -57,8 +61,14 @@ CPE_VENDOR=	kde
 
 CMAKE_OFF=	BUILD_TESTING
 
-# In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace:
-CONFLICTS_INSTALL=	plasma5-plasma-desktop-5.14.*
+OPTIONS_DEFINE=		PIPEWIRE
+OPTIONS_DEFAULT=	PIPEWIRE
+
+PIPEWIRE_DESC=		Screen capture via PipeWire
+
+PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
+PIPEWIRE_USE=		KDE=kpipewire
+PIPEWIRE_CMAKE_OFF=	-DDISABLE_PIPEWIRE:BOOL=ON
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/x11/plasma5-plasma-workspace/distinfo b/x11/plasma5-plasma-workspace/distinfo
index 9d27f44ed351..4ae47eefc878 100644
--- a/x11/plasma5-plasma-workspace/distinfo
+++ b/x11/plasma5-plasma-workspace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709790905
-SHA256 (KDE/plasma/5.27.11/plasma-workspace-5.27.11.tar.xz) = 07d69bc43660ec5335f250abb34c1059cef6cc64833838a7f0f749a4b4ee7add
-SIZE (KDE/plasma/5.27.11/plasma-workspace-5.27.11.tar.xz) = 19486864
+TIMESTAMP = 1718140164
+SHA256 (KDE/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz) = c742428daa957c57c4039aa015a3e6fb7e78b55bf5802b38d3b5ac7acf472bae
+SIZE (KDE/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz) = 19490624
diff --git a/x11/plasma5-plasma-workspace/files/patch-CMakeLists.txt b/x11/plasma5-plasma-workspace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..aeae194a35f9
--- /dev/null
+++ b/x11/plasma5-plasma-workspace/files/patch-CMakeLists.txt
@@ -0,0 +1,26 @@
+Don't auto-detect PipeWire
+
+--- CMakeLists.txt.orig	2024-05-31 12:34:07 UTC
++++ CMakeLists.txt
+@@ -47,7 +47,9 @@ find_package(KDED CONFIG REQUIRED)
+                     OPTIONAL_COMPONENTS DocTools)
+ 
+ find_package(KDED CONFIG REQUIRED)
+-find_package(KPipeWire CONFIG)
++if(NOT DISABLE_PIPEWIRE)
++    find_package(KPipeWire CONFIG)
++endif()
+ 
+ find_package(KF5NetworkManagerQt ${KF5_MIN_VERSION})
+ set_package_properties(KF5NetworkManagerQt PROPERTIES DESCRIPTION "Qt wrapper for NetworkManager API"
+@@ -152,7 +154,9 @@ endif()
+     set(HAVE_XFIXES 0)
+ endif()
+ 
+-pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
++if(NOT DISABLE_PIPEWIRE)
++    pkg_check_modules(PipeWire IMPORTED_TARGET libpipewire-0.3)
++endif()
+ add_feature_info(PipeWire PipeWire_FOUND "Required for Wayland screencasting")
+ 
+ if(PipeWire_FOUND)
diff --git a/x11/plasma5-plasma-workspace/pkg-plist b/x11/plasma5-plasma-workspace/pkg-plist
index 89abd277d6c0..d850766dc5a8 100644
--- a/x11/plasma5-plasma-workspace/pkg-plist
+++ b/x11/plasma5-plasma-workspace/pkg-plist
@@ -210,6 +210,7 @@ lib/libweather_ion.so.7.0.0
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_colors.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_cursortheme.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_desktoptheme.so
+%%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_feedback.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_fonts.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_icons.so
 %%QT_PLUGINDIR%%/plasma/kcms/systemsettings/kcm_lookandfeel.so
@@ -284,6 +285,7 @@ lib/systemd/user/plasma-xembedsniproxy.service
 share/applications/kcm_autostart.desktop
 share/applications/kcm_colors.desktop
 share/applications/kcm_cursortheme.desktop
+share/applications/kcm_feedback.desktop
 share/applications/kcm_fontinst.desktop
 share/applications/kcm_fonts.desktop
 share/applications/kcm_icons.desktop
@@ -301,6 +303,7 @@ share/applications/org.kde.plasmawindowed.desktop
 share/applications/org.kde.systemmonitor.desktop
 share/config.kcfg/colorssettings.kcfg
 share/config.kcfg/cursorthemesettings.kcfg
+share/config.kcfg/feedbacksettings.kcfg
 share/config.kcfg/fontssettings.kcfg
 share/config.kcfg/freespacenotifier.kcfg
 share/config.kcfg/iconssettingsbase.kcfg
@@ -504,6 +507,8 @@ share/doc/HTML/es/kcontrol/screenlocker/index.cache.bz2
 share/doc/HTML/es/kcontrol/screenlocker/index.docbook
 share/doc/HTML/es/klipper/index.cache.bz2
 share/doc/HTML/es/klipper/index.docbook
+share/doc/HTML/fr/kcontrol/desktopthemedetails/index.cache.bz2
+share/doc/HTML/fr/kcontrol/desktopthemedetails/index.docbook
 share/doc/HTML/fr/kcontrol/fontinst/index.cache.bz2
 share/doc/HTML/fr/kcontrol/fontinst/index.docbook
 share/doc/HTML/id/kcontrol/autostart/index.cache.bz2
@@ -832,6 +837,7 @@ share/kpackage/kcms/kcm_cursortheme/contents/ui/main.qml
 share/kpackage/kcms/kcm_desktoptheme/contents/ui/Hand.qml
 share/kpackage/kcms/kcm_desktoptheme/contents/ui/ThemePreview.qml
 share/kpackage/kcms/kcm_desktoptheme/contents/ui/main.qml
+share/kpackage/kcms/kcm_feedback/contents/ui/main.qml
 share/kpackage/kcms/kcm_fonts/contents/ui/FontWidget.qml
 share/kpackage/kcms/kcm_fonts/contents/ui/main.qml
 share/kpackage/kcms/kcm_icons/contents/ui/IconSizePopup.qml
@@ -1922,29 +1928,62 @@ share/locale/eo/LC_MESSAGES/kcm_autostart.mo
 share/locale/eo/LC_MESSAGES/kcm_colors.mo
 share/locale/eo/LC_MESSAGES/kcm_cursortheme.mo
 share/locale/eo/LC_MESSAGES/kcm_desktoptheme.mo
+share/locale/eo/LC_MESSAGES/kcm_feedback.mo
 share/locale/eo/LC_MESSAGES/kcm_fonts.mo
 share/locale/eo/LC_MESSAGES/kcm_icons.mo
+share/locale/eo/LC_MESSAGES/kcm_lookandfeel.mo
+share/locale/eo/LC_MESSAGES/kcm_nightcolor.mo
+share/locale/eo/LC_MESSAGES/kcm_notifications.mo
+share/locale/eo/LC_MESSAGES/kcm_regionandlang.mo
 share/locale/eo/LC_MESSAGES/kcm_style.mo
+share/locale/eo/LC_MESSAGES/kcm_users.mo
 share/locale/eo/LC_MESSAGES/kcminit.mo
 share/locale/eo/LC_MESSAGES/kfontinst.mo
+share/locale/eo/LC_MESSAGES/kholidays_calendar_plugin.mo
 share/locale/eo/LC_MESSAGES/kio5_applications.mo
+share/locale/eo/LC_MESSAGES/kio_desktop.mo
 share/locale/eo/LC_MESSAGES/klipper.mo
 share/locale/eo/LC_MESSAGES/krdb.mo
+share/locale/eo/LC_MESSAGES/krunner.mo
 share/locale/eo/LC_MESSAGES/ksmserver.mo
+share/locale/eo/LC_MESSAGES/libkicker.mo
 share/locale/eo/LC_MESSAGES/libkworkspace.mo
+share/locale/eo/LC_MESSAGES/libnotificationmanager.mo
 share/locale/eo/LC_MESSAGES/phonon_kde_plugin.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.activitybar.mo
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.analogclock.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.appmenu.mo
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.battery.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.calendar.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.clipboard.mo
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.devicenotifier.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.digitalclock.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.icon.mo
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.lock_logout.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.manageinputmethod.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.mediacontroller.mo
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.notifications.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.panelspacer.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.private.systemtray.mo
+share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.systemmonitor.mo
+share/locale/eo/LC_MESSAGES/plasma_containmentactions_applauncher.mo
 share/locale/eo/LC_MESSAGES/plasma_containmentactions_contextmenu.mo
 share/locale/eo/LC_MESSAGES/plasma_containmentactions_switchwindow.mo
 share/locale/eo/LC_MESSAGES/plasma_engine_applicationjobs.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_devicenotifications.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_dict.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_hotplug.mo
 share/locale/eo/LC_MESSAGES/plasma_engine_keystate.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_mpris2.mo
 share/locale/eo/LC_MESSAGES/plasma_engine_notifications.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_powermanagement.mo
 share/locale/eo/LC_MESSAGES/plasma_engine_soliddevice.mo
+share/locale/eo/LC_MESSAGES/plasma_engine_time.mo
 share/locale/eo/LC_MESSAGES/plasma_engine_weather.mo
+share/locale/eo/LC_MESSAGES/plasma_lookandfeel_org.kde.lookandfeel.mo
+share/locale/eo/LC_MESSAGES/plasma_package_plasmashell.mo
+share/locale/eo/LC_MESSAGES/plasma_runner_appstream.mo
+share/locale/eo/LC_MESSAGES/plasma_runner_baloosearch5.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_bookmarksrunner.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_calculatorrunner.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_kill.mo
@@ -1957,7 +1996,10 @@ share/locale/eo/LC_MESSAGES/plasma_runner_sessions.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_shell.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_webshortcuts.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_windowedwidgets.mo
+share/locale/eo/LC_MESSAGES/plasma_wallpaper_org.kde.color.mo
 share/locale/eo/LC_MESSAGES/plasma_wallpaper_org.kde.image.mo
+share/locale/eo/LC_MESSAGES/plasmashell.mo
+share/locale/eo/LC_MESSAGES/plasmashellprivateplugin.mo
 share/locale/eo/LC_MESSAGES/soliduiserver5.mo
 share/locale/es/LC_MESSAGES/freespacenotifier.mo
 share/locale/es/LC_MESSAGES/kcm_autostart.mo
diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile
index a114ed35f3f2..27c6f999c255 100644
--- a/x11/plasma6-plasma-workspace/Makefile
+++ b/x11/plasma6-plasma-workspace/Makefile
@@ -1,10 +1,15 @@
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	2
 CATEGORIES=	x11 kde kde-plasma
 
 COMMENT=	KDE Plasma Workspace
 MAINTAINER=	kde@FreeBSD.org
 
+PATCH_SITES=	https://invent.kde.org/plasma/plasma-workspace/-/commit/
+PATCHFILES+=	8047b93defa4be4c6c1864e93c41fddcef2969bb.patch:-p1 # CVE-2024-36041
+PATCHFILES+=	a061b08e90ec5554d5ff8c57ae1218130c76e27a.patch:-p1 # CVE-2024-36041
+
 BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libfontconfig.so:x11-fonts/fontconfig \
diff --git a/x11/plasma6-plasma-workspace/distinfo b/x11/plasma6-plasma-workspace/distinfo
index a3456a140da4..fa128d3eaff8 100644
--- a/x11/plasma6-plasma-workspace/distinfo
+++ b/x11/plasma6-plasma-workspace/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1713280738
+TIMESTAMP = 1718142565
 SHA256 (KDE/plasma/6.0.4/plasma-workspace-6.0.4.tar.xz) = 7f2c2871c966e66d5de2d63bcb1a554fe00b4da6bde93f69700bd1b1f60dc567
 SIZE (KDE/plasma/6.0.4/plasma-workspace-6.0.4.tar.xz) = 19946316
+SHA256 (KDE/plasma/6.0.4/8047b93defa4be4c6c1864e93c41fddcef2969bb.patch) = 1b231b23a7af7827900666fc844c946892b715c16f01e30640cee0e7800d1ede
+SIZE (KDE/plasma/6.0.4/8047b93defa4be4c6c1864e93c41fddcef2969bb.patch) = 4456
+SHA256 (KDE/plasma/6.0.4/a061b08e90ec5554d5ff8c57ae1218130c76e27a.patch) = f2cbedf331bef5fcae3d622e0ad60e7710e2d2c5e62e3a2f7835986260e78cfb
+SIZE (KDE/plasma/6.0.4/a061b08e90ec5554d5ff8c57ae1218130c76e27a.patch) = 8589
diff --git a/x11/qt5-qev/distinfo b/x11/qt5-qev/distinfo
index 32d519ec1552..7f2462e84e8f 100644
--- a/x11/qt5-qev/distinfo
+++ b/x11/qt5-qev/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771183
-SHA256 (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 6d1cceb50a604c95869adbe5aebebff7c205787a93adb7bfe89ef29b38071db7
-SIZE (KDE/Qt/5.15.13/kde-qttools-5.15.13p4.tar.xz) = 8843980
+TIMESTAMP = 1716930681
+SHA256 (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 26050e0c68e554ed91495c883eedd268642c32e15daa0f72d46e1f3c7b36a55b
+SIZE (KDE/Qt/5.15.14/kde-qttools-5.15.14p4.tar.xz) = 8841732
diff --git a/x11/qt5-x11extras/distinfo b/x11/qt5-x11extras/distinfo
index 87c400edc667..f4e2e99adbe1 100644
--- a/x11/qt5-x11extras/distinfo
+++ b/x11/qt5-x11extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711771184
-SHA256 (KDE/Qt/5.15.13/kde-qtx11extras-5.15.13p0.tar.xz) = 3459673a4fd7da6595bb35da12e8677c54ec2fa42d1effccfb6b2a6c497e6a35
-SIZE (KDE/Qt/5.15.13/kde-qtx11extras-5.15.13p0.tar.xz) = 123296
+TIMESTAMP = 1716930682
+SHA256 (KDE/Qt/5.15.14/kde-qtx11extras-5.15.14p0.tar.xz) = e8a75c1371ac65f79cea24c24594cdd6542486f099bc418cddbf7aac936fe5f0
+SIZE (KDE/Qt/5.15.14/kde-qtx11extras-5.15.14p0.tar.xz) = 123220
diff --git a/x11/shotman/Makefile b/x11/shotman/Makefile
index 5091bfeb584f..bbe6f7cc317d 100644
--- a/x11/shotman/Makefile
+++ b/x11/shotman/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	shotman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.5
-PORTREVISION=	6
+DISTVERSION=	0.4.6
 CATEGORIES=	x11 wayland
 MASTER_SITES=	https://git.sr.ht/~whynothugo/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 # XXX Teach USES=cargo to not override default DISTFILES
diff --git a/x11/shotman/Makefile.crates b/x11/shotman/Makefile.crates
index 72737971d917..928d0bf939db 100644
--- a/x11/shotman/Makefile.crates
+++ b/x11/shotman/Makefile.crates
@@ -1,104 +1,115 @@
 CARGO_CRATES=	adler-1.0.2 \
-		anyhow-1.0.68 \
-		atty-0.2.14 \
+		anstream-0.6.4 \
+		anstyle-1.0.4 \
+		anstyle-parse-0.2.2 \
+		anstyle-query-1.0.0 \
+		anstyle-wincon-3.0.1 \
+		anyhow-1.0.75 \
+		async-task-4.5.0 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
-		calloop-0.10.5 \
-		cc-1.0.78 \
+		bitflags-2.4.1 \
+		bytemuck-1.14.0 \
+		bytemuck_derive-1.5.0 \
+		calloop-0.12.3 \
+		calloop-wayland-source-0.2.0 \
+		cc-1.0.83 \
 		cfg-if-1.0.0 \
-		clap-4.1.4 \
-		clap_complete-4.1.1 \
-		clap_derive-4.1.0 \
-		clap_lex-0.3.0 \
-		colored-2.0.0 \
+		clap-4.4.6 \
+		clap_builder-4.4.6 \
+		clap_complete-4.4.3 \
+		clap_derive-4.4.2 \
+		clap_lex-0.5.1 \
+		colorchoice-1.0.0 \
+		colored-2.0.4 \
+		concurrent-queue-2.3.0 \
 		crc32fast-1.3.2 \
-		dlib-0.5.0 \
+		crossbeam-utils-0.8.16 \
+		cursor-icon-1.0.0 \
+		deranged-0.3.9 \
+		dlib-0.5.2 \
 		downcast-rs-1.2.0 \
-		either-1.8.0 \
-		errno-0.2.8 \
-		errno-dragonfly-0.1.2 \
-		flate2-1.0.25 \
-		futures-0.3.25 \
-		futures-channel-0.3.25 \
-		futures-core-0.3.25 \
-		futures-io-0.3.25 \
-		futures-sink-0.3.25 \
-		futures-task-0.3.25 \
-		futures-util-0.3.25 \
-		heck-0.4.0 \
-		hermit-abi-0.1.19 \
-		hermit-abi-0.2.6 \
-		io-lifetimes-1.0.4 \
-		is-terminal-0.4.2 \
-		itertools-0.10.5 \
-		itoa-1.0.5 \
+		either-1.9.0 \
+		errno-0.3.5 \
+		fdeflate-0.3.0 \
+		flate2-1.0.28 \
+		futures-channel-0.3.28 \
+		futures-core-0.3.28 \
+		heck-0.4.1 \
+		hermit-abi-0.3.3 \
+		is-terminal-0.4.9 \
+		itertools-0.11.0 \
+		itoa-1.0.9 \
 		lazy_static-1.4.0 \
-		libc-0.2.139 \
-		libloading-0.7.4 \
-		linux-raw-sys-0.1.4 \
-		log-0.4.17 \
-		memchr-2.5.0 \
-		memmap2-0.5.8 \
-		memoffset-0.6.5 \
+		libc-0.2.149 \
+		libloading-0.8.1 \
+		linux-raw-sys-0.4.10 \
+		log-0.4.20 \
+		memchr-2.6.4 \
+		memmap2-0.8.0 \
+		memmap2-0.9.0 \
 		memoffset-0.7.1 \
 		minimal-lexical-0.2.1 \
-		miniz_oxide-0.6.2 \
-		nix-0.25.1 \
-		nix-0.26.1 \
-		nom-7.1.2 \
+		miniz_oxide-0.7.1 \
+		nix-0.26.4 \
+		nom-7.1.3 \
+		num-conv-0.1.0 \
 		num_threads-0.1.6 \
-		once_cell-1.17.0 \
-		os_str_bytes-6.4.1 \
-		pin-project-lite-0.2.9 \
-		pin-utils-0.1.0 \
-		pkg-config-0.3.26 \
-		png-0.17.7 \
-		proc-macro-error-1.0.4 \
-		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.49 \
-		quick-xml-0.23.1 \
-		quote-1.0.23 \
-		rustix-0.36.6 \
-		ryu-1.0.12 \
+		pin-project-lite-0.2.13 \
+		pkg-config-0.3.27 \
+		png-0.17.10 \
+		polling-3.2.0 \
+		powerfmt-0.2.0 \
+		proc-macro2-1.0.78 \
+		quick-xml-0.30.0 \
+		quote-1.0.35 \
+		rustix-0.38.20 \
+		ryu-1.0.15 \
 		scoped-tls-1.0.1 \
-		serde-1.0.152 \
-		serde_derive-1.0.152 \
-		serde_json-1.0.91 \
-		simple_logger-2.3.0 \
-		slab-0.4.7 \
-		slotmap-1.0.6 \
-		smallvec-1.10.0 \
-		smithay-client-toolkit-0.17.0 \
-		static_assertions-1.1.0 \
+		serde-1.0.197 \
+		serde_derive-1.0.197 \
+		serde_json-1.0.107 \
+		simd-adler32-0.3.7 \
+		simple_logger-4.2.0 \
+		slab-0.4.9 \
+		smallvec-1.11.1 \
+		smithay-client-toolkit-0.18.0 \
 		strsim-0.10.0 \
-		syn-1.0.107 \
-		termcolor-1.1.3 \
-		thiserror-1.0.38 \
-		thiserror-impl-1.0.38 \
-		time-0.3.20 \
-		time-core-0.1.0 \
-		time-macros-0.2.8 \
-		unicode-ident-1.0.6 \
-		vec_map-0.8.2 \
-		version_check-0.9.4 \
-		wayland-backend-0.1.0 \
-		wayland-client-0.30.2 \
-		wayland-cursor-0.30.0 \
-		wayland-protocols-0.30.0 \
-		wayland-protocols-wlr-0.1.0 \
-		wayland-scanner-0.30.0 \
-		wayland-sys-0.30.1 \
-		winapi-0.3.9 \
-		winapi-i686-pc-windows-gnu-0.4.0 \
-		winapi-util-0.1.5 \
-		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		syn-2.0.52 \
+		thiserror-1.0.50 \
+		thiserror-impl-1.0.50 \
+		time-0.3.34 \
+		time-core-0.1.2 \
+		time-macros-0.2.17 \
+		tracing-0.1.40 \
+		tracing-core-0.1.32 \
+		unicode-ident-1.0.12 \
+		utf8parse-0.2.1 \
+		wayland-backend-0.3.2 \
+		wayland-client-0.31.1 \
+		wayland-csd-frame-0.3.0 \
+		wayland-cursor-0.31.0 \
+		wayland-protocols-0.31.0 \
+		wayland-protocols-wlr-0.2.0 \
+		wayland-scanner-0.31.0 \
+		wayland-sys-0.31.1 \
 		windows-sys-0.42.0 \
-		windows_aarch64_gnullvm-0.42.1 \
-		windows_aarch64_msvc-0.42.1 \
-		windows_i686_gnu-0.42.1 \
-		windows_i686_msvc-0.42.1 \
-		windows_x86_64_gnu-0.42.1 \
-		windows_x86_64_gnullvm-0.42.1 \
-		windows_x86_64_msvc-0.42.1 \
+		windows-sys-0.48.0 \
+		windows-targets-0.48.5 \
+		windows_aarch64_gnullvm-0.42.2 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_i686_gnu-0.42.2 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_msvc-0.42.2 \
+		windows_i686_msvc-0.48.5 \
+		windows_x86_64_gnu-0.42.2 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_msvc-0.48.5 \
 		xcursor-0.3.4 \
-		xkbcommon-0.5.0
+		xkbcommon-0.7.0 \
+		xkeysym-0.2.0
diff --git a/x11/shotman/distinfo b/x11/shotman/distinfo
index 13cf3e4c1901..646dc56661c2 100644
--- a/x11/shotman/distinfo
+++ b/x11/shotman/distinfo
@@ -1,211 +1,233 @@
-TIMESTAMP = 1693129559
-SHA256 (shotman-v0.4.5.tar.gz) = 59ade23793294b5021d4aa6e4151cd3dc2063079011c67ab12e6c6b9d4031b2e
-SIZE (shotman-v0.4.5.tar.gz) = 30424
+TIMESTAMP = 1716150172
+SHA256 (shotman-v0.4.6.tar.gz) = a664dc014850fa15298216dc66cecb99a16de5e3aafe7a5fb347c8fc83d30a6d
+SIZE (shotman-v0.4.6.tar.gz) = 31777
 SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
 SIZE (rust/crates/adler-1.0.2.crate) = 12778
-SHA256 (rust/crates/anyhow-1.0.68.crate) = 2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61
-SIZE (rust/crates/anyhow-1.0.68.crate) = 43882
-SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
-SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/anstream-0.6.4.crate) = 2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44
+SIZE (rust/crates/anstream-0.6.4.crate) = 20593
+SHA256 (rust/crates/anstyle-1.0.4.crate) = 7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87
+SIZE (rust/crates/anstyle-1.0.4.crate) = 13998
+SHA256 (rust/crates/anstyle-parse-0.2.2.crate) = 317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140
+SIZE (rust/crates/anstyle-parse-0.2.2.crate) = 24696
+SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b
+SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620
+SHA256 (rust/crates/anstyle-wincon-3.0.1.crate) = f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628
+SIZE (rust/crates/anstyle-wincon-3.0.1.crate) = 11279
+SHA256 (rust/crates/anyhow-1.0.75.crate) = a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6
+SIZE (rust/crates/anyhow-1.0.75.crate) = 43901
+SHA256 (rust/crates/async-task-4.5.0.crate) = b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1
+SIZE (rust/crates/async-task-4.5.0.crate) = 36956
 SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
 SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/calloop-0.10.5.crate) = 1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192
-SIZE (rust/crates/calloop-0.10.5.crate) = 53694
-SHA256 (rust/crates/cc-1.0.78.crate) = a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d
-SIZE (rust/crates/cc-1.0.78.crate) = 61375
+SHA256 (rust/crates/bitflags-2.4.1.crate) = 327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07
+SIZE (rust/crates/bitflags-2.4.1.crate) = 37043
+SHA256 (rust/crates/bytemuck-1.14.0.crate) = 374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6
+SIZE (rust/crates/bytemuck-1.14.0.crate) = 44933
+SHA256 (rust/crates/bytemuck_derive-1.5.0.crate) = 965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1
+SIZE (rust/crates/bytemuck_derive-1.5.0.crate) = 17323
+SHA256 (rust/crates/calloop-0.12.3.crate) = 7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf
+SIZE (rust/crates/calloop-0.12.3.crate) = 66858
+SHA256 (rust/crates/calloop-wayland-source-0.2.0.crate) = 0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02
+SIZE (rust/crates/calloop-wayland-source-0.2.0.crate) = 11304
+SHA256 (rust/crates/cc-1.0.83.crate) = f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0
+SIZE (rust/crates/cc-1.0.83.crate) = 68343
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/clap-4.1.4.crate) = f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76
-SIZE (rust/crates/clap-4.1.4.crate) = 207077
-SHA256 (rust/crates/clap_complete-4.1.1.crate) = 3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75
-SIZE (rust/crates/clap_complete-4.1.1.crate) = 32707
-SHA256 (rust/crates/clap_derive-4.1.0.crate) = 684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8
-SIZE (rust/crates/clap_derive-4.1.0.crate) = 27897
-SHA256 (rust/crates/clap_lex-0.3.0.crate) = 0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8
-SIZE (rust/crates/clap_lex-0.3.0.crate) = 9671
-SHA256 (rust/crates/colored-2.0.0.crate) = b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd
-SIZE (rust/crates/colored-2.0.0.crate) = 21619
+SHA256 (rust/crates/clap-4.4.6.crate) = d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956
+SIZE (rust/crates/clap-4.4.6.crate) = 54823
+SHA256 (rust/crates/clap_builder-4.4.6.crate) = 0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45
+SIZE (rust/crates/clap_builder-4.4.6.crate) = 162450
+SHA256 (rust/crates/clap_complete-4.4.3.crate) = e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7
+SIZE (rust/crates/clap_complete-4.4.3.crate) = 37353
+SHA256 (rust/crates/clap_derive-4.4.2.crate) = 0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873
+SIZE (rust/crates/clap_derive-4.4.2.crate) = 29019
+SHA256 (rust/crates/clap_lex-0.5.1.crate) = cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961
+SIZE (rust/crates/clap_lex-0.5.1.crate) = 11793
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/colored-2.0.4.crate) = 2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6
+SIZE (rust/crates/colored-2.0.4.crate) = 23654
+SHA256 (rust/crates/concurrent-queue-2.3.0.crate) = f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400
+SIZE (rust/crates/concurrent-queue-2.3.0.crate) = 20189
 SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
 SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
-SHA256 (rust/crates/dlib-0.5.0.crate) = ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794
-SIZE (rust/crates/dlib-0.5.0.crate) = 5788
+SHA256 (rust/crates/crossbeam-utils-0.8.16.crate) = 5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294
+SIZE (rust/crates/crossbeam-utils-0.8.16.crate) = 42508
+SHA256 (rust/crates/cursor-icon-1.0.0.crate) = 740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf
+SIZE (rust/crates/cursor-icon-1.0.0.crate) = 10909
+SHA256 (rust/crates/deranged-0.3.9.crate) = 0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3
+SIZE (rust/crates/deranged-0.3.9.crate) = 17080
+SHA256 (rust/crates/dlib-0.5.2.crate) = 330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412
+SIZE (rust/crates/dlib-0.5.2.crate) = 5806
 SHA256 (rust/crates/downcast-rs-1.2.0.crate) = 9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650
 SIZE (rust/crates/downcast-rs-1.2.0.crate) = 11670
-SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797
-SIZE (rust/crates/either-1.8.0.crate) = 15992
-SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1
-SIZE (rust/crates/errno-0.2.8.crate) = 9276
-SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf
-SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810
-SHA256 (rust/crates/flate2-1.0.25.crate) = a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841
-SIZE (rust/crates/flate2-1.0.25.crate) = 70210
-SHA256 (rust/crates/futures-0.3.25.crate) = 38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0
-SIZE (rust/crates/futures-0.3.25.crate) = 51664
-SHA256 (rust/crates/futures-channel-0.3.25.crate) = 52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed
-SIZE (rust/crates/futures-channel-0.3.25.crate) = 31974
-SHA256 (rust/crates/futures-core-0.3.25.crate) = 04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac
-SIZE (rust/crates/futures-core-0.3.25.crate) = 14623
-SHA256 (rust/crates/futures-io-0.3.25.crate) = 00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb
-SIZE (rust/crates/futures-io-0.3.25.crate) = 8911
-SHA256 (rust/crates/futures-sink-0.3.25.crate) = 39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9
-SIZE (rust/crates/futures-sink-0.3.25.crate) = 7854
-SHA256 (rust/crates/futures-task-0.3.25.crate) = 2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea
-SIZE (rust/crates/futures-task-0.3.25.crate) = 11844
-SHA256 (rust/crates/futures-util-0.3.25.crate) = 197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6
-SIZE (rust/crates/futures-util-0.3.25.crate) = 155866
-SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
-SIZE (rust/crates/heck-0.4.0.crate) = 11161
-SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
-SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
-SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7
-SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027
-SHA256 (rust/crates/io-lifetimes-1.0.4.crate) = e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e
-SIZE (rust/crates/io-lifetimes-1.0.4.crate) = 35815
-SHA256 (rust/crates/is-terminal-0.4.2.crate) = 28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189
-SIZE (rust/crates/is-terminal-0.4.2.crate) = 7577
-SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
-SIZE (rust/crates/itertools-0.10.5.crate) = 115354
-SHA256 (rust/crates/itoa-1.0.5.crate) = fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440
-SIZE (rust/crates/itoa-1.0.5.crate) = 10622
+SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07
+SIZE (rust/crates/either-1.9.0.crate) = 16660
+SHA256 (rust/crates/errno-0.3.5.crate) = ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860
+SIZE (rust/crates/errno-0.3.5.crate) = 10576
+SHA256 (rust/crates/fdeflate-0.3.0.crate) = d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10
+SIZE (rust/crates/fdeflate-0.3.0.crate) = 21790
+SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
+SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/futures-channel-0.3.28.crate) = 955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2
+SIZE (rust/crates/futures-channel-0.3.28.crate) = 32281
+SHA256 (rust/crates/futures-core-0.3.28.crate) = 4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c
+SIZE (rust/crates/futures-core-0.3.28.crate) = 14780
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/hermit-abi-0.3.3.crate) = d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7
+SIZE (rust/crates/hermit-abi-0.3.3.crate) = 14253
+SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b
+SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109
+SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
+SIZE (rust/crates/itertools-0.11.0.crate) = 125074
+SHA256 (rust/crates/itoa-1.0.9.crate) = af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38
+SIZE (rust/crates/itoa-1.0.9.crate) = 10492
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/libc-0.2.139.crate) = 201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79
-SIZE (rust/crates/libc-0.2.139.crate) = 638983
-SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
-SIZE (rust/crates/libloading-0.7.4.crate) = 27580
-SHA256 (rust/crates/linux-raw-sys-0.1.4.crate) = f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4
-SIZE (rust/crates/linux-raw-sys-0.1.4.crate) = 878981
-SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
-SIZE (rust/crates/log-0.4.17.crate) = 38028
-SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
-SIZE (rust/crates/memchr-2.5.0.crate) = 65812
-SHA256 (rust/crates/memmap2-0.5.8.crate) = 4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc
-SIZE (rust/crates/memmap2-0.5.8.crate) = 26592
-SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
-SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/libc-0.2.149.crate) = a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b
+SIZE (rust/crates/libc-0.2.149.crate) = 715592
+SHA256 (rust/crates/libloading-0.8.1.crate) = c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161
+SIZE (rust/crates/libloading-0.8.1.crate) = 27893
+SHA256 (rust/crates/linux-raw-sys-0.4.10.crate) = da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f
+SIZE (rust/crates/linux-raw-sys-0.4.10.crate) = 1407767
+SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
+SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/memchr-2.6.4.crate) = f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167
+SIZE (rust/crates/memchr-2.6.4.crate) = 94439
+SHA256 (rust/crates/memmap2-0.8.0.crate) = 43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed
+SIZE (rust/crates/memmap2-0.8.0.crate) = 30990
+SHA256 (rust/crates/memmap2-0.9.0.crate) = deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375
+SIZE (rust/crates/memmap2-0.9.0.crate) = 31529
 SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
 SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
 SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
-SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
-SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536
-SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4
-SIZE (rust/crates/nix-0.25.1.crate) = 272312
-SHA256 (rust/crates/nix-0.26.1.crate) = 46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694
-SIZE (rust/crates/nix-0.26.1.crate) = 277805
-SHA256 (rust/crates/nom-7.1.2.crate) = e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c
-SIZE (rust/crates/nom-7.1.2.crate) = 117341
+SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7
+SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
+SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
+SIZE (rust/crates/nix-0.26.4.crate) = 279099
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
 SHA256 (rust/crates/num_threads-0.1.6.crate) = 2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44
 SIZE (rust/crates/num_threads-0.1.6.crate) = 7334
-SHA256 (rust/crates/once_cell-1.17.0.crate) = 6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66
-SIZE (rust/crates/once_cell-1.17.0.crate) = 32736
-SHA256 (rust/crates/os_str_bytes-6.4.1.crate) = 9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee
-SIZE (rust/crates/os_str_bytes-6.4.1.crate) = 23101
-SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
-SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713
-SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
-SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
-SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
-SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
-SHA256 (rust/crates/png-0.17.7.crate) = 5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638
-SIZE (rust/crates/png-0.17.7.crate) = 80979
-SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
-SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
-SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
-SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.49.crate) = 57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5
-SIZE (rust/crates/proc-macro2-1.0.49.crate) = 41977
-SHA256 (rust/crates/quick-xml-0.23.1.crate) = 11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea
-SIZE (rust/crates/quick-xml-0.23.1.crate) = 161488
-SHA256 (rust/crates/quote-1.0.23.crate) = 8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b
-SIZE (rust/crates/quote-1.0.23.crate) = 28058
-SHA256 (rust/crates/rustix-0.36.6.crate) = 4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549
-SIZE (rust/crates/rustix-0.36.6.crate) = 288718
-SHA256 (rust/crates/ryu-1.0.12.crate) = 7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde
-SIZE (rust/crates/ryu-1.0.12.crate) = 47070
+SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
+SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pkg-config-0.3.27.crate) = 26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964
+SIZE (rust/crates/pkg-config-0.3.27.crate) = 18838
+SHA256 (rust/crates/png-0.17.10.crate) = dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64
+SIZE (rust/crates/png-0.17.10.crate) = 89384
+SHA256 (rust/crates/polling-3.2.0.crate) = 62a79e457c9898100b4298d57d69ec53d06f9a6ed352431ce5f377e082d2e846
+SIZE (rust/crates/polling-3.2.0.crate) = 53244
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
+SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
+SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158
+SHA256 (rust/crates/quick-xml-0.30.0.crate) = eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956
+SIZE (rust/crates/quick-xml-0.30.0.crate) = 161923
+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/rustix-0.38.20.crate) = 67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0
+SIZE (rust/crates/rustix-0.38.20.crate) = 358266
+SHA256 (rust/crates/ryu-1.0.15.crate) = 1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741
+SIZE (rust/crates/ryu-1.0.15.crate) = 46906
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
-SHA256 (rust/crates/serde-1.0.152.crate) = bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb
-SIZE (rust/crates/serde-1.0.152.crate) = 77091
-SHA256 (rust/crates/serde_derive-1.0.152.crate) = af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e
-SIZE (rust/crates/serde_derive-1.0.152.crate) = 55586
-SHA256 (rust/crates/serde_json-1.0.91.crate) = 877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883
-SIZE (rust/crates/serde_json-1.0.91.crate) = 144654
-SHA256 (rust/crates/simple_logger-2.3.0.crate) = 48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7
-SIZE (rust/crates/simple_logger-2.3.0.crate) = 9656
-SHA256 (rust/crates/slab-0.4.7.crate) = 4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef
-SIZE (rust/crates/slab-0.4.7.crate) = 16647
-SHA256 (rust/crates/slotmap-1.0.6.crate) = e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342
-SIZE (rust/crates/slotmap-1.0.6.crate) = 58954
-SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
-SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
-SHA256 (rust/crates/smithay-client-toolkit-0.17.0.crate) = e1476c3d89bb67079264b88aaf4f14358353318397e083b7c4e8c14517f55de7
-SIZE (rust/crates/smithay-client-toolkit-0.17.0.crate) = 150751
-SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
-SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
+SIZE (rust/crates/serde-1.0.197.crate) = 77087
+SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
+SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
+SHA256 (rust/crates/serde_json-1.0.107.crate) = 6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65
+SIZE (rust/crates/serde_json-1.0.107.crate) = 146458
+SHA256 (rust/crates/simd-adler32-0.3.7.crate) = d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe
+SIZE (rust/crates/simd-adler32-0.3.7.crate) = 12086
+SHA256 (rust/crates/simple_logger-4.2.0.crate) = 2230cd5c29b815c9b699fb610b49a5ed65588f3509d9f0108be3a885da629333
+SIZE (rust/crates/simple_logger-4.2.0.crate) = 10680
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.11.1.crate) = 942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a
+SIZE (rust/crates/smallvec-1.11.1.crate) = 34831
+SHA256 (rust/crates/smithay-client-toolkit-0.18.0.crate) = 60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f
+SIZE (rust/crates/smithay-client-toolkit-0.18.0.crate) = 126729
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
-SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5
-SIZE (rust/crates/syn-1.0.107.crate) = 237539
-SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
-SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
-SHA256 (rust/crates/thiserror-1.0.38.crate) = 6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0
-SIZE (rust/crates/thiserror-1.0.38.crate) = 18947
-SHA256 (rust/crates/thiserror-impl-1.0.38.crate) = 1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f
-SIZE (rust/crates/thiserror-impl-1.0.38.crate) = 15429
-SHA256 (rust/crates/time-0.3.20.crate) = cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890
-SIZE (rust/crates/time-0.3.20.crate) = 111856
-SHA256 (rust/crates/time-core-0.1.0.crate) = 2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd
-SIZE (rust/crates/time-core-0.1.0.crate) = 6597
-SHA256 (rust/crates/time-macros-0.2.8.crate) = fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36
-SIZE (rust/crates/time-macros-0.2.8.crate) = 24295
-SHA256 (rust/crates/unicode-ident-1.0.6.crate) = 84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc
-SIZE (rust/crates/unicode-ident-1.0.6.crate) = 42158
-SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
-SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
-SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
-SIZE (rust/crates/version_check-0.9.4.crate) = 14895
-SHA256 (rust/crates/wayland-backend-0.1.0.crate) = fb23bfea266c92bb051ea36cce0eb1a52b743dc1c5f168021947eda79764656d
-SIZE (rust/crates/wayland-backend-0.1.0.crate) = 68334
-SHA256 (rust/crates/wayland-client-0.30.2.crate) = 489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8
-SIZE (rust/crates/wayland-client-0.30.2.crate) = 65289
-SHA256 (rust/crates/wayland-cursor-0.30.0.crate) = 2d0c3a0d5b4b688b07b0442362d3ed6bf04724fcc16cd69ab6285b90dbc487aa
-SIZE (rust/crates/wayland-cursor-0.30.0.crate) = 6930
-SHA256 (rust/crates/wayland-protocols-0.30.0.crate) = 7fefbeb8a360abe67ab7c2efe1d297a1a50ee011f5460791bc18870c26bb84e2
-SIZE (rust/crates/wayland-protocols-0.30.0.crate) = 127598
-SHA256 (rust/crates/wayland-protocols-wlr-0.1.0.crate) = fce991093320e4a6a525876e6b629ab24da25f9baef0c2e0080ad173ec89588a
-SIZE (rust/crates/wayland-protocols-wlr-0.1.0.crate) = 25759
-SHA256 (rust/crates/wayland-scanner-0.30.0.crate) = 4834c14b3edf1d9986c83ca79b1e7e3afbe9874c7c144702f6467063259ce45d
-SIZE (rust/crates/wayland-scanner-0.30.0.crate) = 34206
-SHA256 (rust/crates/wayland-sys-0.30.1.crate) = 96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06
-SIZE (rust/crates/wayland-sys-0.30.1.crate) = 8358
-SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
-SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
-SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
-SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/syn-2.0.52.crate) = b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07
+SIZE (rust/crates/syn-2.0.52.crate) = 254728
+SHA256 (rust/crates/thiserror-1.0.50.crate) = f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2
+SIZE (rust/crates/thiserror-1.0.50.crate) = 19414
+SHA256 (rust/crates/thiserror-impl-1.0.50.crate) = 266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8
+SIZE (rust/crates/thiserror-impl-1.0.50.crate) = 15357
+SHA256 (rust/crates/time-0.3.34.crate) = c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749
+SIZE (rust/crates/time-0.3.34.crate) = 118430
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.17.crate) = 7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774
+SIZE (rust/crates/time-macros-0.2.17.crate) = 24443
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/wayland-backend-0.3.2.crate) = 19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4
+SIZE (rust/crates/wayland-backend-0.3.2.crate) = 69238
+SHA256 (rust/crates/wayland-client-0.31.1.crate) = 1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3
+SIZE (rust/crates/wayland-client-0.31.1.crate) = 62635
+SHA256 (rust/crates/wayland-csd-frame-0.3.0.crate) = 625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e
+SIZE (rust/crates/wayland-csd-frame-0.3.0.crate) = 5696
+SHA256 (rust/crates/wayland-cursor-0.31.0.crate) = a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b
+SIZE (rust/crates/wayland-cursor-0.31.0.crate) = 6938
+SHA256 (rust/crates/wayland-protocols-0.31.0.crate) = e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c
+SIZE (rust/crates/wayland-protocols-0.31.0.crate) = 134772
+SHA256 (rust/crates/wayland-protocols-wlr-0.2.0.crate) = ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6
+SIZE (rust/crates/wayland-protocols-wlr-0.2.0.crate) = 25804
+SHA256 (rust/crates/wayland-scanner-0.31.0.crate) = fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c
+SIZE (rust/crates/wayland-scanner-0.31.0.crate) = 35245
+SHA256 (rust/crates/wayland-sys-0.31.1.crate) = 15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af
+SIZE (rust/crates/wayland-sys-0.31.1.crate) = 8577
 SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
 SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608
-SIZE (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 362795
-SHA256 (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7
-SIZE (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 664655
-SHA256 (rust/crates/windows_i686_gnu-0.42.1.crate) = de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640
-SIZE (rust/crates/windows_i686_gnu-0.42.1.crate) = 733428
-SHA256 (rust/crates/windows_i686_msvc-0.42.1.crate) = bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605
-SIZE (rust/crates/windows_i686_msvc-0.42.1.crate) = 722583
-SHA256 (rust/crates/windows_x86_64_gnu-0.42.1.crate) = c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45
-SIZE (rust/crates/windows_x86_64_gnu-0.42.1.crate) = 697614
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463
-SIZE (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 362788
-SHA256 (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd
-SIZE (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 664606
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
+SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
+SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
+SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
+SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
+SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
 SHA256 (rust/crates/xcursor-0.3.4.crate) = 463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7
 SIZE (rust/crates/xcursor-0.3.4.crate) = 6069
-SHA256 (rust/crates/xkbcommon-0.5.0.crate) = acbee136714379ab22da0280207fdb7f47e0bb940adea97731b65598b8c7a92e
-SIZE (rust/crates/xkbcommon-0.5.0.crate) = 58155
+SHA256 (rust/crates/xkbcommon-0.7.0.crate) = 13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e
+SIZE (rust/crates/xkbcommon-0.7.0.crate) = 58896
+SHA256 (rust/crates/xkeysym-0.2.0.crate) = 054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621
+SIZE (rust/crates/xkeysym-0.2.0.crate) = 101431
diff --git a/x11/wallutils/Makefile b/x11/wallutils/Makefile
index 0cb3d6f5b98c..18da495ec02f 100644
--- a/x11/wallutils/Makefile
+++ b/x11/wallutils/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wallutils
 DISTVERSION=	5.12.7
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	eduardo@FreeBSD.org
diff --git a/x11/wev/distinfo b/x11/wev/distinfo
index d7009cfac58d..141a85d3642a 100644
--- a/x11/wev/distinfo
+++ b/x11/wev/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1650166140
 SHA256 (wev-1.0.0.tar.gz) = 613a1df1a4879d50ce72023de14aaf05be2e6f51346e84a69f50fc6d8502bbf4
 SIZE (wev-1.0.0.tar.gz) = 8647
-SHA256 (0be512fb7058.patch) = 373a36600400057fe7d9deff278bfd5a7ab1fbd428ac14864d2668254c1f0477
+SHA256 (0be512fb7058.patch) = 1dec2b6b00853ecab638cc020a14272c0ea91fe9e033f7cd2b77637ebb65f624
 SIZE (0be512fb7058.patch) = 1148
diff --git a/x11/wl-mirror/Makefile b/x11/wl-mirror/Makefile
index 079d28ac0170..b8e95503dcb4 100644
--- a/x11/wl-mirror/Makefile
+++ b/x11/wl-mirror/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wl-mirror
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.2
+DISTVERSION=	0.16.3
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/wl-mirror/distinfo b/x11/wl-mirror/distinfo
index ee1921eb96b7..9f7fe4df226a 100644
--- a/x11/wl-mirror/distinfo
+++ b/x11/wl-mirror/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1709427210
-SHA256 (Ferdi265-wl-mirror-v0.16.2_GH0.tar.gz) = a3c864ed6e9a8cebfe70dfe688fb6cfd85a28f6e3047d42fbc9493204524ebbd
-SIZE (Ferdi265-wl-mirror-v0.16.2_GH0.tar.gz) = 49161
+TIMESTAMP = 1717585875
+SHA256 (Ferdi265-wl-mirror-v0.16.3_GH0.tar.gz) = 968c3298791e54dc1aa80f86d99320dd5957ea2208b6eed438937c88c33bc3c5
+SIZE (Ferdi265-wl-mirror-v0.16.3_GH0.tar.gz) = 49618
 SHA256 (wlr-protocols-4264185.tar.bz2) = c69bf84821bb2017b670465477bdd491d6dca389e6794d1e77b3d6b51fafe7ca
 SIZE (wlr-protocols-4264185.tar.bz2) = 19596
diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index 18ae03f006d0..a2ae35bd3f24 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -1,15 +1,8 @@
 PORTNAME=	xdg-desktop-portal-hyprland
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.1
-PORTREVISION=	5
+DISTVERSION=	1.3.2
 CATEGORIES=	x11 wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	65fb44ae4960.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/190
-PATCHFILES+=	9c370fd55d6e.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/pull/193
-PATCHFILES+=	4fc83e6871e9.patch:-p1 # unbreak MALLOC_CONF=junk:true
-PATCHFILES+=	9ace6f969ce4.patch:-p1 # https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/207
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	xdg-desktop-portal backend for hyprland
 WWW=		https://github.com/hyprwm/xdg-desktop-portal-hyprland
diff --git a/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo
index 18eb43fb44a6..a42bb438ae6a 100644
--- a/x11/xdg-desktop-portal-hyprland/distinfo
+++ b/x11/xdg-desktop-portal-hyprland/distinfo
@@ -1,15 +1,7 @@
-TIMESTAMP = 1704466722
-SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.3.1_GH0.tar.gz) = 60b390f326b84cc52657b735e3d7ba8f03aa3363672100dba47580984491611f
-SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.3.1_GH0.tar.gz) = 46999
+TIMESTAMP = 1718272114
+SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.3.2_GH0.tar.gz) = 8f77a11c4d3df1b6d963f408ea1159d093e3b14ea0cb8c64094fca9821af2e26
+SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.3.2_GH0.tar.gz) = 48659
 SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0
 SIZE (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 6342
 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
-SHA256 (65fb44ae4960.patch) = 26a3232c3dd9cdbc7f322a194dc37ca41df43be953d36d1d6228e285fa467f87
-SIZE (65fb44ae4960.patch) = 894
-SHA256 (9c370fd55d6e.patch) = cad38c734274449f9dbab356f7643c0e41b378d5609a17593ca3b39f3e722030
-SIZE (9c370fd55d6e.patch) = 1096
-SHA256 (4fc83e6871e9.patch) = ed10c6554c56aaec248ae9aeca58b40cc9327ff63fe99c36a2810c495624e681
-SIZE (4fc83e6871e9.patch) = 918
-SHA256 (9ace6f969ce4.patch) = b92e24d009ec4a3ab6d1296a1b1320a18f6be51ddde267711e7fa30b19acd2b6
-SIZE (9ace6f969ce4.patch) = 1257
diff --git a/x11/xdg-desktop-portal-hyprland/files/patch-qt5 b/x11/xdg-desktop-portal-hyprland/files/patch-qt5
new file mode 100644
index 000000000000..f95bd0b8d56b
--- /dev/null
+++ b/x11/xdg-desktop-portal-hyprland/files/patch-qt5
@@ -0,0 +1,24 @@
+Revert https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2d2fb547178e
+
+--- hyprland-share-picker/CMakeLists.txt.orig	2024-06-13 09:48:34 UTC
++++ hyprland-share-picker/CMakeLists.txt
+@@ -2,8 +2,6 @@ project(hyprland-share-picker VERSION 0.1 LANGUAGES CX
+ 
+ project(hyprland-share-picker VERSION 0.1 LANGUAGES CXX)
+ 
+-set(QT_VERSION_MAJOR 6)
+-
+ set(CMAKE_AUTOUIC ON)
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_AUTORCC ON)
+@@ -11,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+-find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets)
+-find_package(Qt6 REQUIRED COMPONENTS Widgets)
++find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
++find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+ 
+ set(PROJECT_SOURCES
+         main.cpp