Index: branches/2019Q2/mail/thunderbird/Makefile =================================================================== --- branches/2019Q2/mail/thunderbird/Makefile (revision 505805) +++ branches/2019Q2/mail/thunderbird/Makefile (revision 505806) @@ -1,79 +1,78 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 60.7.2 -PORTREVISION= 1 +DISTVERSION= 60.8.0 CATEGORIES= mail news net-im ipv6 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 BUILD_DEPENDS= nspr>=4.19:devel/nspr \ nss>=3.36.7:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.7.6:print/harfbuzz \ graphite2>=1.3.11:graphics/graphite2 \ png>=1.6.34:graphics/png \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.22.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -webp -vpx USES= tar:xz MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;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/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.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 Index: branches/2019Q2/mail/thunderbird/distinfo =================================================================== --- branches/2019Q2/mail/thunderbird/distinfo (revision 505805) +++ branches/2019Q2/mail/thunderbird/distinfo (revision 505806) @@ -1,3 +1,3 @@ -TIMESTAMP = 1561056349 -SHA256 (thunderbird-60.7.2.source.tar.xz) = fc89a5f66b17d554fc0b9c153483edcc74b1bacc916dfd6dccead8478060af31 -SIZE (thunderbird-60.7.2.source.tar.xz) = 283874432 +TIMESTAMP = 1562167567 +SHA256 (thunderbird-60.8.0.source.tar.xz) = 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1 +SIZE (thunderbird-60.8.0.source.tar.xz) = 285643576 Index: branches/2019Q2/mail/thunderbird/files/patch-bug1519629 =================================================================== --- branches/2019Q2/mail/thunderbird/files/patch-bug1519629 (revision 505805) +++ branches/2019Q2/mail/thunderbird/files/patch-bug1519629 (nonexistent) @@ -1,35 +0,0 @@ -commit f8f381bf03b5 -Author: Emilio Cobos Álvarez -Date: Sun Jan 13 21:42:38 2019 +0100 - - Bug 1519629 - Document a few more macros. ---- - servo/components/style/gecko/regen_atoms.py | 1 + - servo/components/style/gecko_string_cache/namespace.rs | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py -index dfc2252aa899..b6f68fceb7d5 100755 ---- servo/components/style/gecko/regen_atoms.py -+++ servo/components/style/gecko/regen_atoms.py -@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' - - MACRO = ''' - #[macro_export] -+/// Returns a static atom by passing the literal string it represents. - macro_rules! atom {{ - {} - }} -diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs -index 4aa4accaf1d4..725e1da21692 100644 ---- servo/components/style/gecko_string_cache/namespace.rs -+++ servo/components/style/gecko_string_cache/namespace.rs -@@ -11,6 +11,8 @@ use std::borrow::Borrow; - use std::fmt; - use std::ops::Deref; - -+/// In Gecko namespaces are just regular atoms, so this is a simple macro to -+/// forward one macro to the other. - #[macro_export] - macro_rules! ns { - () => { Property changes on: branches/2019Q2/mail/thunderbird/files/patch-bug1519629 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q2/mail/thunderbird/files/patch-a-bug1502799 =================================================================== --- branches/2019Q2/mail/thunderbird/files/patch-a-bug1502799 (revision 505805) +++ branches/2019Q2/mail/thunderbird/files/patch-a-bug1502799 (nonexistent) @@ -1,50 +0,0 @@ -commit f57498276d74 -Author: Andrea Marchesini -Date: Wed May 15 22:00:00 2019 -0700 - - Bug 1502799 - Reintroduce serialize_function, disabled by mistake by previous patches, r=emilio ---- - servo/components/style/gecko_string_cache/namespace.rs | 1 - - servo/components/style_traits/values.rs | 3 --- - 2 files changed, 4 deletions(-) - -diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs -index 71d2fce8ff6b..92288574e145 100644 ---- servo/components/style/gecko_string_cache/namespace.rs -+++ servo/components/style/gecko_string_cache/namespace.rs -@@ -11,7 +11,6 @@ use std::fmt; - use std::ops::Deref; - use string_cache::{Atom, WeakAtom}; - --/// aaa - #[macro_export] - macro_rules! ns { - () => { $crate::string_cache::Namespace(atom!("")) }; -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 40209772a790..d6bd05b7b40e 100644 ---- servo/components/style_traits/values.rs -+++ servo/components/style_traits/values.rs -@@ -135,7 +135,6 @@ where - } - } - --/* - #[macro_export] - macro_rules! serialize_function { - ($dest: expr, $name: ident($( $arg: expr, )+)) => { -@@ -153,7 +152,6 @@ macro_rules! serialize_function { - } - } - } --*/ - - /// Convenience wrapper to serialise CSS values separated by a given string. - pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { -@@ -406,7 +404,6 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --/// Define an enum type with unit variants that each correspond to a CSS keyword. - #[macro_export] - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { Property changes on: branches/2019Q2/mail/thunderbird/files/patch-a-bug1502799 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 505805) +++ branches/2019Q2 (revision 505806) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r505800