wip/thunderbird: draft & unsuccessful update to 115.1.1.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wip/thunderbird: draft & unsuccessful update to 115.1.1.
From: Havard Eidnes <he%NetBSD.org@localhost>
Date: Thu, 24 Aug 2023 09:55:43 +0000
Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Aug 24 09:55:43 2023 +0000
Changeset:	502768489951ccc477b85450749596ccabba9076

Modified Files:
	thunderbird/Makefile
	thunderbird/PLIST
	thunderbird/TODO
	thunderbird/distinfo
	thunderbird/mozilla-common.mk
	thunderbird/patches/patch-toolkit_moz.configure
	thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp
Added Files:
	thunderbird/patches/patch-config_make-system-wrappers.py
	thunderbird/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
Removed Files:
	thunderbird/patch-build_unix_stdc++compat_stdc++compat.cpp
	thunderbird/patch-dom_media_webrtc_sdp_RsdparsaSdpGlue.cpp
	thunderbird/patch-gfx_2d_Rect.h
	thunderbird/patch-toolkit_components_telemetry_pingsender_pingsender.cpp
	thunderbird/patch-tools_profiler_core_platform.cpp
	thunderbird/patch-tools_profiler_public_ProfilerThreadRegistration.h
	thunderbird/patch-tools_profiler_public_ProfilerThreadRegistry.h
	thunderbird/patch-tools_profiler_tests_gtest_GeckoProfiler.cpp
	thunderbird/patches/patch-media_libcubeb_src_cubeb__alsa.c
	thunderbird/patches/patch-media_libcubeb_src_moz.build
	thunderbird/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc

Log Message:
wip/thunderbird: draft & unsuccessful update to 115.1.1.

Still does not build, for me the build bombs out with

ld: ../../../toolkit/library/build/libxul.so: undefined reference to `ld: ../../toolkit/library/build/libxul.so: undefined reference to `malloc_usable_sizemalloc_usable_size'

(error message looks weird, name repeated...)

See TODO for more information.

Remove old patches in main directory, and adapt as best as
possible to the fact that thunderbird changed to a python-based
configure, so no more autoconf.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=502768489951ccc477b85450749596ccabba9076

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

diffstat:
 thunderbird/Makefile                               | 20 ++++---
 thunderbird/PLIST                                  | 16 ++---
 thunderbird/TODO                                   | 55 ++++++++++++-----
 thunderbird/distinfo                               | 15 +++--
 thunderbird/mozilla-common.mk                      | 25 ++++----
 .../patch-build_unix_stdc++compat_stdc++compat.cpp | 29 ---------
 .../patch-dom_media_webrtc_sdp_RsdparsaSdpGlue.cpp | 14 -----
 thunderbird/patch-gfx_2d_Rect.h                    | 14 -----
 ..._components_telemetry_pingsender_pingsender.cpp | 14 -----
 thunderbird/patch-tools_profiler_core_platform.cpp | 68 ----------------------
 ...ls_profiler_public_ProfilerThreadRegistration.h | 23 --------
 ...-tools_profiler_public_ProfilerThreadRegistry.h | 23 --------
 ...ch-tools_profiler_tests_gtest_GeckoProfiler.cpp | 33 -----------
 .../patches/patch-config_make-system-wrappers.py   | 17 ++++++
 ...nsport_api_WebTransportDatagramDuplexStream.cpp | 42 +++++++++++++
 .../patches/patch-media_libcubeb_src_cubeb__alsa.c | 12 ----
 .../patches/patch-media_libcubeb_src_moz.build     | 17 ------
 ...les_video__capture_linux_device__info__linux.cc | 20 -------
 thunderbird/patches/patch-toolkit_moz.configure    |  8 +--
 .../patches/patch-widget_gtk_DMABufSurface.cpp     | 10 ++--
 20 files changed, 144 insertions(+), 331 deletions(-)

diffs:
diff --git a/thunderbird/Makefile b/thunderbird/Makefile
index a41b052167..0fe5c40b9c 100644
--- a/thunderbird/Makefile
+++ b/thunderbird/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.295 2023/05/06 19:09:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.296 2023/08/14 05:24:48 wiz Exp $
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-PKGREVISION=	3
-TB_VER=		102.8.0
+#PKGREVISION=	3
+TB_VER=		115.1.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
@@ -17,6 +17,7 @@ USE_TOOLS+=	unzip pax
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.source//}
 MOZILLA_DIR=	# empty
 PLIST_SRC+=	${PLIST_SRC_DFLT}
+GCC_REQD+=	8
 
 DEPENDS+=	libotr-[0-9]*:../../chat/libotr
 
@@ -35,6 +36,9 @@ NOT_PAX_MPROTECT_SAFE+=	lib/${MOZILLA_NAME}/${MOZILLA_NAME}-bin
 
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA_NAME}
 
+# Workaround for https://bugs.llvm.org/show_bug.cgi?id=46366
+BUILDLINK_TRANSFORM.NetBSD+=	rm:-fexperimental-new-pass-manager
+
 .include "../../mk/bsd.prefs.mk"
 
 CHECK_WRKREF_SKIP+=	lib/${MOZILLA_NAME}/chrome/toolkit/content/global/buildconfig.html
@@ -50,8 +54,8 @@ CHECK_WRKREF_SKIP+=	lib/${MOZILLA_NAME}/chrome/messenger/content/messenger/build
 CKSUM_CRATES+=	third_party/rust/libc
 
 # patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
-CKSUMS+=	cb1560bf8ffcc7b2726a27b433efac90e726292960626f3064bd2c6b7f861a55
-CKSUMS+=	1159c20556ff4f50b7140ef4e7f5ac63e3098d9117784794c944228fa7460efb
+CKSUMS+=	107a4aa396b8383c66e0ace2f941450b4b69146558cdc4d9fbe33eeab51760f1
+CKSUMS+=	3aa5bbc6bec675641c8cb02342022256435ea4f958bfa3832344dba6847ba5ea
 
 #CKSUM_CRATES+=	third_party/rust/getrandom
 
