thunderbird: 102.2.2 -> 102.4.1

thunderbird/.signature

@@ -1,9 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38HbEpaIOWMVTtUXV6SoCQKuhiqYZXi6vhNI3OjRMbGVT3gfHxjX/Rh8EKOqaFRj2PU0bpdkJ+YdJk5Byz5ORwo=
-SHA256 (Pkgfile) = efea3318e264663e6f4ff2671507dc2883bdce8515dbb84ecade8ff94d6d25e5
+RWSagIOpLGJF3/0bKpTOVJJcyM5QKYjYtTntiMaD+vgK2xhAvkDXyQLOSszsz05t6+YDzGmVF8pHffXnBWSCWRKy6yuWACfAwQg=
+SHA256 (Pkgfile) = 1c43b21168863cf9feb8c638494d133b89427712d749ca20f3d13741fcbcb8e4
 SHA256 (.footprint) = b4b411c70602919b2afe6fbf140755bd53ad1f77d2ff5013a899e0a3cf4543d2
-SHA256 (thunderbird-102.2.2.source.tar.xz) = 5d5f327ea450572ef2a135e5c849b3f38f7d54e897f41a1dec5223e184558f2b
+SHA256 (thunderbird-102.4.1.source.tar.xz) = d3766bf809f9083c0da0a1ae035509a43a10f79c614563b3e4278ae3eb6974a0
 SHA256 (thunderbird.desktop) = c6bc6a66f16951c4f7560d019dad48968169aef6587cef4e98380a300078299a
-SHA256 (cbindgen-0.24.patch) = 4628d136c3beada292e83cd8e89502cac4aa3836851b34259a665582a7713978
-SHA256 (rustc_version-0.4.0.patch) = 4e7bb6d1205d9b0ed226f5636f6270afefc3e60eee1d8a2f6ede41e874728dc6
-SHA256 (packed_simd_2-0.3.8.patch) = 8a5654094f17358acf166a185e037a2a008ca47d63ee0130c797a079e437ae42

thunderbird/Pkgfile

@@ -1,25 +1,18 @@
 # Description: Email client from the Mozilla project
 # URL: https://www.thunderbird.net/en-US/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg gtk libwebp libevent libidl libnotify libvpx lld nodejs nss startup-notification unzip zip wasi-libc++
+# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg gtk libevent libidl libnotify libvpx libwebp lld nodejs nss startup-notification unzip wasi-libc++ zip
 # Optional: sccache
 
 name=thunderbird
-version=102.2.2
+version=102.4.1
 release=1
 source=(https://archive.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz
-	$name.desktop
-	cbindgen-0.24.patch
-	rustc_version-0.4.0.patch
-	packed_simd_2-0.3.8.patch)
- 
+	$name.desktop)
+
 build() {
 	cd $name-$version
 
-	patch -p1 -i $SRC/cbindgen-0.24.patch
-	patch -p1 -i $SRC/rustc_version-0.4.0.patch
-	patch -p1 -i $SRC/packed_simd_2-0.3.8.patch
-
 	if [ -e '/usr/bin/ccache' ]; then
 		export OS_CCACHE_COMPILERCHECK="$(/usr/bin/clang -dumpversion | sed -z 's/\n/ /g'; crux | cut -d' ' -f3)"
 		export CCACHE_COMPILERCHECK="string:$OS_CCACHE_COMPILERCHECK"
@@ -30,6 +23,8 @@ build() {
 	mkdir "$PKGMK_SOURCE_DIR/rust" || true
 	export CARGO_HOME="$PKGMK_SOURCE_DIR/rust"
 
+	sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h
+
 cat <<- EOF > .mozconfig
 	ac_add_options --prefix=/usr
 	ac_add_options --enable-application=comm/mail
@@ -41,7 +36,6 @@ cat <<- EOF > .mozconfig
 	ac_add_options --with-system-libevent
 	ac_add_options --with-system-libvpx
 	ac_add_options --with-system-webp
-	ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot
 	ac_add_options --enable-av1
 	ac_add_options --enable-system-ffi
 	ac_add_options --enable-system-pixman
@@ -58,14 +52,14 @@ cat <<- EOF > .mozconfig
 	ac_add_options --disable-updater
 	ac_add_options --disable-crashreporter
 	ac_add_options --disable-necko-wifi
-	ac_add_options --disable-pulseaudio
 	ac_add_options --disable-elf-hack
+	ac_add_options --without-wasm-sandboxed-libraries
 EOF
 
 	# audio
-	prt-get isinst alsa-lib && echo 'ac_add_options --enable-alsa' >> .mozconfig || echo 'ac_add_options --disable-alsa' >> .mozconfig
-	prt-get isinst jack && echo 'ac_add_options --enable-jack' >> .mozconfig || echo 'ac_add_options --disable-jack' >> .mozconfig
-	prt-get isinst pulseaudio && echo 'ac_add_options --enable-pulseaudio' >> .mozconfig || echo 'ac_add_options --disable-pulseaudio' >> .mozconfig
+	prt-get isinst alsa-lib && echo 'ac_add_options --enable-audio-backends=alsa' >> .mozconfig
+	prt-get isinst pulseaudio && sed -i '/audio-backends/s/alsa/&,pulseaudio/' .mozconfig
+	#prt-get isinst jack && echo 'ac_add_options --enable-jack' >> .mozconfig || echo 'ac_add_options --disable-jack' >> .mozconfig
 
 	prt-get isinst wayland-protocols && \
 		echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \

thunderbird/cbindgen-0.24.patch

@@ -1,17 +0,0 @@
-Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places.
-Author: Olivier Tilloy <olivier.tilloy@canonical.com>
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
-Forwarded: not-needed
-
---- a/gfx/webrender_bindings/webrender_ffi.h
-+++ b/gfx/webrender_bindings/webrender_ffi.h
-@@ -73,8 +73,6 @@ struct WrPipelineInfo;
- struct WrPipelineIdAndEpoch;
- using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
- 
--const uint64_t ROOT_CLIP_CHAIN = ~0;
--
- }  // namespace wr
- }  // namespace mozilla
- 
-