diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ad75ad120d4e..b6925bb3375d 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.7.2 +DISTVERSION= 60.8.0 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 0347102e6555..0a6da890eb79 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1561043183 -SHA256 (firefox-60.7.2esr.source.tar.xz) = 8a918ea70c806524f293336f6f4574bb6e69ca1e98e6e5e0e5c2d6ad2ac26ac2 -SIZE (firefox-60.7.2esr.source.tar.xz) = 268579256 +TIMESTAMP = 1562112520 +SHA256 (firefox-60.8.0esr.source.tar.xz) = c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe +SIZE (firefox-60.8.0esr.source.tar.xz) = 268791200 diff --git a/www/firefox-esr/files/patch-a-bug1502799 b/www/firefox-esr/files/patch-a-bug1502799 deleted file mode 100644 index 105da6a3e21c..000000000000 --- a/www/firefox-esr/files/patch-a-bug1502799 +++ /dev/null @@ -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,)+ }) => {