diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 7be54b91841c..d29e043f677f 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,82 +1,82 @@ PORTNAME= thunderbird -DISTVERSION= 102.7.2 +DISTVERSION= 102.8.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 ce1a42c5c55d..11c0b6651515 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675765010 -SHA256 (thunderbird-102.7.2.source.tar.xz) = 73713a19226a2bee353f5fc4f1e00e5b2df45c35ac8c3866d98094b00995386f -SIZE (thunderbird-102.7.2.source.tar.xz) = 502932420 +TIMESTAMP = 1676016538 +SHA256 (thunderbird-102.8.0.source.tar.xz) = 716ea922163ad9d92a06198380e074b27bde076e3cf1ff77100fdf065085277e +SIZE (thunderbird-102.8.0.source.tar.xz) = 500467740 diff --git a/mail/thunderbird/files/patch-bug1799982 b/mail/thunderbird/files/patch-bug1799982 deleted file mode 100644 index dac77d73390b..000000000000 --- a/mail/thunderbird/files/patch-bug1799982 +++ /dev/null @@ -1,60 +0,0 @@ -Bug 1799982 - Remove uses of inline flags from XPIDL regexps. r=xpcom-reviewers,kmag - -Apparently the use of these is being turned into an error in Python 3.11. -Fortunately, our uses appears to be rather trivial. - -For t_multilinecomment and t_LCDATA, I dropped the (?s) flag and just -replaced the one use of . with (\n|.). (?s) means DOTALL, which means -that dot includes any character, including a newline. Otherwise it means -dot includes any character except a newline. - -I took the new t_singlelinecomment from IPDL's parser.py, so I assume -it is reasonable enough. t_multilinecomment is also now the same as -in IPDL. - -Differential Revision: https://phabricator.services.mozilla.com/D161738 - -diff --git xpcom/idl-parser/xpidl/xpidl.py xpcom/idl-parser/xpidl/xpidl.py ---- xpcom/idl-parser/xpidl/xpidl.py -+++ xpcom/idl-parser/xpidl/xpidl.py -@@ -1634,36 +1634,36 @@ class IDLParser(object): - t_LSHIFT = r"<<" - t_RSHIFT = r">>" - - literals = '"(){}[]<>,;:=|+-*' - - t_ignore = " \t" - - def t_multilinecomment(self, t): -- r"/\*(?s).*?\*/" -+ r"/\*(\n|.)*?\*/" - t.lexer.lineno += t.value.count("\n") - if t.value.startswith("/**"): - self._doccomments.append(t.value) - - def t_singlelinecomment(self, t): -- r"(?m)//.*?$" -+ r"//[^\n]*" - - def t_IID(self, t): - return t - - t_IID.__doc__ = r"%(c)s{8}-%(c)s{4}-%(c)s{4}-%(c)s{4}-%(c)s{12}" % {"c": hexchar} - - def t_IDENTIFIER(self, t): - r"(unsigned\ long\ long|unsigned\ short|unsigned\ long|long\ long)(?!_?[A-Za-z][A-Za-z_0-9])|_?[A-Za-z][A-Za-z_0-9]*" # NOQA: E501 - t.type = self.keywords.get(t.value, "IDENTIFIER") - return t - - def t_LCDATA(self, t): -- r"(?s)%\{[ ]*C\+\+[ ]*\n(?P.*?\n?)%\}[ ]*(C\+\+)?" -+ r"%\{[ ]*C\+\+[ ]*\n(?P(\n|.)*?\n?)%\}[ ]*(C\+\+)?" - t.type = "CDATA" - t.value = t.lexer.lexmatch.group("cdata") - t.lexer.lineno += t.value.count("\n") - return t - - def t_INCLUDE(self, t): - r'\#include[ \t]+"[^"\n]+"' - inc, value, end = t.value.split('"') -