@@ -78,9 +82,9 @@ post-extract:
 
 pre-configure:
 	cd ${WRKSRC} && mkdir ${OBJDIR}
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
-	cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
-	cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
+#	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
+#	cd ${WRKSRC}${MOZILLA_DIR} && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
+#	cd ${WRKSRC}${MOZILLA_DIR}/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf-2.13
 	touch ${WRKSRC}/.mozconfig
 
 do-build:
diff --git a/thunderbird/PLIST b/thunderbird/PLIST
index 0f13d5601e..920d240c4a 100644
--- a/thunderbird/PLIST
+++ b/thunderbird/PLIST
@@ -32,7 +32,6 @@ lib/thunderbird/actors/FormHistoryParent.jsm
 lib/thunderbird/actors/InlineSpellCheckerChild.jsm
 lib/thunderbird/actors/InlineSpellCheckerParent.jsm
 lib/thunderbird/actors/KeyPressEventModelCheckerChild.jsm
-${PLIST.debug}lib/thunderbird/actors/LayoutDebugChild.jsm
 lib/thunderbird/actors/LinkClickHandlerChild.jsm
 lib/thunderbird/actors/LinkClickHandlerParent.jsm
 lib/thunderbird/actors/LinkHandlerChild.jsm
@@ -62,6 +61,12 @@ lib/thunderbird/actors/ViewSourcePageParent.jsm
 lib/thunderbird/actors/WebChannelChild.jsm
 lib/thunderbird/actors/WebChannelParent.jsm
 lib/thunderbird/application.ini
