diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 6041351cb25e..a8442861accf 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,83 +1,82 @@ PORTNAME= thunderbird -DISTVERSION= 102.12.0 -PORTREVISION= 1 +DISTVERSION= 102.13.0 CATEGORIES= mail news net-im wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above WWW= https://www.mozilla.com/thunderbird/ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.79:security/nss \ icu>=71.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=4.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.37:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.11.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip LIB_DEPENDS= libjson-c.so:devel/json-c \ libbotan-2.so:security/botan2 SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 USES= tar:xz MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_OPTIONS+= --with-system-bz2 --with-system-jsonc --with-system-botan MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFAULT=CANBERRA .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${ARCH} == powerpc64 MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ ${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT} MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/comm/mail/app/nsMailApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index d0051bd74e74..8a8d01e7213c 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685878941 -SHA256 (thunderbird-102.12.0.source.tar.xz) = 5aa776b75dd47e77303185033c2c443a425488d28ced5c6e29e5bd64e7ac5afe -SIZE (thunderbird-102.12.0.source.tar.xz) = 502135796 +TIMESTAMP = 1688542022 +SHA256 (thunderbird-102.13.0.source.tar.xz) = 3462f18ec2ff1c962aa3e75ca6fbfa24b79c25fc0f5937419c9f2e7d7b090897 +SIZE (thunderbird-102.13.0.source.tar.xz) = 502736152 diff --git a/mail/thunderbird/files/patch-rust-1.70.0 b/mail/thunderbird/files/patch-rust-1.70.0 deleted file mode 100644 index 233e51bee164..000000000000 --- a/mail/thunderbird/files/patch-rust-1.70.0 +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 - -From 8b5b652d38e007e736bb442ccd5aa5ed699db100 Mon Sep 17 00:00:00 2001 -From: Matthew Gregan -Date: Thu, 16 Jun 2022 13:54:02 +1200 -Subject: [PATCH] Fix `unstable-name-collisions` warning by using fully - qualified path. - ---- - mp4parse/src/lib.rs | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/mp4parse/src/lib.rs b/mp4parse/src/lib.rs -index 567ee21d..4f3d7153 100644 ---- third_party/rust/mp4parse/src/lib.rs -+++ third_party/rust/mp4parse/src/lib.rs -@@ -3506,8 +3506,13 @@ macro_rules! impl_mul { - type Output = $output; - - fn mul(self, rhs: $rhs) -> Self::Output { -- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); -- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); -+ static_assertions::const_assert!( -+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 -+ ); -+ static_assertions::const_assert!( -+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX -+ <= <$output as UpperBounded>::MAX -+ ); - - let lhs: $inner = self.get().into(); - let rhs: $inner = rhs.get().into(); -