svn commit: r552365 - in head/www/firefox-esr: . files
Jan Beich
jbeich at FreeBSD.org
Thu Oct 15 00:32:45 UTC 2020
Author: jbeich
Date: Thu Oct 15 00:32:43 2020
New Revision: 552365
URL: https://svnweb.freebsd.org/changeset/ports/552365
Log:
www/firefox-esr: update to 78.4.0
Changes: https://www.mozilla.org/firefox/78.4.0/releasenotes/
Modified:
head/www/firefox-esr/Makefile (contents, props changed)
head/www/firefox-esr/distinfo (contents, props changed)
head/www/firefox-esr/files/patch-bug1663715 (contents, props changed)
Modified: head/www/firefox-esr/Makefile
==============================================================================
--- head/www/firefox-esr/Makefile Thu Oct 15 00:22:35 2020 (r552364)
+++ head/www/firefox-esr/Makefile Thu Oct 15 00:32:43 2020 (r552365)
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 78.3.1
-PORTREVISION= 3
+DISTVERSION= 78.4.0
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
- MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source
+ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source
PKGNAMESUFFIX= -esr
DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX}
Modified: head/www/firefox-esr/distinfo
==============================================================================
--- head/www/firefox-esr/distinfo Thu Oct 15 00:22:35 2020 (r552364)
+++ head/www/firefox-esr/distinfo Thu Oct 15 00:32:43 2020 (r552365)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601482397
-SHA256 (firefox-78.3.1esr.source.tar.xz) = 5fd27d67689fe60803022035e556146d2dbce5e53d21c14d026fc31dd2e45be9
-SIZE (firefox-78.3.1esr.source.tar.xz) = 339088596
+TIMESTAMP = 1602668438
+SHA256 (firefox-78.4.0esr.source.tar.xz) = 8e3cf0bbf1062768134db2eb10ab774731ca5ec6694b65def82234bb0a9170fc
+SIZE (firefox-78.4.0esr.source.tar.xz) = 335094656
Modified: head/www/firefox-esr/files/patch-bug1663715
==============================================================================
--- head/www/firefox-esr/files/patch-bug1663715 Thu Oct 15 00:22:35 2020 (r552364)
+++ head/www/firefox-esr/files/patch-bug1663715 Thu Oct 15 00:32:43 2020 (r552365)
@@ -1,185 +1,3 @@
-From 63678ae69e03325d65255d29f1af4a6ea3dd354a Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi at gentoo.org>
-Date: Sat, 10 Oct 2020 16:07:49 +0200
-Subject: [PATCH 36/38] bmo#1643201: Cherry-pick some servo changes to
- derive_common
-
-Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1663715#c7
-Signed-off-by: Thomas Deutschmann <whissi at gentoo.org>
----
- servo/components/derive_common/cg.rs | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/servo/components/derive_common/cg.rs b/servo/components/derive_common/cg.rs
-index 55a75398c7..c51c0d7750 100644
---- servo/components/derive_common/cg.rs
-+++ servo/components/derive_common/cg.rs
-@@ -7,7 +7,7 @@ use proc_macro2::{Span, TokenStream};
- use quote::TokenStreamExt;
- use syn::{self, AngleBracketedGenericArguments, Binding, DeriveInput, Field};
- use syn::{GenericArgument, GenericParam, Ident, Path};
--use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray};
-+use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup};
- use syn::{TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple};
- use syn::{Variant, WherePredicate};
- use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
-@@ -208,6 +208,10 @@ where
- elem: Box::new(map_type_params(&inner.elem, params, f)),
- ..inner.clone()
- }),
-+ Type::Group(ref inner) => Type::from(TypeGroup {
-+ elem: Box::new(map_type_params(&inner.elem, params, f)),
-+ ..inner.clone()
-+ }),
- ref ty => panic!("type {:?} cannot be mapped yet", ty),
- }
- }
---
-2.28.0
-
-From 23f22e9de6cc2236d58cc03997a1040e62c532e1 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi at gentoo.org>
-Date: Sat, 10 Oct 2020 16:09:04 +0200
-Subject: [PATCH 37/38] bmo#1653339: Teach style_derive's map_type_params about
- mapping self correctly
-
-Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1663715#c7
-Signed-off-by: Thomas Deutschmann <whissi at gentoo.org>
----
- servo/components/derive_common/cg.rs | 30 +++++++++++--------
- .../style_derive/to_computed_value.rs | 4 ++-
- 2 files changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/servo/components/derive_common/cg.rs b/servo/components/derive_common/cg.rs
-index c51c0d7750..8abfd87149 100644
---- servo/components/derive_common/cg.rs
-+++ servo/components/derive_common/cg.rs
-@@ -154,19 +154,19 @@ pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &
- segment.into()
- }
-
--pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], f: &mut F) -> Type
-+pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Type
- where
- F: FnMut(&Ident) -> Type,
- {
- match *ty {
- Type::Slice(ref inner) => Type::from(TypeSlice {
-- elem: Box::new(map_type_params(&inner.elem, params, f)),
-+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
- ..inner.clone()
- }),
- Type::Array(ref inner) => {
- //ref ty, ref expr) => {
- Type::from(TypeArray {
-- elem: Box::new(map_type_params(&inner.elem, params, f)),
-+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
- ..inner.clone()
- })
- },
-@@ -175,7 +175,7 @@ where
- elems: inner
- .elems
- .iter()
-- .map(|ty| map_type_params(&ty, params, f))
-+ .map(|ty| map_type_params(&ty, params, self_type, f))
- .collect(),
- ..inner.clone()
- }),
-@@ -187,10 +187,16 @@ where
- if params.iter().any(|ref param| ¶m.ident == ident) {
- return f(ident);
- }
-+ if ident == "Self" {
-+ return Type::from(TypePath {
-+ qself: None,
-+ path: self_type.clone(),
-+ });
-+ }
- }
- Type::from(TypePath {
- qself: None,
-- path: map_type_params_in_path(path, params, f),
-+ path: map_type_params_in_path(path, params, self_type, f),
- })
- },
- Type::Path(TypePath {
-@@ -198,25 +204,25 @@ where
- ref path,
- }) => Type::from(TypePath {
- qself: qself.as_ref().map(|qself| QSelf {
-- ty: Box::new(map_type_params(&qself.ty, params, f)),
-+ ty: Box::new(map_type_params(&qself.ty, params, self_type, f)),
- position: qself.position,
- ..qself.clone()
- }),
-- path: map_type_params_in_path(path, params, f),
-+ path: map_type_params_in_path(path, params, self_type, f),
- }),
- Type::Paren(ref inner) => Type::from(TypeParen {
-- elem: Box::new(map_type_params(&inner.elem, params, f)),
-+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
- ..inner.clone()
- }),
- Type::Group(ref inner) => Type::from(TypeGroup {
-- elem: Box::new(map_type_params(&inner.elem, params, f)),
-+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
- ..inner.clone()
- }),
- ref ty => panic!("type {:?} cannot be mapped yet", ty),
- }
- }
-
--fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], f: &mut F) -> Path
-+fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Path
- where
- F: FnMut(&Ident) -> Type,
- {
-@@ -236,11 +242,11 @@ where
- .map(|arg| match arg {
- ty @ &GenericArgument::Lifetime(_) => ty.clone(),
- &GenericArgument::Type(ref data) => {
-- GenericArgument::Type(map_type_params(data, params, f))
-+ GenericArgument::Type(map_type_params(data, params, self_type, f))
- },
- &GenericArgument::Binding(ref data) => {
- GenericArgument::Binding(Binding {
-- ty: map_type_params(&data.ty, params, f),
-+ ty: map_type_params(&data.ty, params, self_type, f),
- ..data.clone()
- })
- },
-diff --git a/servo/components/style_derive/to_computed_value.rs b/servo/components/style_derive/to_computed_value.rs
-index fe6bddb7ed..1dc422e2dd 100644
---- servo/components/style_derive/to_computed_value.rs
-+++ servo/components/style_derive/to_computed_value.rs
-@@ -47,12 +47,15 @@ pub fn derive_to_value(
- cg::add_predicate(&mut where_clause, parse_quote!(#param: #trait_path));
- }
-
-+ let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
-+
- let mut add_field_bound = |binding: &BindingInfo| {
- let ty = &binding.ast().ty;
-
- let output_type = cg::map_type_params(
- ty,
- ¶ms,
-+ &computed_value_type,
- &mut |ident| parse_quote!(<#ident as #trait_path>::#output_type_name),
- );
-
-@@ -142,7 +145,6 @@ pub fn derive_to_value(
-
- input.generics.where_clause = where_clause;
- let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
-- let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
-
- let impl_ = trait_impl(from_body, to_body);
-
---
-2.28.0
-
From 300e01e71c9dc536d499d80563968c5fc7f7e34a Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi at gentoo.org>
Date: Sat, 10 Oct 2020 16:10:20 +0200
More information about the svn-ports-all
mailing list