Index: branches/2019Q2/www/firefox-esr/Makefile =================================================================== --- branches/2019Q2/www/firefox-esr/Makefile (revision 501856) +++ branches/2019Q2/www/firefox-esr/Makefile (revision 501857) @@ -1,64 +1,64 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.6.3 +DISTVERSION= 60.7.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla 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 \ libvorbis>=1.3.6,3:audio/libvorbis \ 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 USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -webp -vpx USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2019Q2/www/firefox-esr/distinfo =================================================================== --- branches/2019Q2/www/firefox-esr/distinfo (revision 501856) +++ branches/2019Q2/www/firefox-esr/distinfo (revision 501857) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557262721 -SHA256 (firefox-60.6.3esr.source.tar.xz) = eebf34968c64cf8c007dd0da98124edf55cdda141f8b4c653e8e00b22650833e -SIZE (firefox-60.6.3esr.source.tar.xz) = 268688628 +TIMESTAMP = 1557861234 +SHA256 (firefox-60.7.0esr.source.tar.xz) = 0a5f0c1d8d1e9443d85083d37fec32e5cc15c1001ea992d49745490065b4a023 +SIZE (firefox-60.7.0esr.source.tar.xz) = 268497160 Index: branches/2019Q2/www/firefox-esr/files/patch-a-bug1502799 =================================================================== --- branches/2019Q2/www/firefox-esr/files/patch-a-bug1502799 (nonexistent) +++ branches/2019Q2/www/firefox-esr/files/patch-a-bug1502799 (revision 501857) @@ -0,0 +1,50 @@ +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/www/firefox-esr/files/patch-a-bug1502799 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q2 =================================================================== --- branches/2019Q2 (revision 501856) +++ branches/2019Q2 (revision 501857) Property changes on: branches/2019Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r501798