+${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.dtd
+${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.properties
+${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.dtd
+${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.properties
+${PLIST.nobranding}lib/thunderbird/chrome/messenger/content/branding/about-background.png
+${PLIST.wayland}lib/thunderbird/libmozwayland.so
 lib/thunderbird/chrome.manifest
 lib/thunderbird/chrome/browser/content/built_in_addons.json
 lib/thunderbird/chrome/browser/content/extension.css
@@ -3211,13 +3216,9 @@ lib/thunderbird/chrome/devtools/skin/tooltips.css
 lib/thunderbird/chrome/devtools/skin/variables.css
 lib/thunderbird/chrome/devtools/skin/webconsole.css
 lib/thunderbird/chrome/devtools/skin/widgets.css
-${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.dtd
-${PLIST.nobranding}lib/thunderbird/chrome/en-US/locale/branding/brand.properties
 lib/thunderbird/chrome/en-US/locale/en-US/alerts/alert.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/alerts/alert.properties
 lib/thunderbird/chrome/en-US/locale/en-US/autoconfig/autoconfig.properties
-${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.dtd
-${PLIST.branding}lib/thunderbird/chrome/en-US/locale/en-US/branding/brand.properties
 lib/thunderbird/chrome/en-US/locale/en-US/calendar/calendar-alarms.properties
 lib/thunderbird/chrome/en-US/locale/en-US/calendar/calendar-event-dialog-attendees.properties
 lib/thunderbird/chrome/en-US/locale/en-US/calendar/calendar-event-dialog.dtd
@@ -3549,7 +3550,6 @@ lib/thunderbird/chrome/icons/default/default256.png
 lib/thunderbird/chrome/icons/default/default32.png
 lib/thunderbird/chrome/icons/default/default48.png
 lib/thunderbird/chrome/icons/default/default64.png
-${PLIST.nobranding}lib/thunderbird/chrome/messenger/content/branding/about-background.png
 lib/thunderbird/chrome/messenger/content/branding/about-logo.svg
 lib/thunderbird/chrome/messenger/content/branding/about-wordmark.svg
 lib/thunderbird/chrome/messenger/content/branding/about.png
@@ -5505,7 +5505,6 @@ lib/thunderbird/components/calPeriod.js
 lib/thunderbird/components/calRecurrenceRule.js
 lib/thunderbird/components/calTimezone.js
 lib/thunderbird/components/components.manifest
-${PLIST.debug}lib/thunderbird/components/startupRecorder.js
 lib/thunderbird/contentaccessible/ImageDocument.css
 lib/thunderbird/contentaccessible/TopLevelImageDocument.css
 lib/thunderbird/contentaccessible/TopLevelVideoDocument.css
@@ -5611,7 +5610,6 @@ lib/thunderbird/isp/SpamPal.sfd
 lib/thunderbird/liblgpllibs.so
 lib/thunderbird/libmozgtk.so
 lib/thunderbird/libmozsqlite3.so
-${PLIST.wayland}lib/thunderbird/libmozwayland.so
 lib/thunderbird/librnp.so
 lib/thunderbird/libxul.so
 lib/thunderbird/localization/en-US/branding/brand.ftl
@@ -6437,7 +6435,6 @@ lib/thunderbird/modules/ircServices.jsm
 lib/thunderbird/modules/ircUtils.jsm
 lib/thunderbird/modules/ircWatchMonitor.jsm
 lib/thunderbird/modules/jsProtoHelper.jsm
-${PLIST.debug}lib/thunderbird/modules/jsTestProtocol.jsm
 lib/thunderbird/modules/jsaccount/JSAccountUtils.jsm
 lib/thunderbird/modules/jsaccount/JaBaseUrl.jsm
 lib/thunderbird/modules/jsaccount/TestJaMsgProtocolInfoComponent.jsm
@@ -6641,7 +6638,6 @@ lib/thunderbird/modules/remotepagemanager/RemotePageManagerChild.jsm
 lib/thunderbird/modules/remotepagemanager/RemotePageManagerParent.jsm
 lib/thunderbird/modules/sax.jsm
 lib/thunderbird/modules/sax/sax.js
-${PLIST.debug}lib/thunderbird/modules/services-automation/ServicesAutomation.jsm
 lib/thunderbird/modules/services-common/async.js
 lib/thunderbird/modules/services-common/hawkclient.js
 lib/thunderbird/modules/services-common/hawkrequest.js
diff --git a/thunderbird/TODO b/thunderbird/TODO
index b4b6263ee2..7e3ef2178b 100644
--- a/thunderbird/TODO
+++ b/thunderbird/TODO
@@ -1,17 +1,40 @@
-Assertion failure: i < NUM_TEST_EV_ROOTS (Could not find built-in EV root), at /usr/work/mail/thunderbird/work/thunderbird-102.8.0/security/certverifier/ExtendedValidation.cpp:1246
-[ImapModuleLoader] Using nsImapService.cpp
-[NntpModuleLoader] Using NntpService.jsm
-[Pop3ModuleLoader] Using Pop3Service.jsm
-#01: aom_iwht4x4_16_add_sse2[/usr/pkg/lib/thunderbird/libxul.so +0x36a1f85]
-#02: void std::vector<std::vector<unsigned char, std::allocator<unsigned char> > const*, std::allocator<std::vector<unsigned char, std::allocator<unsigned char> > const*> >::_M_realloc_insert<std::vector<unsigned char, std::allocator<unsigned char> > const* co[/usr/pkg/lib/thunderbird/libxul.so +0x780c386]
-#03: std::__throw_bad_alloc()[/usr/pkg/lib/thunderbird/libxul.so +0x3caed12]
-#04: void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_realloc_insert<std::__cxx11::basic_string<char, std::c[/usr/pkg/lib/thunderbird/libxul.so +0x3cbf755]
-#05: std::__throw_bad_alloc()[/usr/pkg/lib/thunderbird/libxul.so +0x3ca997f]
-#06: std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<ch[/usr/pkg/lib/thunderbird/libxul.so +0x4253304]
-#07: std::function<void (bool&&)>::operator()(bool&&) const[/usr/pkg/lib/thunderbird/libxul.so +0x4204e98]
-#08: void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_realloc_insert<std::__cxx11::basic_string<char, std::c[/usr/pkg/lib/thunderbird/libxul.so +0x3cbe986]
-#09: PR_Select[/usr/pkg/lib/nspr/libnspr4.so +0x2a2f6]
-#10: __libc_thr_exit[/usr/lib/libpthread.so.1 +0xd2df]
-#11: _lwp_exit[/usr/lib/libc.so.12 +0x9b800]
-[1]   Segmentation fault (core dumped) /usr/pkg/lib/thunderbird/thunderbird "${@}"
+Still does not build:
 
+/usr/pkgsrc/wip/thunderbird/work/.cwrapper/bin/c++ -std=gnu++17 -o ../../../dist/bin/xpcshell -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/nspr -I/usr/X11R7/include -I/usr/X11R7/include/libdrm -I/usr/pkg/include/glib-2.0 -I/usr/pkg/include/gio-unix-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/ffmpeg4 -I/usr/pkg/include/freetype2 -I/usr/pkg/include/harfbuzz -fno-sized-deallocation -fno-aligned-new -O2 -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/nspr -I/usr/X11R7/include -I/usr/X11R7/include/libdrm -I/usr/pkg/include/glib-2.0 -I/usr/pkg/include/gio-unix-2.0 -I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/ffmpeg4 -I/usr/pkg/include/freetype2 -I/usr/pkg/include/harfbuzz -fno-exceptions -Dunix -fPIC -DPIC -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -gdwarf-4 -O2 -fomit-frame-pointer -funwind-tables  /usr/pkgsrc/wip/thunderbird/work/build/js
/xpconnect/shell/xpcshell.list    -lpthread -Wl,-R/usr/pkg/lib/thunderbird -Wl,-zrelro -L/usr/pkg/lib -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib -L/usr/pkg/lib/nspr -Wl,-R/usr/pkg/lib/nspr -L/usr/pkg/lib/nss -Wl,-R/usr/pkg/lib/nss -L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib/ffmpeg4 -Wl,-R/usr/pkg/lib/ffmpeg4 -Wl,-z,noexecstack -Wl,-z,text -Wl,-z,relro -Wl,-z,nocopyreloc -Wl,-Bsymbolic-functions -Wl,--build-id=sha1 -fstack-protector-strong -rdynamic -Wl,-rpath-link,/usr/pkgsrc/wip/thunderbird/work/build/dist/bin -Wl,-rpath-link,/usr/pkg/lib   -Wl,--export-dynamic -pie ../../../toolkit/library/build/libxul.so -L/usr/pkg/lib/nspr -Wl,-R/usr/pkg/lib/nspr -lplds4 -lplc4 -lnspr4 -L/usr/pkg/lib -lgdk-3 -lpangocairo-1.0 -lharfbuzz -lpango-1.0 -latk-1.0 -lgtk-3 -lcairo-gobject -lgdk_pixbuf-2.0 -lgio-2.0 -lcairo -lglib-2.0 -lintl -Wl,-R/usr/pkg/lib -lgobject-2.0
+ld: ../../../toolkit/library/build/libxul.so: undefined reference to `ld: ../../toolkit/library/build/libxul.so: undefined reference to `malloc_usable_sizemalloc_usable_size'
+
+However, work/build/config.log contains:
+
+INFO: checking for malloc_usable_size... 
+DEBUG: Creating `/tmp/conftest.p_ow_n0u.c` with content:
+DEBUG: | /* Override any gcc2 internal prototype to avoid an error.  */
+DEBUG: | /* We use char because int might match the return type of a gcc2
+DEBUG: |     builtin and then its argument prototype would still apply.  */
+DEBUG: | char malloc_usable_size();
+DEBUG: | int
+DEBUG: | main(void)
+DEBUG: | {
+DEBUG: | malloc_usable_size();
+DEBUG: |   ;
+DEBUG: |   return 0;
+DEBUG: | }
+DEBUG: Executing: `/usr/pkgsrc/wip/thunderbird/work/.cwrapper/bin/gcc -std=gnu99 /tmp/conftest.p_ow_n0u.c`
+DEBUG: The command returned non-zero exit status 1.
+DEBUG: Its error output was:
+DEBUG: | ld: /tmp//ccQbPi0w.o: in function `main':
+DEBUG: | conftest.p_ow_n0u.c:(.text+0xa): undefined reference to `malloc_usable_size'
+INFO: no
+ 
+But it's apparently despite this check still being used unconditionally.  What gives?
+
+Our <malloc.h> contains
+
+size_t malloc_usable_size(const void *);
+
+but our libc.so doesn't define it, only
+
+: {67} nm -op /lib/libc.so | grep usable_si
+/lib/libc.so:000000000012134c T __je_malloc_usable_size
+: {68} 
+
+How to deal?
diff --git a/thunderbird/distinfo b/thunderbird/distinfo
index f35074a9de..4d306e74f3 100644
--- a/thunderbird/distinfo
+++ b/thunderbird/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.256 2023/02/16 18:11:40 he Exp $
 
-BLAKE2s (thunderbird-102.8.0.source.tar.xz) = 5d6de22c7e4aadb9937982915322f646913f7a1deb73492b68fdf6beeb56fa70
-SHA512 (thunderbird-102.8.0.source.tar.xz) = 2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8
-Size (thunderbird-102.8.0.source.tar.xz) = 506030440 bytes
+BLAKE2s (thunderbird-115.1.1.source.tar.xz) = ae8e48e38a72304058fddbfb19288555b1db557b164128b79bad6de288d2492c
+SHA512 (thunderbird-115.1.1.source.tar.xz) = 26f69dded43bd24ffce9acb0de204bef8c10c8df3cb82b33594d035e41179cb7450cb7c10470bfc92a933c1d801fb968049ea8a17d838d16de9973f5dddff9fc
+Size (thunderbird-115.1.1.source.tar.xz) = 532757140 bytes
 SHA1 (patch-Cargo.lock) = 717351e88b0b58d21dd0159e4eb4a7d5b08d5afe
 SHA1 (patch-Cargo.toml) = 13f8d0bf2a1e2cab7c770c6783497ba923a21d9e
 SHA1 (patch-browser_app_profile_firefox.js) = d53fae5544563888d030af7483f00283a712235c
@@ -10,8 +10,10 @@ SHA1 (patch-build_moz.configure_rust.configure) = 72c5fa2e9d1022325d038832cca2e3
 SHA1 (patch-comm_third__party_botan_configure.py) = 262f560c514d221d0df15a1906100b5e716bfdab
 SHA1 (patch-comm_third__party_libgcrypt_configure) = c5ca8a8b44c485f81139b54d341ac044189d98d3
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = ec0afe1b7d97dc0c305f9f7c197f9a7d7c32e629
+SHA1 (patch-config_make-system-wrappers.py) = ed2e499c954e878b86b32a1c8170693c82b6f8aa
 SHA1 (patch-config_makefiles_rust.mk) = 188178b184d79737247ed3770cc8f4370cd7f6c0
 SHA1 (patch-dom_base_nsAttrName.h) = 4e2326542d4dbba1ac2af5b33505267ee177b094
+SHA1 (patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp) = 4da3ec480c63b96c206abb33d7b732375b7253a9
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = d08f170629dda585dc3e11706688527fe3dc0e78
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 8ddf031923ea7edfd8e51c5ff334870d531fecb5
 SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 6d5b8788d65e742515c4313113fb72372d093dcc
@@ -22,16 +24,13 @@ SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = fa503231403a18e4ca6947fcd9985d
 SHA1 (patch-js_src_jsfriendapi.h) = e013337469254e2a9e598bd070528f0f654acccb
 SHA1 (patch-js_src_util_NativeStack.cpp) = 338fdf6aa34101f6a41d07b303d4a8426c483d5b
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = 5a7ad4d38165d49d44862ade846cb79de026867e
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 99e881e557430c1ef26060109f4b40c30d3b201c
 SHA1 (patch-media_libcubeb_src_cubeb__sun.c) = 789312b0511f2667ab7ee581f066b6ecc129ad4f
-SHA1 (patch-media_libcubeb_src_moz.build) = bd3275f1acb6e439dee98b1673eeb65ec7797974
 SHA1 (patch-media_libpng_pngpriv.h) = 5c49119b0e555c9daca64799ff03f3fa8fa05ded
 SHA1 (patch-media_libtheora_lib_info.c) = 96f3d3824459186476102a4598d07cf6f6a704ef
 SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = 20b208c5ab4bfea5d49d79c19fc610867da0c4c7
 SHA1 (patch-old-configure.in) = d59d276124e1f95d9e144b8f7099abcf6de0489a
 SHA1 (patch-python_mozbuild_mozbuild_action_langpack_manifest.py) = 99b9e258a56a28610856298c2b80157668209f36
 SHA1 (patch-security_nss_lib_freebl_mpi_mpi.c) = 0cbf185955c77c9438ced0c294fbc8e4824797bf
-SHA1 (patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc) = 4b6b78b899b3ac4176aeba58b3d2af6d66c05a77
 SHA1 (patch-third__party_rust_bindgen_src_clang.rs) = e3b749622a95a93d3667588355480fc82a9e54f6
 SHA1 (patch-third__party_rust_bindgen_src_ir_comp.rs) = 770fc5cf5a25bb86cb7adb9379d3c63eed0d9d86
 SHA1 (patch-third__party_rust_bindgen_src_ir_ty.rs) = 8151426f3c633a16e51e71745689aed5995abadf
@@ -39,8 +38,8 @@ SHA1 (patch-third__party_rust_bindgen_src_ir_var.rs) = d2701055a3cf74ac210c350f0
 SHA1 (patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e9378a3868ddb628213c3a37e2177257c2344bc3
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = f80a0844ca37dda91a8cf38d6a542f152657901a
 SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = d718759e59910228cc3729e359f328b47aff5eb4
-SHA1 (patch-toolkit_moz.configure) = b8907d57570bfd87708c5630e44c919710be0b9c
+SHA1 (patch-toolkit_moz.configure) = 0729af2807944bd5b6b19b4e760d3b5b3435b6a0
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 407fe861dd9b82a88a6f5c0ed1e519a3c0e67251
 SHA1 (patch-toolkit_xre_glxtest_cpp) = 07dc19086a0e9d12bcb0c9ca0cc58bd0562bcfdd
-SHA1 (patch-widget_gtk_DMABufSurface.cpp) = aea8998364945f0a435ad63860ab50d56d5c0895
+SHA1 (patch-widget_gtk_DMABufSurface.cpp) = 69bc97406748c5718c4f6991e6cc35a12eb92fbc
 SHA1 (patch-xpcom_base_nscore.h) = 6e6f2d564d8d6121c178c2567cce8ac2ebe8610b
diff --git a/thunderbird/mozilla-common.mk b/thunderbird/mozilla-common.mk
index 812208b7d9..f0a5526520 100644
--- a/thunderbird/mozilla-common.mk
+++ b/thunderbird/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.5 2023/02/05 09:05:28 he Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2023/07/09 19:02:07 abs Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -7,14 +7,13 @@
 .include "../../mk/bsd.prefs.mk"
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
-PYTHON_VERSIONS_INCOMPATIBLE+=	311
 
 PYTHON_FOR_BUILD_ONLY=		tool
 ALL_ENV+=			PYTHON3=${PYTHONBIN}
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
-USE_TOOLS+=		pkg-config perl gmake autoconf213 unzip zip
+USE_TOOLS+=		pkg-config perl gmake unzip zip
 UNLIMIT_RESOURCES+=	datasize virtualsize
 
 USE_LANGUAGES+=		c c++
@@ -106,12 +105,12 @@ CONFIGURE_ARGS+=	--disable-updater
 # RLBox WASM sandbox
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
 # For wasm-ld command
-TOOL_DEPENDS+=		lld-[0-9]*:../../wip/lld
-.include "../../wip/wasi-libc/buildlink3.mk"
-.include "../../wip/wasi-libcxx/buildlink3.mk"
+TOOL_DEPENDS+=		lld-[0-9]*:../../devel/lld
+.include "../../lang/wasi-libc/buildlink3.mk"
+.include "../../lang/wasi-libcxx/buildlink3.mk"
 # NB the exact versions of the clang and wasi-compiler-rt dependencies must
 # be kept in sync, or build failures will occur due to path mismatches.
-.include "../../wip/wasi-compiler-rt/buildlink3.mk"
+.include "../../lang/wasi-compiler-rt/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-wasi-sysroot=${PREFIX}/wasi
 CONFIGURE_ENV+=		WASM_CC=${PREFIX}/bin/clang
 CONFIGURE_ENV+=		WASM_CXX=${PREFIX}/bin/clang++
@@ -119,11 +118,11 @@ CONFIGURE_ENV+=		WASM_CXX=${PREFIX}/bin/clang++
 CONFIGURE_ARGS+=	--without-wasm-sandboxed-libraries
 .endif
 
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		pre-configure
-SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
-SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
-SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
+#SUBST_CLASSES+=			fix-paths
+#SUBST_STAGE.fix-paths=		pre-configure
+#SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
+#SUBST_FILES.fix-paths+=		${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
+#SUBST_SED.fix-paths+=		-e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
 
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}build/autoconf/config.guess
 CONFIG_GUESS_OVERRIDE+=		${MOZILLA_DIR}js/src/build/autoconf/config.guess
@@ -207,7 +206,7 @@ BUILDLINK_API_DEPENDS.nss+=	nss>=3.53
 BUILDLINK_API_DEPENDS.libwebp+=	libwebp>=1.0.2
 .include "../../graphics/libwebp/buildlink3.mk"
 BUILDLINK_DEPMETHOD.clang=	build
-.include "../../wip/clang/buildlink3.mk"
+.include "../../lang/clang/buildlink3.mk"
 RUST_REQ=	1.41.0
 .include "../../lang/rust/rust.mk"
 # webrtc option requires internal libvpx
diff --git a/thunderbird/patch-build_unix_stdc++compat_stdc++compat.cpp b/thunderbird/patch-build_unix_stdc++compat_stdc++compat.cpp
deleted file mode 100644
index e2939bbad8..0000000000
--- a/thunderbird/patch-build_unix_stdc++compat_stdc++compat.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- build/unix/stdc++compat/stdc++compat.cpp.orig	2023-05-13 20:47:48.708400730 +0200
-+++ build/unix/stdc++compat/stdc++compat.cpp	2023-05-13 20:52:07.029007269 +0200
-@@ -24,6 +24,7 @@
-    GLIBCXX_3.4.27 is from gcc 10
-    GLIBCXX_3.4.28 is from gcc 10
-    GLIBCXX_3.4.29 is from gcc 11
-+   GLIBCXX_3.4.30 is from gcc 12
- 
- This file adds the necessary compatibility tricks to avoid symbols with
- version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
-@@ -69,6 +70,18 @@
- }  // namespace std
- #endif
- 
-+#if _GLIBCXX_RELEASE >= 12
-+namespace std {
-+/* This avoids the GLIBCXX_3.4.30 symbol version. */
-+void __attribute__((weak))
-+__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
-+		      const char* __condition) {
-+  MOZ_CRASH();
-+}
-+
-+}  // namespace std
-+#endif
-+
- /* While we generally don't build with exceptions, we have some host tools
-  * that do use them. libstdc++ from GCC 5.0 added exception constructors with
-  * char const* argument. Older versions only have a constructor with
diff --git a/thunderbird/patch-dom_media_webrtc_sdp_RsdparsaSdpGlue.cpp b/thunderbird/patch-dom_media_webrtc_sdp_RsdparsaSdpGlue.cpp
deleted file mode 100644
index f073d56c9f..0000000000
--- a/thunderbird/patch-dom_media_webrtc_sdp_RsdparsaSdpGlue.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp.orig	2023-05-12 14:15:02.145219021 +0200
-+++ dom/media/webrtc/sdp/RsdparsaSdpGlue.cpp	2023-05-12 14:15:48.433146715 +0200
-@@ -3,6 +3,7 @@
- /* This Source Code Form is subject to the terms of the Mozilla Public
-  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
-  * You can obtain one at http://mozilla.org/MPL/2.0/. */
-+#include <cstdint>
- #include <string>
- 
- #include "sdp/RsdparsaSdpInc.h"
diff --git a/thunderbird/patch-gfx_2d_Rect.h b/thunderbird/patch-gfx_2d_Rect.h
deleted file mode 100644
index 0c55edc6e0..0000000000
--- a/thunderbird/patch-gfx_2d_Rect.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- gfx/2d/Rect.h.orig	2023-05-12 14:17:38.303449723 +0200
-+++ gfx/2d/Rect.h	2023-05-12 14:18:04.645202892 +0200
-@@ -15,6 +15,7 @@
- #include "mozilla/Maybe.h"
- 
- #include <cmath>
-+#include <cstdint>
- 
- namespace mozilla {
- 
diff --git a/thunderbird/patch-toolkit_components_telemetry_pingsender_pingsender.cpp b/thunderbird/patch-toolkit_components_telemetry_pingsender_pingsender.cpp
deleted file mode 100644
index 51cf0d5837..0000000000
--- a/thunderbird/patch-toolkit_components_telemetry_pingsender_pingsender.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- toolkit/components/telemetry/pingsender/pingsender.cpp.orig	2023-05-12 14:19:10.322882448 +0200
-+++ toolkit/components/telemetry/pingsender/pingsender.cpp	2023-05-12 14:19:26.908660689 +0200
-@@ -3,6 +3,7 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-+#include <cstdint>
- #include <cstdlib>
- #include <cstring>
- #include <ctime>
diff --git a/thunderbird/patch-tools_profiler_core_platform.cpp b/thunderbird/patch-tools_profiler_core_platform.cpp
deleted file mode 100644
index cfbf14d8bd..0000000000
--- a/thunderbird/patch-tools_profiler_core_platform.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
-
---- tools/profiler/core/platform.cpp.orig	2023-05-12 18:28:37.639313036 +0200
-+++ tools/profiler/core/platform.cpp	2023-05-12 18:35:52.993265195 +0200
-@@ -1106,7 +1106,7 @@
-         continue;
-       }
-       ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
--          offThreadRef.LockedRWFromAnyThread();
-+          offThreadRef.GetLockedRWFromAnyThread();
-       MOZ_RELEASE_ASSERT(array.append(ProfiledThreadListElement{
-           profiledThreadData->Info().RegisterTime(),
-           lockedThreadData->GetJSContext(), profiledThreadData}));
-@@ -4050,7 +4050,7 @@
- 
-             if (threadStackSampling) {
-               ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
--                  lockedThreadData = offThreadRef.LockedRWFromAnyThread();
-+                  lockedThreadData = offThreadRef.GetLockedRWFromAnyThread();
-               // Suspend the thread and collect its stack data in the local
-               // buffer.
-               mSampler.SuspendAndSampleAndResumeThread(
-@@ -4764,7 +4764,7 @@
-             aLock, aOffThreadRef.UnlockedConstReaderCRef().Info());
-     if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
-       ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock
--          lockedRWFromAnyThread = aOffThreadRef.LockedRWFromAnyThread();
-+          lockedRWFromAnyThread = aOffThreadRef.GetLockedRWFromAnyThread();
- 
-       ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
-           aLock, MakeUnique<ProfiledThreadData>(
-@@ -5629,7 +5629,7 @@
-         ActivePS::ProfilingFeaturesForThread(aLock, info);
-     if (threadProfilingFeatures != ThreadProfilingFeatures::NotProfiled) {
-       ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
--          offThreadRef.LockedRWFromAnyThread();
-+          offThreadRef.GetLockedRWFromAnyThread();
-       ProfiledThreadData* profiledThreadData = ActivePS::AddLiveProfiledThread(
-           aLock, MakeUnique<ProfiledThreadData>(info));
-       lockedThreadData->SetProfilingFeaturesAndData(threadProfilingFeatures,
-@@ -5853,7 +5853,7 @@
-     }
- 
-     ThreadRegistry::OffThreadRef::RWFromAnyThreadWithLock lockedThreadData =
--        offThreadRef.LockedRWFromAnyThread();
-+        offThreadRef.GetLockedRWFromAnyThread();
- 
-     lockedThreadData->ClearProfilingFeaturesAndData(aLock);
- 
-@@ -6196,7 +6196,7 @@
-   // thread that is in the process of disappearing.
- 
-   ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
--      aOnThreadRef.LockedRWOnThread();
-+      aOnThreadRef.GetLockedRWOnThread();
- 
-   ProfiledThreadData* profiledThreadData =
-       lockedThreadData->GetProfiledThreadData(lock);
-@@ -6717,7 +6717,7 @@
-         // The profiler mutex must be locked before the ThreadRegistration's.
-         PSAutoLock lock;
-         ThreadRegistration::OnThreadRef::RWOnThreadWithLock lockedThreadData =
--            aOnThreadRef.LockedRWOnThread();
-+            aOnThreadRef.GetLockedRWOnThread();
- 
-         if (ProfiledThreadData* profiledThreadData =
-                 lockedThreadData->GetProfiledThreadData(lock);
diff --git a/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistration.h b/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistration.h
deleted file mode 100644
index 925a4a7916..0000000000
--- a/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistration.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- tools/profiler/public/ProfilerThreadRegistration.h.orig	2023-05-12 18:38:17.497857025 +0200
-+++ tools/profiler/public/ProfilerThreadRegistration.h	2023-05-12 18:40:07.902690604 +0200
-@@ -214,14 +214,14 @@
-       DataLock mDataLock;
-     };
- 
--    [[nodiscard]] RWOnThreadWithLock LockedRWOnThread() {
-+    [[nodiscard]] RWOnThreadWithLock GetLockedRWOnThread() {
-       return RWOnThreadWithLock{mThreadRegistration->mData,
-                                 mThreadRegistration->mDataMutex};
-     }
- 
-     template <typename F>
-     auto WithLockedRWOnThread(F&& aF) {
--      RWOnThreadWithLock lockedData = LockedRWOnThread();
-+      RWOnThreadWithLock lockedData = GetLockedRWOnThread();
-       return std::forward<F>(aF)(lockedData.DataRef());
-     }
- 
diff --git a/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistry.h b/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistry.h
deleted file mode 100644
index ae7be3546b..0000000000
--- a/thunderbird/patch-tools_profiler_public_ProfilerThreadRegistry.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- tools/profiler/public/ProfilerThreadRegistry.h.orig	2023-05-12 18:43:33.901805488 +0200
-+++ tools/profiler/public/ProfilerThreadRegistry.h	2023-05-12 18:44:46.758075369 +0200
-@@ -177,14 +177,14 @@
-       ThreadRegistration::DataLock mDataLock;
-     };
- 
--    [[nodiscard]] RWFromAnyThreadWithLock LockedRWFromAnyThread() {
-+    [[nodiscard]] RWFromAnyThreadWithLock GetLockedRWFromAnyThread() {
-       return RWFromAnyThreadWithLock{mThreadRegistration->mData,
-                                      mThreadRegistration->mDataMutex};
-     }
- 
-     template <typename F>
-     auto WithLockedRWFromAnyThread(F&& aF) {
--      RWFromAnyThreadWithLock lockedData = LockedRWFromAnyThread();
-+      RWFromAnyThreadWithLock lockedData = GetLockedRWFromAnyThread();
-       return std::forward<F>(aF)(lockedData.DataRef());
-     }
- 
diff --git a/thunderbird/patch-tools_profiler_tests_gtest_GeckoProfiler.cpp b/thunderbird/patch-tools_profiler_tests_gtest_GeckoProfiler.cpp
deleted file mode 100644
index fd396060ba..0000000000
--- a/thunderbird/patch-tools_profiler_tests_gtest_GeckoProfiler.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-GCC 13 fixes.
-
---- tools/profiler/tests/gtest/GeckoProfiler.cpp.orig	2023-05-12 18:45:52.823502307 +0200
-+++ tools/profiler/tests/gtest/GeckoProfiler.cpp	2023-05-12 18:47:25.421971082 +0200
-@@ -621,7 +621,7 @@
-       EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
-       {
-         TR::OnThreadRef::RWOnThreadWithLock rwOnThreadWithLock =
--            aOnThreadRef.LockedRWOnThread();
-+            aOnThreadRef.GetLockedRWOnThread();
-         EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
-         TestConstLockedRWOnThread(rwOnThreadWithLock.DataCRef(),
-                                   beforeRegistration, afterRegistration,
-@@ -1020,7 +1020,7 @@
-         EXPECT_FALSE(TR::IsDataMutexLockedOnCurrentThread());
-         {
-           TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
--              aOffThreadRef.LockedRWFromAnyThread();
-+              aOffThreadRef.GetLockedRWFromAnyThread();
-           if (profiler_current_thread_id() == testThreadId) {
-             EXPECT_TRUE(TR::IsDataMutexLockedOnCurrentThread());
-           }
-@@ -1157,7 +1157,7 @@
-             PR_Sleep(PR_MillisecondsToInterval(1));
-           }
-           TRy::OffThreadRef::RWFromAnyThreadWithLock rwFromAnyThreadWithLock =
--              aOffThreadRef.LockedRWFromAnyThread();
-+              aOffThreadRef.GetLockedRWFromAnyThread();
-           ++otherThreadReads;
-           if (otherThreadReads % 1000 == 0) {
-             PR_Sleep(PR_MillisecondsToInterval(1));
diff --git a/thunderbird/patches/patch-config_make-system-wrappers.py b/thunderbird/patches/patch-config_make-system-wrappers.py
new file mode 100644
index 0000000000..c5d2a05a00
--- /dev/null
+++ b/thunderbird/patches/patch-config_make-system-wrappers.py
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Avoid trying to include <alloca.h> on NetBSD.
+
+--- config/make-system-wrappers.py.orig	2023-08-14 18:19:44.000000000 +0000
++++ config/make-system-wrappers.py
+@@ -26,6 +26,10 @@ def gen_wrappers(unused, outdir, *header
+                 # This was fixed in Wayland 1.12, but for versions earlier than
+                 # that, we work around that by force-including math.h first.
+                 includes = "#include <math.h>\n" + includes
++            elif header == "alloca.h":
++                # <alloca.h> is apparently a Linuxism, and is at least
++                # not present on NetBSD, so avoid this there
++                includes = "#ifndef __NetBSD__\n" + includes + "\n#endif\n"
+             elif header == "wayland-client.h":
+                 # The system wayland-client.h uses quote includes for
+                 # wayland-util.h, which means wayland-util.h is picked from the
diff --git a/thunderbird/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp b/thunderbird/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
new file mode 100644
index 0000000000..ee56b5b95b
--- /dev/null
+++ b/thunderbird/patches/patch-dom_webtransport_api_WebTransportDatagramDuplexStream.cpp
@@ -0,0 +1,42 @@
+$NetBSD$
+
+Use std::isnan() instead of just isnan(), as that's what's available.
+
+--- dom/webtransport/api/WebTransportDatagramDuplexStream.cpp.orig	2023-08-14 18:19:46.000000000 +0000
++++ dom/webtransport/api/WebTransportDatagramDuplexStream.cpp
+@@ -62,7 +62,7 @@ void WebTransportDatagramDuplexStream::S
+                                                          ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incomingmaxage
+   // Step 1
+-  if (isnan(aMaxAge) || aMaxAge < 0.) {
++  if (std::isnan(aMaxAge) || aMaxAge < 0.) {
+     aRv.ThrowRangeError("Invalid IncomingMaxAge");
+     return;
+   }
+@@ -78,7 +78,7 @@ void WebTransportDatagramDuplexStream::S
+                                                          ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoingmaxage
+   // Step 1
+-  if (isnan(aMaxAge) || aMaxAge < 0.) {
++  if (std::isnan(aMaxAge) || aMaxAge < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingMaxAge");
+     return;
+   }
+@@ -94,7 +94,7 @@ void WebTransportDatagramDuplexStream::S
+     double aWaterMark, ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-incominghighwatermark
+   // Step 1
+-  if (isnan(aWaterMark) || aWaterMark < 0.) {
++  if (std::isnan(aWaterMark) || aWaterMark < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingMaxAge");
+     return;
+   }
+@@ -110,7 +110,7 @@ void WebTransportDatagramDuplexStream::S
+     double aWaterMark, ErrorResult& aRv) {
+   // https://w3c.github.io/webtransport/#dom-webtransportdatagramduplexstream-outgoinghighwatermark
+   // Step 1
+-  if (isnan(aWaterMark) || aWaterMark < 0.) {
++  if (std::isnan(aWaterMark) || aWaterMark < 0.) {
+     aRv.ThrowRangeError("Invalid OutgoingHighWaterMark");
+     return;
+   }
diff --git a/thunderbird/patches/patch-media_libcubeb_src_cubeb__alsa.c b/thunderbird/patches/patch-media_libcubeb_src_cubeb__alsa.c
deleted file mode 100644
index 7185b1de75..0000000000
--- a/thunderbird/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.3 2023/02/05 09:05:29 he Exp $
-
---- media/libcubeb/src/cubeb_alsa.c.orig	2020-08-28 21:33:11.000000000 +0000
-+++ media/libcubeb/src/cubeb_alsa.c
-@@ -7,6 +7,7 @@
- #undef NDEBUG
- #define _DEFAULT_SOURCE
- #define _BSD_SOURCE
-+#define _NETBSD_SOURCE
- #define _XOPEN_SOURCE 500
- #include "cubeb-internal.h"
- #include "cubeb/cubeb.h"
diff --git a/thunderbird/patches/patch-media_libcubeb_src_moz.build b/thunderbird/patches/patch-media_libcubeb_src_moz.build
deleted file mode 100644
index ae3445af88..0000000000
--- a/thunderbird/patches/patch-media_libcubeb_src_moz.build
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.5 2023/02/05 09:05:29 he Exp $
-
---- media/libcubeb/src/moz.build.orig	2022-12-20 00:49:56.000000000 +0000
-+++ media/libcubeb/src/moz.build
-@@ -22,6 +22,12 @@ if CONFIG['MOZ_ALSA']:
-     ]
-     DEFINES['USE_ALSA'] = True
- 
-+if CONFIG['MOZ_SUNAUDIO']:
-+    SOURCES += [
-+        'cubeb_sun.c',
-+    ]
-+    DEFINES['USE_SUN'] = True
-+
- if (
-     CONFIG["MOZ_PULSEAUDIO"]
-     or CONFIG["MOZ_JACK"]
diff --git a/thunderbird/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc b/thunderbird/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc
deleted file mode 100644
index cf3dcd63f6..0000000000
--- a/thunderbird/patches/patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-third__party_libwebrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2023/02/05 09:05:29 he Exp $
-
---- third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc.orig	2020-08-28 21:33:15.000000000 +0000
-+++ third_party/libwebrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -385,11 +385,15 @@ bool DeviceInfoLinux::IsDeviceNameMatche
- 
- bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap)
- {
-+#ifdef V4L2_CAP_DEVICE_CAPS
-   if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) {
-     return cap->device_caps & V4L2_CAP_VIDEO_CAPTURE;
-   } else {
-     return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE;
-   }
-+#else
-+  return 1;
-+#endif
- }
- 
- int32_t DeviceInfoLinux::FillCapabilities(int fd) {
diff --git a/thunderbird/patches/patch-toolkit_moz.configure b/thunderbird/patches/patch-toolkit_moz.configure
index 5eaf098e8f..b2afb7e696 100644
--- a/thunderbird/patches/patch-toolkit_moz.configure
+++ b/thunderbird/patches/patch-toolkit_moz.configure
@@ -2,16 +2,16 @@ $NetBSD: patch-toolkit_moz.configure,v 1.3 2023/02/05 09:05:29 he Exp $
 
 --- toolkit/moz.configure.orig	2020-08-28 21:33:59.000000000 +0000
 +++ toolkit/moz.configure
-@@ -310,8 +310,6 @@ set_config("MOZ_OPENSL", imply_opensl, w
+@@ -325,7 +325,7 @@ set_config("MOZ_OPENSL", imply_opensl, w
  
  set_config("MOZ_OSS", imply_oss, when="--enable-audio-backends")
  
 -imply_option("--enable-pulseaudio", imply_pulseaudio, reason="--enable-audio-backends")
--
++# imply_option("--enable-pulseaudio", imply_pulseaudio, reason="--enable-audio-backends")
+ 
  imply_option("--enable-sndio", imply_sndio, reason="--enable-audio-backends")
  
- set_config("MOZ_WASAPI", imply_wasapi, when="--enable-audio-backends")
-@@ -1099,7 +1097,7 @@ set_define("MOZ_WEBSPEECH_TEST_BACKEND",
+@@ -1167,7 +1167,7 @@ set_define("MOZ_WEBSPEECH_TEST_BACKEND",
  # ==============================================================
  @depends(target, milestone)
  def skia_pdf_default(target, milestone):
diff --git a/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp b/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp
index 474df72edb..4bfe8dd3f5 100644
--- a/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp
+++ b/thunderbird/patches/patch-widget_gtk_DMABufSurface.cpp
@@ -14,15 +14,15 @@ No eventfd on NetBSD 9 and older, fix build
  #include <poll.h>
  #include <sys/ioctl.h>
  
-@@ -97,6 +99,7 @@ void DMABufSurface::GlobalRefAdd() {
+@@ -147,6 +149,7 @@ void DMABufSurface::GlobalRefAdd() {
  }
  
  void DMABufSurface::GlobalRefCountCreate() {
 +#ifndef __NetBSD__
-   MOZ_ASSERT(!mGlobalRefCountFd);
-   mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
-   if (mGlobalRefCountFd < 0) {
-@@ -106,6 +109,7 @@ void DMABufSurface::GlobalRefCountCreate
+   LOGDMABUFREF(("DMABufSurface::GlobalRefCountCreate UID %d", mUID));
+   MOZ_DIAGNOSTIC_ASSERT(!mGlobalRefCountFd);
+   // Create global ref count initialized to 0,
+@@ -159,6 +162,7 @@ void DMABufSurface::GlobalRefCountCreate
      mGlobalRefCountFd = 0;
      return;
    }
Prev by Date: wip: Add ast-grep
Next by Date: ast-grep: Install via custom do-install
Previous by Thread: wip: Add ast-grep
Next by Thread: ast-grep: Install via custom do-install
Indexes:
Home | Main Index | Thread Index | Old Index