diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 10263c2ec597..96a7d8074294 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,73 +1,74 @@ PORTNAME= thunderbird DISTVERSION= 140.0 +PORTREVISION= 1 CATEGORIES= mail news net-im wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}${DISTVERSIONSUFFIX}-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/ # autoconf2.13:devel/autoconf2.13 \ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.112:security/nss \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.45:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.15.0:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} LIB_DEPENDS= libjson-c.so:devel/json-c USE_GECKO= gecko CONFLICTS_INSTALL= thunderbird-esr # cannot use system icu: calendar is completely broken by # https://unicode-org.atlassian.net/browse/ICU-22132 (fix not in 76.1) USE_MOZILLA= -icu -sqlite CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 USES= tar:xz # helpful when testing beta WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_OPTIONS+= --with-system-bz2 --with-system-jsonc MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot 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" 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 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/files/patch-bug1973073 b/mail/thunderbird/files/patch-bug1973073 new file mode 100644 index 000000000000..af0d682e8d03 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1973073 @@ -0,0 +1,23 @@ + +# HG changeset patch +# User Daniel Darnell +# Date 1750358329 25200 +# Node ID 68f59e2fec41c8c2e6b89de9a119a862a8358add +# Parent 275763c890c435d54bfc540dbd26bed5e170cd4a +Bug 1973073 - Temporarily hard-code MOZ_OFFICIAL_BRANDING_DIRECTORY into confvars.sh (for comm-release). rs=bustage-fix a=dandarnell + +diff --git comm/mail/confvars.sh comm/mail/confvars.sh +--- comm/mail/confvars.sh ++++ comm/mail/confvars.sh +@@ -1,9 +1,9 @@ + #! /bin/sh + # 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/. + + MOZ_BRANDING_DIRECTORY=comm/mail/branding/nightly + + # This is a temporary hard-coded measure to accomodate MSIX repackaging +-MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/mail/branding/tb_beta ++MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/mail/branding/thunderbird +