From 60549fc90cdf2b40ca87415b03354c5a39af63fa Mon Sep 17 00:00:00 2001 From: John McQuah Date: Wed, 12 Jul 2023 22:00:01 -0400 Subject: [PATCH] thunderbird: 102.13.0 -> 115.0 --- thunderbird/.footprint | 6 ++++++ thunderbird/.signature | 8 ++++---- thunderbird/Pkgfile | 27 ++++++++++++++++----------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/thunderbird/.footprint b/thunderbird/.footprint index 63e2121c6..bad05e7ba 100644 --- a/thunderbird/.footprint +++ b/thunderbird/.footprint @@ -10,6 +10,8 @@ drwxr-xr-x root/root usr/lib/thunderbird/ drwxr-xr-x root/root usr/lib/thunderbird/chrome/ drwxr-xr-x root/root usr/lib/thunderbird/chrome/icons/ drwxr-xr-x root/root usr/lib/thunderbird/chrome/icons/default/ +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/calendar-alarm-dialog.png +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/calendar-general-dialog.png -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default128.png -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default16.png -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default22.png @@ -18,6 +20,10 @@ drwxr-xr-x root/root usr/lib/thunderbird/chrome/icons/default/ -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default32.png -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default48.png -rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/default64.png +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/msgcomposeWindow16.png +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/msgcomposeWindow24.png +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/msgcomposeWindow32.png +-rw-r--r-- root/root usr/lib/thunderbird/chrome/icons/default/msgcomposeWindow48.png drwxr-xr-x root/root usr/lib/thunderbird/defaults/ drwxr-xr-x root/root usr/lib/thunderbird/defaults/messenger/ -rw-r--r-- root/root usr/lib/thunderbird/defaults/messenger/mailViews.dat diff --git a/thunderbird/.signature b/thunderbird/.signature index 26feb142f..21dfecd31 100644 --- a/thunderbird/.signature +++ b/thunderbird/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37Kfgg7BmErvy+BwfqX1YLp2MQ8I/X7G8cFoyVLXkkyIDTUCPW6u5m9THpxhXtu48XvgeYV8vecSHx8xDZ0RSQY= -SHA256 (Pkgfile) = be33ccbcbf3f5607d9264462982000a8b7eafebe4c0d92b279587af178713488 -SHA256 (.footprint) = b4b411c70602919b2afe6fbf140755bd53ad1f77d2ff5013a899e0a3cf4543d2 -SHA256 (thunderbird-102.13.0.source.tar.xz) = 7a7208cab2810231c2842334a2ffb37d704934dd212011395aec3609751affbc +RWSagIOpLGJF3xVLP1+zvLYNgT5Yhk10phjphym9YZsB0tMQzawgdlxqYauVaqjMse5DoOaopghY9DgLotp3X/weJLgKgGP2DQI= +SHA256 (Pkgfile) = 0f9df0c5b47ffa586cda0c4760bd138e60f6a503ae998247cd54e844a71ccd60 +SHA256 (.footprint) = 333f1b8ebb51a1437a3eae54b146017e421f38c4c98cdb05166a5d793a8d5210 +SHA256 (thunderbird-115.0.source.tar.xz) = 3edc85647dcebde8b84c17e6eeff6ca9866a9f0ffe9a67d786fdb442c8a9a9ad SHA256 (thunderbird.desktop) = c6bc6a66f16951c4f7560d019dad48968169aef6587cef4e98380a300078299a diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index d122f50dd..eda51dca8 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,13 +1,13 @@ # Description: Email client from the Mozilla project # URL: https://www.thunderbird.net/en-US/ # Maintainer: unmaintained -# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg libevent libidl libnotify libvpx libwebp lld nodejs nss startup-notification unzip wasi-libc++ xorg-libxcomposite xorg-libxcursor zip -# Optional: sccache +# Depends on: alsa-lib autoconf-2.13 cbindgen clang dbus-glib gnupg libevent libidl libnotify libvpx libwebp nodejs nss startup-notification unzip xorg-libxcomposite xorg-libxcursor zip +# Optional: pulseaudio sccache lld name=thunderbird -version=102.13.0 +version=115.0 release=1 -source=(https://archive.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.xz +source=(https://ftp.mozilla.org/pub/$name/releases/$version/source/$name-$version.source.tar.xz $name.desktop) build() { @@ -20,7 +20,7 @@ build() { fi prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache - mkdir "$PKGMK_SOURCE_DIR/rust" || true + mkdir -p "$PKGMK_SOURCE_DIR/rust" export CARGO_HOME="$PKGMK_SOURCE_DIR/rust" sed -i '/ROOT_CLIP_CHAIN/d' gfx/webrender_bindings/webrender_ffi.h @@ -40,12 +40,11 @@ cat <<- EOF > .mozconfig ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman ac_add_options --enable-optimize - ac_add_options --enable-linker=lld - ac_add_options --enable-lto=thin ac_add_options --enable-release ac_add_options --enable-rust-simd ac_add_options --enable-official-branding ac_add_options --with-distribution-id=nu.crux + ac_add_options --enable-lto=thin ac_add_options --disable-debug ac_add_options --disable-debug-symbols ac_add_options --disable-tests @@ -56,16 +55,22 @@ cat <<- EOF > .mozconfig ac_add_options --without-wasm-sandboxed-libraries EOF + # use llvm linker, if available + prt-get isinst lld && \ + { echo -e "ac_add_options --enable-linker=lld" >> .mozconfig; + export LDFLAGS+=" -Wl,--thinlto-jobs=$((JOBS / 2))"; } || \ + echo "ac_add_options --enable-linker=bfd" >> .mozconfig + # audio - 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 + local PKGMK_MOZAUD="--enable-audio-backends=alsa" + prt-get isinst pulseaudio && PKGMK_MOZAUD+=",pulseaudio" + echo "ac_add_options $PKGMK_MOZAUD" >> .mozconfig prt-get isinst wayland-protocols && \ echo 'ac_add_options --enable-default-toolkit=cairo-gtk3-wayland' >> .mozconfig || \ echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >> .mozconfig - [[ -e '/usr/bin/ccache' ]] && echo 'ac_add_options --enable-ccache' >> .mozconfig + [ -e '/usr/bin/ccache' ] && echo 'ac_add_options --enable-ccache' >> .mozconfig export PYTHON=/usr/bin/python3 export RUSTFLAGS="$RUSTFLAGS -C debuginfo=0"